r32621 - in /desktop/unstable/gdm3/debian: changelog gdm3.init

[joss at users.alioth.debian.org]

Author: joss
Date: Tue Feb 21 00:37:27 2012
New Revision: 32621

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=32621
Log:
Require d-conf 0.10.0-4 to configure the dconf path and parse 
defaults in order.

Modified:
    desktop/unstable/gdm3/debian/changelog
    desktop/unstable/gdm3/debian/gdm3.init

Modified: desktop/unstable/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/changelog?rev=32621&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog [utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog [utf-8] Tue Feb 21 00:37:27 2012
@@ -64,7 +64,8 @@
   * Suggest gnome-shell.
   * Require g-s-d and metacity, they are no longer optional. Requiring 
     g-s-d 3.2 Closes: #656384.
-  * Require d-conf 0.10.0-4 to configure the dconf path.
+  * Require d-conf 0.10.0-4 to configure the dconf path and parse 
+    defaults in order.
 
  -- Josselin Mouette <joss at debian.org>  Thu, 24 Nov 2011 22:29:47 +0100
 

Modified: desktop/unstable/gdm3/debian/gdm3.init
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/gdm3.init?rev=32621&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/gdm3.init [utf-8] (original)
+++ desktop/unstable/gdm3/debian/gdm3.init [utf-8] Tue Feb 21 00:37:27 2012
@@ -70,7 +70,7 @@
       # Convert it to org/gnome/blah dconf syntax.
       awk '/\[.*\]/ { gsub("\\.","/"); } ! /^#/ { print;}' \
         /etc/gdm3/greeter.gsettings > /var/lib/gdm3/dconf/db/gdm.d/90-debian-settings
-      dconf update /var/lib/gdm3/dconf/db
+      dconf update /var/lib/gdm3/dconf/db 2> /dev/null
     fi
   fi
 }