r41556 - in /desktop/experimental/gdm3/debian: changelog gdm3.config gdm3.postinst
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sun Apr 27 13:07:16 UTC 2014
Author: joss
Date: Sun Apr 27 13:07:16 2014
New Revision: 41556
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=41556
Log:
Fix the logic to update the default display manager after running
debconf.
Modified:
desktop/experimental/gdm3/debian/changelog
desktop/experimental/gdm3/debian/gdm3.config
desktop/experimental/gdm3/debian/gdm3.postinst
Modified: desktop/experimental/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/changelog?rev=41556&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/changelog [utf-8] (original)
+++ desktop/experimental/gdm3/debian/changelog [utf-8] Sun Apr 27 13:07:16 2014
@@ -40,7 +40,8 @@
manager, according to the value set in debconf.
* Add a symlink to gdm3.service since this is the name of the old init
script.
- * Fix a typo in gdm3.postinst.
+ * Fix the logic to update the default display manager after running
+ debconf.
-- Laurent Bigonville <bigon at debian.org> Fri, 11 Apr 2014 15:25:51 +0200
Modified: desktop/experimental/gdm3/debian/gdm3.config
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/gdm3.config?rev=41556&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/gdm3.config [utf-8] (original)
+++ desktop/experimental/gdm3/debian/gdm3.config [utf-8] Sun Apr 27 13:07:16 2014
@@ -33,9 +33,9 @@
# using this display manager?
db_get shared/default-x-display-manager
CURRENT_DEFAULT="$RET"
-# remove the default display manager file if we're going to change it
+# set a flag to indicate to postinst that we need to update from debconf
if [ "$OLD_DEFAULT" != "$CURRENT_DEFAULT" ]; then
- rm -f $DEFAULT_DISPLAY_MANAGER_FILE
+ touch $DEFAULT_DISPLAY_MANAGER_FILE.debconf-update
fi
exit 0
Modified: desktop/experimental/gdm3/debian/gdm3.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/gdm3.postinst?rev=41556&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/gdm3.postinst [utf-8] (original)
+++ desktop/experimental/gdm3/debian/gdm3.postinst [utf-8] Sun Apr 27 13:07:16 2014
@@ -22,9 +22,10 @@
usermod -c "Gnome Display Manager" Debian-gdm
fi
-# debconf is not a registry, so we only fiddle with the default file if it
-# does not exist
-if [ ! -e $DEFAULT_DISPLAY_MANAGER_FILE ]; then
+# debconf is not a registry, so we only fiddle with the default file if
+# the configure script requested an update
+if [ -e $DEFAULT_DISPLAY_MANAGER_FILE.debconf-update ]; then
+ rm -f $DEFAULT_DISPLAY_MANAGER_FILE.debconf-update
if db_get shared/default-x-display-manager; then
# workaround debconf passthru bug (#379198)
if [ -z "$RET" ]; then
More information about the pkg-gnome-commits
mailing list