r21062 - in /desktop/experimental/epiphany-webkit/debian: changelog epiphany-webkit-data.preinst

[kov at users.alioth.debian.org]

Author: kov
Date: Tue Aug 25 14:52:08 2009
New Revision: 21062

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21062
Log:
Always call dpkg-divert on preinst (Closes: #541244)

Modified:
    desktop/experimental/epiphany-webkit/debian/changelog
    desktop/experimental/epiphany-webkit/debian/epiphany-webkit-data.preinst

Modified: desktop/experimental/epiphany-webkit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/changelog?rev=21062&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/changelog [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/changelog [utf-8] Tue Aug 25 14:52:08 2009
@@ -8,8 +8,10 @@
   * debian/patches/07_bookmarks.patch,
     debian/patches/99_autoreconf.patch:
   - refreshed
-
- -- Gustavo Noronha Silva <kov at debian.org>  Tue, 25 Aug 2009 11:45:49 -0300
+  * debian/epiphany-webkit-data.preinst:
+  - always call dpkg-divert on preinst (Closes: #541244)
+
+ -- Gustavo Noronha Silva <kov at debian.org>  Tue, 25 Aug 2009 11:51:37 -0300
 
 epiphany-webkit (2.27.5-1) unstable; urgency=low
 

Modified: desktop/experimental/epiphany-webkit/debian/epiphany-webkit-data.preinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/epiphany-webkit-data.preinst?rev=21062&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/epiphany-webkit-data.preinst [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/epiphany-webkit-data.preinst [utf-8] Tue Aug 25 14:52:08 2009
@@ -3,10 +3,6 @@
 
 add_diversions ()
 {
-    if [ "$1" ] && dpkg --compare-versions "$1" ge 2.27.0~svn.8831-1; then
-        return;
-    fi
-
     dpkg-divert --package epiphany-webkit-data --rename \
         --divert /usr/share/dbus-1/services/org.gnome.Epiphany.service.gecko \
         --add /usr/share/dbus-1/services/org.gnome.Epiphany.service