r11721 - in /desktop/experimental/gconf2/debian: changelog gconf2.postinst

[joss at users.alioth.debian.org]

Author: joss
Date: Thu Jun 28 17:57:01 2007
New Revision: 11721

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11721
Log:
* debian/gconf2.postinst: check the version we upgrade from before 
  not installing the alternative.

Modified:
    desktop/experimental/gconf2/debian/changelog
    desktop/experimental/gconf2/debian/gconf2.postinst

Modified: desktop/experimental/gconf2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gconf2/debian/changelog?rev=11721&op=diff
==============================================================================
--- desktop/experimental/gconf2/debian/changelog (original)
+++ desktop/experimental/gconf2/debian/changelog Thu Jun 28 17:57:01 2007
@@ -1,9 +1,14 @@
 gconf2 (2.19.1-2) UNRELEASED; urgency=low
 
+  [ Sebastien Bacher ]
   * debian/gconf2.postinst, debian/gconf2.prerm:
     - don't remove the alternative on upgrade
 
- -- Sebastien Bacher <seb128 at debian.org>  Thu, 28 Jun 2007 17:39:59 +0200
+  [ Josselin Mouette ]
+  * debian/gconf2.postinst: check the version we upgrade from before 
+    not installing the alternative.
+
+ -- Josselin Mouette <joss at debian.org>  Thu, 28 Jun 2007 19:56:23 +0200
 
 gconf2 (2.19.1-1) experimental; urgency=low
 

Modified: desktop/experimental/gconf2/debian/gconf2.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gconf2/debian/gconf2.postinst?rev=11721&op=diff
==============================================================================
--- desktop/experimental/gconf2/debian/gconf2.postinst (original)
+++ desktop/experimental/gconf2/debian/gconf2.postinst Thu Jun 28 17:57:01 2007
@@ -2,7 +2,7 @@
 
 set -e
 
-if [ "$1" != "upgrade" ]; then
+if [ "$1" != "configure" ] || dpkg --compare-versions "$2" lt 2.19.1-2; then
     update-alternatives \
 	--install /usr/bin/gconftool gconftool /usr/bin/gconftool-2 25 \
 	--slave /usr/share/man/man1/gconftool.1.gz gconftool.1.gz \