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

[kov at users.alioth.debian.org]

Author: kov
Date: Sat Sep 26 14:33:59 2009
New Revision: 21627

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21627
Log:
make sure diversions installed by epiphany-webkit are removed

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=21627&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/changelog [utf-8] Sat Sep 26 14:33:59 2009
@@ -3,8 +3,10 @@
   * debian/control.in:
   - We also want to transition epiphany-gecko, as it may be installed
     alone
-
- -- Gustavo Noronha Silva <kov at debian.org>  Fri, 25 Sep 2009 09:59:01 -0300
+  * debian/epiphany-browser.preinst:
+  - make sure diversions installed by epiphany-webkit are removed
+
+ -- Gustavo Noronha Silva <kov at debian.org>  Sat, 26 Sep 2009 11:23:30 -0300
 
 epiphany-browser (2.28.0-3) unstable; urgency=low
 

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=21627&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/epiphany-browser.preinst [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/epiphany-browser.preinst [utf-8] Sat Sep 26 14:33:59 2009
@@ -6,4 +6,7 @@
     update-alternatives --remove-all epiphany-browser 2> /dev/null || true
 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
+
 #DEBHELPER#