r19483 - in /desktop/unstable/gconf/debian: README.Debian changelog

[joss at users.alioth.debian.org]

Author: joss
Date: Thu Apr  9 18:37:18 2009
New Revision: 19483

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19483
Log:
README.Debian: improve documentation for the file format of the 
defaults directory. Closes: #519096.

Modified:
    desktop/unstable/gconf/debian/README.Debian
    desktop/unstable/gconf/debian/changelog

Modified: desktop/unstable/gconf/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/README.Debian?rev=19483&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/README.Debian (original)
+++ desktop/unstable/gconf/debian/README.Debian Thu Apr  9 18:37:18 2009
@@ -11,7 +11,8 @@
 * /var/lib/gconf/debian.mandatory/
   This directory contains mandatory settings provided by Debian, CDD or 
   local packages.  Mandatory settings are shipped in 
-  /usr/share/gconf/mandatory and set by update-gconf-defaults.
+  /usr/share/gconf/mandatory and set by update-gconf-defaults (see the 
+  documentation for defaults next).
 
 * ~/.gconf/
   The user's settings.
@@ -22,13 +23,18 @@
 
 * /var/lib/gconf/debian.defaults/
   This directory contains some defaults provided by Debian, CDD or local
-  packages. Packages can ship files of the form NNpackage, larger NN
-  values meaning larger priorities, in /usr/share/gconf/defaults/,
-  before launching update-gconf-defaults. Debian packages themselves use
-  01, CDD distributions are encouraged to use values larger than 10, and
-  site-specific packages can use the largest values. The purpose is for
-  CDD to overwrite Debian defaults, and for site-specific packages to
-  overwrite all other defaults.
+  packages. Packages should install their defaults in the
+  /usr/share/gconf/defaults/ directory. The files in this directory 
+  can follow one of two formats, which is determined based on the naming 
+  pattern:
+   - NN_package: simple key/value pairings
+   - NN_package.entries: standard gconftool -R format xml dump
+  NN should be 10 for Debian packages, 20 for CDD packages, and larger 
+  for site-specific packages.
+
+  The contents of /var/lib/gconf/debian.defaults/ can be regenerated 
+  using the update-gconf-defaults command, which is done in the 
+  package's post-installation script.
 
 * /var/lib/gconf/defaults/
   This directory contains the defaults computed from the upstream

Modified: desktop/unstable/gconf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/changelog?rev=19483&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/changelog (original)
+++ desktop/unstable/gconf/debian/changelog Thu Apr  9 18:37:18 2009
@@ -1,6 +1,8 @@
 gconf (2.24.0-8) UNRELEASED; urgency=low
 
   * Add libglib2.0-doc to build-depends to ensure proper xrefs.
+  * README.Debian: improve documentation for the file format of the 
+    defaults directory. Closes: #519096.
 
  -- Josselin Mouette <joss at debian.org>  Tue, 10 Mar 2009 12:55:10 +0100