r18630 - in /desktop/experimental/epiphany-webkit/debian: epiphany-webkit-data.postrm epiphany-webkit-data.preinst epiphany-webkit.preinst

[kov at users.alioth.debian.org]

Author: kov
Date: Tue Mar  3 23:48:42 2009
New Revision: 18630

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=18630
Log:
more diversions added, and improved diversion handling

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

Modified: desktop/experimental/epiphany-webkit/debian/epiphany-webkit-data.postrm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/epiphany-webkit-data.postrm?rev=18630&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/epiphany-webkit-data.postrm (original)
+++ desktop/experimental/epiphany-webkit/debian/epiphany-webkit-data.postrm Tue Mar  3 23:48:42 2009
@@ -2,9 +2,23 @@
 set -e
 
 if [ "$1" = "remove" ]; then
-    dpkg-divert --package epiphany-webkit --rename \
+    dpkg-divert --package epiphany-webkit-data --rename \
         --divert /usr/share/dbus-1/services/org.gnome.Epiphany.service.gecko \
         --remove /usr/share/dbus-1/services/org.gnome.Epiphany.service
+
+    for icon in \
+        /usr/share/icons/hicolor/scalable/apps/gnome-web-browser.svg \
+        /usr/share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-web-browser.png \
+        /usr/share/icons/HighContrastLargePrint/48x48/apps/gnome-web-browser.png \
+        /usr/share/icons/LowContrastLargePrint/48x48/apps/gnome-web-browser.png \
+        /usr/share/icons/hicolor/32x32/apps/gnome-web-browser.png \
+        /usr/share/icons/hicolor/24x24/apps/gnome-web-browser.png \
+        /usr/share/icons/hicolor/22x22/apps/gnome-web-browser.png \
+        /usr/share/icons/hicolor/16x16/apps/gnome-web-browser.png \
+        /usr/share/icons/hicolor/48x48/apps/epiphany-bookmarks.png; do
+        dpkg-divert --package epiphany-webkit-data --rename \
+            --divert ${icon}.gecko --remove ${icon}
+    done
 fi
 
 #DEBHELPER#

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=18630&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/epiphany-webkit-data.preinst (original)
+++ desktop/experimental/epiphany-webkit/debian/epiphany-webkit-data.preinst Tue Mar  3 23:48:42 2009
@@ -1,10 +1,32 @@
 #!/bin/sh
 set -e
 
-if [ "$1" = "install" ]; then
-    dpkg-divert --package epiphany-webkit --rename \
+function 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
+
+    for icon in \
+        /usr/share/icons/hicolor/scalable/apps/gnome-web-browser.svg \
+        /usr/share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-web-browser.png \
+        /usr/share/icons/HighContrastLargePrint/48x48/apps/gnome-web-browser.png \
+        /usr/share/icons/LowContrastLargePrint/48x48/apps/gnome-web-browser.png \
+        /usr/share/icons/hicolor/32x32/apps/gnome-web-browser.png \
+        /usr/share/icons/hicolor/24x24/apps/gnome-web-browser.png \
+        /usr/share/icons/hicolor/22x22/apps/gnome-web-browser.png \
+        /usr/share/icons/hicolor/16x16/apps/gnome-web-browser.png \
+        /usr/share/icons/hicolor/48x48/apps/epiphany-bookmarks.png; do
+        dpkg-divert --package epiphany-webkit-data --rename \
+            --divert ${icon}.gecko --add ${icon}
+    done
+}
+if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
+    add_diversions $2
 fi
 
 #DEBHELPER#

Modified: desktop/experimental/epiphany-webkit/debian/epiphany-webkit.preinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/epiphany-webkit.preinst?rev=18630&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/epiphany-webkit.preinst (original)
+++ desktop/experimental/epiphany-webkit/debian/epiphany-webkit.preinst Tue Mar  3 23:48:42 2009
@@ -1,7 +1,12 @@
 #!/bin/sh
 set -e
 
-if [ "$1" = "install" ]; then
+function add_diversions
+{
+    if [ "$1" ] && dpkg --compare-versions "$1" ge 2.27.0~svn.8831-1; then
+        return;
+    fi
+
     dpkg-divert --package epiphany-webkit --rename \
         --divert /usr/bin/epiphany.gecko \
         --add /usr/bin/epiphany
@@ -9,6 +14,10 @@
     dpkg-divert --package epiphany-webkit --rename \
         --divert /usr/share/man/man1/epiphany.1.gz.gecko \
         --add /usr/share/man/man1/epiphany.1.gz
+}
+
+if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
+    add_diversions $2
 fi
 
 #DEBHELPER#