Changeset 4981


Ignore:
Timestamp:
02/08/09 18:29:36 (5 years ago)
Author:
alanbach-guest
Message:
  • Sync'd with Debian 2.24.0-5
Location:
pkg/boss/main/gconf/trunk/debian
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • pkg/boss/main/gconf/trunk/debian/README.Debian

    r462 r4981  
    22================== 
    33 
    4 The default GConf sources accessed by the GConf daemon are the following: 
     4The default GConf sources accessed by the GConf daemon are the  
     5following, in order: 
    56 
    67* /etc/gconf/gconf.xml.mandatory/ 
    78  Mandatory settings set by the administrator. You can edit them with 
    89  gconf-editor, as root, to override any user settings. 
     10 
     11* /var/lib/gconf/debian.mandatory/ 
     12  This directory contains mandatory settings provided by Debian, CDD or  
     13  local packages.  Mandatory settings are shipped in  
     14  /usr/share/gconf/mandatory and set by update-gconf-defaults. 
    915 
    1016* ~/.gconf/ 
     
    3440situation (tree of %gconf.xml files) is done in gconf2 2.12.1-5. 
    3541 
    36 By default, the home directory structure is created as a tree layout. If 
    37 you want to use a merged tree on the home directory, you should run the 
    38 following command: 
     42By default, the home directory structure is created as a tree layout  
     43since it improves write performance. If you want to use a merged tree  
     44on the home directory, you should run the following command: 
    3945  gconf-merge-tree ~/.gconf/ 
  • pkg/boss/main/gconf/trunk/debian/changelog

    r4925 r4981  
    1 gconf (2.24.0-parsix3) unstable; urgency=low 
    2  
    3   * Merged updates from Debian 2.24.0-4 
    4   * Updated 80_fix_su_dbus.patch 
    5  
    6  -- Alan Baghumian <alan@technotux.org>  Sun, 18 Jan 2009 13:17:11 -0800 
     1gconf (2.24.0-parsix4) unstable; urgency=low 
     2 
     3  * Sync'd with Debian 2.24.0-5 
     4 
     5 -- Alan Baghumian <alan@technotux.org>  Sun, 08 Feb 2009 09:28:26 -0800 
     6 
     7gconf (2.24.0-5) experimental; urgency=low 
     8 
     9  [ Josselin Mouette ] 
     10  * Add a Breaks against older libbonobos because gconf using dbus makes  
     11    #331000 occur much more often. 
     12 
     13  [ Loic Minier ] 
     14  * Change the postinst to explicitely install the alternative on install and 
     15    upgrades from << 2.19.1-2. 
     16 
     17  [ Josselin Mouette ] 
     18  * update-gconf-defaults: ignore more backup extensions. 
     19    Closes: #512476. 
     20  * gconf-schemas: add a --no-signal option. 
     21  * gconf2.postinst: improve the detection of cases when daemons need to  
     22    be signalled. 
     23  * Support alternate installation paths for defaults, including setting  
     24    mandatory settings. Closes: #512474, #512947. 
     25    + update-gconf-defaults: implement the --source, --destination,  
     26      --no-signal and --mandatory options. 
     27    + update-gconf-defaults.8: document them. 
     28    + default.path: add /var/lib/gconf/debian.mandatory as a mandatory  
     29      source. 
     30    + gconf2-common.dirs: add new directories. 
     31    + gconf2.postinst: run update-gconf-defaults --mandatory if needed. 
     32    + gconf2.install: install the script to /usr/bin. 
     33    + README.Debian: document this. 
     34 
     35 -- Josselin Mouette <joss@debian.org>  Mon, 02 Feb 2009 14:14:55 +0100 
    736 
    837gconf (2.24.0-4) experimental; urgency=low 
  • pkg/boss/main/gconf/trunk/debian/control

    r4925 r4981  
    33Priority: optional 
    44Maintainer: Josselin Mouette <joss@debian.org> 
    5 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Loic Minier <lool@dooz.org>, Sebastian Dröge <slomo@debian.org> 
     5Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Sebastian Dröge <slomo@debian.org> 
    66Build-Depends: debhelper (>= 5), 
    77               cdbs (>= 0.4.41), 
     
    8686         gconf2-common (>= ${gnome:Version}), 
    8787         gconf2-common (<< ${gnome:NextVersion}) 
     88Breaks: libbonobo2-0 (<< 2.24) 
    8889Description: GNOME configuration database system (shared libraries) 
    8990 GConf is a configuration database system for storing application 
  • pkg/boss/main/gconf/trunk/debian/control.in

    r4925 r4981  
    8686         gconf2-common (>= ${gnome:Version}), 
    8787         gconf2-common (<< ${gnome:NextVersion}) 
     88Breaks: libbonobo2-0 (<< 2.24) 
    8889Description: GNOME configuration database system (shared libraries) 
    8990 GConf is a configuration database system for storing application 
  • pkg/boss/main/gconf/trunk/debian/default.path

    r462 r4981  
    88# Other forced sources imagined by the local administrator 
    99include /etc/gconf/2/local-mandatory.path 
     10 
     11# Settings forced by Debian packages 
     12xml:readonly:/var/lib/gconf/debian.mandatory 
    1013 
    1114 
  • pkg/boss/main/gconf/trunk/debian/gconf-schemas

    r3178 r4981  
    1919                   help="clean up the GConf database and register all schemas again", 
    2020                   default=False) 
    21  
     21parser.add_option("--no-signal", action="store_false", default=True, dest="signal", 
     22                  help="do not send SIGHUP the running gconfd-2 processes") 
    2223(options, args) = parser.parse_args() 
    2324 
     
    7576  sys.exit(res) 
    7677 
    77 if options.register: 
     78if options.register and options.signal: 
    7879  # tell running processes to re-read the GConf database 
    7980  import signal 
  • pkg/boss/main/gconf/trunk/debian/gconf-schemas.xml

    r3178 r4981  
    8484                </listitem> 
    8585          </varlistentry> 
     86          <varlistentry> 
     87            <term><option>--no-signal</option> 
     88            </term> 
     89            <listitem> 
     90              <para>do not send SIGHUP to the running gconfd-2 processes.</para> 
     91            </listitem> 
     92          </varlistentry> 
    8693    </variablelist> 
    8794  </refsect1> 
  • pkg/boss/main/gconf/trunk/debian/gconf2-common.dirs

    r462 r4981  
    33/etc/gconf/gconf.xml.defaults 
    44/usr/share/gconf/defaults 
     5/usr/share/gconf/mandatory 
    56/var/lib/gconf/defaults 
    67/var/lib/gconf/debian.defaults 
     8/var/lib/gconf/debian.mandatory 
  • pkg/boss/main/gconf/trunk/debian/gconf2.install

    r462 r4981  
    11debian/tmp/usr/bin 
    22debian/gconf-schemas usr/sbin/ 
    3 debian/update-gconf-defaults usr/sbin/ 
     3debian/update-gconf-defaults usr/bin/ 
    44debian/tmp/usr/share/man 
  • pkg/boss/main/gconf/trunk/debian/gconf2.postinst

    r3178 r4981  
    11#!/bin/sh 
     2 
    23set -e 
    34 
    4 if [ "$1" != "configure" ] || dpkg --compare-versions "$2" lt 2.19.1-2; then 
     5install_alternative() { 
    56    update-alternatives \ 
    6         --install /usr/bin/gconftool gconftool /usr/bin/gconftool-2 25 \ 
    7         --slave /usr/share/man/man1/gconftool.1.gz gconftool.1.gz \ 
    8                 /usr/share/man/man1/gconftool-2.1.gz 
     7        --install /usr/bin/gconftool gconftool /usr/bin/gconftool-2 25 \ 
     8        --slave /usr/share/man/man1/gconftool.1.gz gconftool.1.gz \ 
     9                /usr/share/man/man1/gconftool-2.1.gz 
     10} 
     11 
     12if [ "$1" = install ]; then 
     13    install_alternative 
     14fi 
     15if [ "$1" = configure ] && dpkg --compare-versions "$2" lt-nl 2.19.1-2; then 
     16    install_alternative 
    917fi 
    1018 
     
    1220 
    1321for GCONF_DIR in /var/lib/gconf/defaults \ 
    14                 /etc/gconf/gconf.xml.mandatory \ 
    15                 /etc/gconf/gconf.xml.defaults ; do 
     22                /etc/gconf/gconf.xml.mandatory \ 
     23                /etc/gconf/gconf.xml.defaults ; do 
    1624  GCONF_TREE=$GCONF_DIR/%gconf-tree.xml 
    1725  if [ ! -f "$GCONF_TREE" ]; then 
     
    2836    # First installation: rebuild the defaults database in case  
    2937    # of packages shipping schemas but not depending on gconf2 
    30     gconf-schemas --register-all 
    31     SIGNAL_DAEMONS=no 
     38    gconf-schemas --register-all --no-signal 
     39    SIGNAL_DAEMONS=yes 
    3240  fi 
    3341fi 
    3442if [ -d /usr/share/gconf/defaults ] && [ ! -s /var/lib/gconf/debian.defaults/%gconf-tree.xml ]; then 
    3543  # Same for the defaults 
    36   update-gconf-defaults 
    37   SIGNAL_DAEMONS=no 
     44  update-gconf-defaults --no-signal 
     45  SIGNAL_DAEMONS=yes 
     46fi 
     47if [ -d /usr/share/gconf/mandatory ] && [ ! -s /var/lib/gconf/debian.mandatory/%gconf-tree.xml ]; then 
     48  # Same for the mandatory settings 
     49  update-gconf-defaults --no-signal --mandatory 
     50  SIGNAL_DAEMONS=yes 
    3851fi 
    3952 
  • pkg/boss/main/gconf/trunk/debian/update-gconf-defaults

    r462 r4981  
    55# Licensed under the GNU LGPL, see /usr/share/common-licenses/LGPL-2.1 
    66 
    7  
    8 defaults_dir = '/usr/share/gconf/defaults' 
    9 outdir = '/var/lib/gconf/debian.defaults' 
    107treefile = '%gconf-tree.xml' 
    118 
    129import os,tempfile,shutil,sys 
     10from optparse import OptionParser 
    1311 
    14 if os.geteuid(): 
    15   sys.stderr.write("%s needs to be run as root.\n"%sys.argv[0]) 
    16   sys.exit(1) 
     12parser = OptionParser() 
     13parser.add_option("--source", dest="source_dir", default="/usr/share/gconf/defaults", 
     14                  help="directory where to find the defaults", metavar="DIR") 
     15parser.add_option("--destination", dest="dest_dir", default="/var/lib/gconf/debian.defaults", 
     16                  help="directory where to build the GConf tree", metavar="DIR") 
     17parser.add_option("--mandatory", action="store_true", default=False, dest="mandatory", 
     18                  help="select mandatory settings directories") 
     19parser.add_option("--no-signal", action="store_false", default=True, dest="signal", 
     20                  help="do not send SIGHUP the running gconfd-2 processes") 
     21 
     22(options, args) = parser.parse_args() 
     23 
     24if options.mandatory: 
     25    options.source_dir="/usr/share/gconf/mandatory" 
     26    options.dest_dir="/var/lib/gconf/debian.mandatory" 
     27 
     28if not os.path.isdir(options.source_dir): 
     29    parser.error("Source directory does not exist.") 
     30if not os.path.isdir(options.dest_dir): 
     31    parser.error("Destination directory does not exist.") 
     32if not os.access(options.source_dir,os.R_OK|os.X_OK): 
     33    parser.error("Source directory is not readable.") 
     34if not os.access(options.dest_dir,os.W_OK|os.X_OK): 
     35    parser.error("Destination directory is not writable.") 
    1736 
    1837tmp_dir=tempfile.mkdtemp(prefix="gconf-") 
     
    104123 
    105124 
    106 defaults_files = os.listdir(defaults_dir) 
     125defaults_files = os.listdir(options.source_dir) 
    107126defaults_files.sort() 
    108127for f in defaults_files: 
    109   realname=defaults_dir+'/'+f 
    110   if f.endswith('.dpkg-tmp'): 
    111     pass 
    112   elif f.endswith('.entries'): 
     128  realname=options.source_dir+'/'+f 
     129  for ext in ['.dpkg-tmp', '.bak', '.tmp', '~', '.sav', '.save']: 
     130    if f.endswith(ext): 
     131      continue 
     132  if f.endswith('.entries'): 
    113133    if gconf_val: 
    114134      write_and_apply_entries(tmp_file) 
     
    121141 
    122142try: 
    123   shutil.copyfile(tmp_gconf+'/'+treefile,outdir+'/'+treefile+'.tmp') 
    124   os.rename(outdir+'/'+treefile+'.tmp',outdir+'/'+treefile) 
     143  shutil.copyfile(tmp_gconf+'/'+treefile,options.dest_dir+'/'+treefile+'.tmp') 
     144  os.rename(options.dest_dir+'/'+treefile+'.tmp',options.dest_dir+'/'+treefile) 
    125145except IOError: 
    126146  # No %gconf-tree.xml file was created. 
    127147  try: 
    128     os.remove(outdir+'/'+treefile) 
     148    os.remove(options.dest_dir+'/'+treefile) 
    129149  except OSError: 
    130150    # No existing file 
     
    133153cleanup() 
    134154 
    135 os.system('kill -s HUP `pidof gconfd-2` >/dev/null 2>&1') 
     155if options.signal: 
     156    os.system('kill -s HUP `pidof gconfd-2` >/dev/null 2>&1') 
  • pkg/boss/main/gconf/trunk/debian/update-gconf-defaults.8

    r462 r4981  
    1 .TH UPDATE-GCONF-DEFAULTS 8 "8 Jan 2006" 
     1.TH UPDATE-GCONF-DEFAULTS 8 "2 Feb 2009" 
    22.\" Please adjust this date whenever revising the manpage. 
    33.SH NAME 
     
    55.SH SYNOPSIS 
    66.B update-gconf-defaults 
     7[options] 
    78.SH DESCRIPTION 
    89This manual page documents briefly the 
     
    434450 for CDD distributions, and 90 for site-specific packages. 
    4445.SH OPTIONS 
    45 There are no options for this program. 
     46.TP 
     47.B \-\-source\fR \fIsource_dir 
     48Specify an alternate source directory where to find the defaults. 
     49.TP 
     50.B \-\-destination\fR \fIdestination_dir 
     51Specify an alternate destination directory where to build the resulting GConf tree. 
     52.TP 
     53.B \-\-mandatory 
     54Sets source and destination directories appropriate for the mandatory values. 
    4655.SH FILES 
    4756.TP 
    4857.I /usr/share/gconf/defaults/ 
    49 The directory where defaults files are read. 
     58The directory from which defaults files are read. 
    5059.TP 
    51 .I /var/lib/gconf/debian.defaults/%gconf-tree.xml 
    52 The value tree generated. It is read by GConf with the default Debian 
     60.I /usr/share/gconf/mandatory/ 
     61The directory from which defaults files for mandatory settings are read. 
     62.TP 
     63.I /var/lib/gconf/debian.defaults 
     64The directory where the GConf tree for default settings is generated. It is read by GConf with the default Debian 
    5365configuration, and it takes precedence over upstream defaults. 
     66.TP 
     67.I /var/lib/gconf/debian.mandatory 
     68The directory where the GConf tree for mandatory settings is generated. It is read by GConf with the default Debian configuration, and it takes precedence over user settings. 
    5469.SH SEE ALSO 
    5570.BR dh_gconf (1), gconftool (1). 
Note: See TracChangeset for help on using the changeset viewer.