r22717 - in /desktop/unstable/epiphany-browser/debian: changelog epiphany-browser.preinst

[joss at users.alioth.debian.org]

Author: joss
Date: Mon Jan  4 21:41:26 2010
New Revision: 22717

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22717
Log:
Remove obsolete /usr/bin/epiphany alternative in the preinst upon 
upgrades. Closes: #562534.

Modified:
    desktop/unstable/epiphany-browser/debian/changelog
    desktop/unstable/epiphany-browser/debian/epiphany-browser.preinst

Modified: desktop/unstable/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/changelog?rev=22717&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/changelog [utf-8] Mon Jan  4 21:41:26 2010
@@ -1,7 +1,12 @@
 epiphany-browser (2.29.3-2) UNRELEASED; urgency=low
 
+  [ Emilio Pozuelo Monfort ]
   * debian/control.in:
     - Add missing build dependency on libgnome-keyring-dev.
+
+  [ Josselin Mouette ]
+  * Remove obsolete /usr/bin/epiphany alternative in the preinst upon 
+    upgrades. Closes: #562534.
 
  -- Emilio Pozuelo Monfort <pochu at debian.org>  Sun, 06 Dec 2009 13:15:54 +0100
 

Modified: desktop/unstable/epiphany-browser/debian/epiphany-browser.preinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/epiphany-browser.preinst?rev=22717&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/epiphany-browser.preinst [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/epiphany-browser.preinst [utf-8] Mon Jan  4 21:41:26 2010
@@ -6,6 +6,12 @@
     update-alternatives --remove-all epiphany-browser 2> /dev/null || true
 fi
 
+if [ "$1" = "upgrade" ] && dpkg --compare-versions "$2" lt-nl 2.29.3-2; then
+  for alt in x-www-browser gnome-www-browser; do
+    update-alternatives --remove $alt /usr/bin/epiphany 2> /dev/null || true
+  done
+fi
+
 dpkg-divert --remove --rename --package epiphany-webkit /usr/bin/epiphany 2> /dev/null
 dpkg-divert --remove --rename --package epiphany-webkit /usr/share/man/man1/epiphany.1.gz 2> /dev/null