r17788 - in /desktop/unstable/gconf/debian: changelog gconf2.postinst

[lool at users.alioth.debian.org]

Author: lool
Date: Sat Nov 29 13:06:09 2008
New Revision: 17788

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17788
Log:
Change the postinst to explicitely install the alternative on install and
upgrades from << 2.19.1-2.

Modified:
    desktop/unstable/gconf/debian/changelog
    desktop/unstable/gconf/debian/gconf2.postinst

Modified: desktop/unstable/gconf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/changelog?rev=17788&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/changelog (original)
+++ desktop/unstable/gconf/debian/changelog Sat Nov 29 13:06:09 2008
@@ -2,6 +2,8 @@
 
   * Replace homepage pseudo-field in description with a real source field in
     control.
+  * Change the postinst to explicitely install the alternative on install and
+    upgrades from << 2.19.1-2.
 
  -- Loic Minier <lool at dooz.org>  Sun, 03 Aug 2008 18:23:03 +0200
 

Modified: desktop/unstable/gconf/debian/gconf2.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/gconf2.postinst?rev=17788&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/gconf2.postinst (original)
+++ desktop/unstable/gconf/debian/gconf2.postinst Sat Nov 29 13:06:09 2008
@@ -1,18 +1,26 @@
 #!/bin/sh
+
 set -e
 
-if [ "$1" != "configure" ] || dpkg --compare-versions "$2" lt 2.19.1-2; then
+install_alternative() {
     update-alternatives \
-	--install /usr/bin/gconftool gconftool /usr/bin/gconftool-2 25 \
-	--slave /usr/share/man/man1/gconftool.1.gz gconftool.1.gz \
-		/usr/share/man/man1/gconftool-2.1.gz
+        --install /usr/bin/gconftool gconftool /usr/bin/gconftool-2 25 \
+        --slave /usr/share/man/man1/gconftool.1.gz gconftool.1.gz \
+                /usr/share/man/man1/gconftool-2.1.gz
+}
+
+if [ "$1" = install ]; then
+    install_alternative
+fi
+if [ "$1" = configure ] && dpkg --compare-versions "$2" lt-nl 2.19.1-2; then
+    install_alternative
 fi
 
 #DEBHELPER#
 
 for GCONF_DIR in /var/lib/gconf/defaults \
-		 /etc/gconf/gconf.xml.mandatory \
-		 /etc/gconf/gconf.xml.defaults ; do
+                 /etc/gconf/gconf.xml.mandatory \
+                 /etc/gconf/gconf.xml.defaults ; do
   GCONF_TREE=$GCONF_DIR/%gconf-tree.xml
   if [ ! -f "$GCONF_TREE" ]; then
     gconf-merge-tree "$GCONF_DIR"