r13651 - in /desktop/unstable/gdm/debian: changelog gdm.postinst

joss at users.alioth.debian.org joss at users.alioth.debian.org
Tue Nov 27 23:03:03 UTC 2007


Author: joss
Date: Tue Nov 27 23:03:02 2007
New Revision: 13651

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13651
Log:
  + Use the basename of the contents of
    /etc/X11/default-display-manager, to allow the user to specify a
* 35_gdm.conf.patch: set Browser=true so that themes with a face
* gdm.postinst: fix quoting in gdm.conf after upgrading from gdm < 
  2.20. Closes: #445947.

Modified:
    desktop/unstable/gdm/debian/changelog
    desktop/unstable/gdm/debian/gdm.postinst

Modified: desktop/unstable/gdm/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/changelog?rev=13651&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/changelog (original)
+++ desktop/unstable/gdm/debian/changelog Tue Nov 27 23:03:02 2007
@@ -1,14 +1,16 @@
 gdm (2.20.1-3) UNRELEASED; urgency=low
 
   * debian/gdm.init:
-    + Use the basename of the contents of 
-      /etc/X11/default-display-manager, to allow the user to specify a 
+    + Use the basename of the contents of
+      /etc/X11/default-display-manager, to allow the user to specify a
       path by hand. Closes: #452344.
     + Fix bashims.
   * gdm.pam: add support for pam_gnome_keyring. Closes: #445870.
   * Suggest libpam-gnome-keyring.
-  * 35_gdm.conf.patch: set Browser=true so that themes with a face 
+  * 35_gdm.conf.patch: set Browser=true so that themes with a face
     browser work correctly. Closes: #445743.
+  * gdm.postinst: fix quoting in gdm.conf after upgrading from gdm < 
+    2.20. Closes: #445947.
 
  -- Josselin Mouette <joss at debian.org>  Sun, 25 Nov 2007 11:32:50 +0100
 

Modified: desktop/unstable/gdm/debian/gdm.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/gdm.postinst?rev=13651&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/gdm.postinst (original)
+++ desktop/unstable/gdm/debian/gdm.postinst Tue Nov 27 23:03:02 2007
@@ -63,6 +63,16 @@
     fi
 fi
 
+if [ "$1" = "configure" ] && [ -n "$2" ] && dpkg --compare-versions "$2" lt "2.20"; then
+    # D'uh, that's an ugly hack, but upstream changed the syntax
+    # of the quoting
+    if grep -q '\\"' /etc/gdm/gdm.conf; then
+        echo "WARNING: fixing quotes in /etc/gdm/gdm.conf"
+        cp -p /etc/gdm/gdm.conf /etc/gdm/gdm.conf.dpkg-old
+        sed -i 's/\\"/"/g' /etc/gdm/gdm.conf
+    fi
+fi
+
 if [ -x /etc/init.d/gdm ]; then
   update-rc.d gdm defaults $S $K >/dev/null 2>&1
   invoke-rc.d gdm reload || true




More information about the pkg-gnome-commits mailing list