debian/midori.maintscript:

* debian/midori.maintscript:
  - handle the /etc/xdg/midori/extensions/libadblock.so removal there.

diff --git a/debian/changelog b/debian/changelog
index 92bc74a5dcb4634bc0a97b467d7390c0b0bc014a..94e50f1c06c337b2a3bdd316830e3039176b5a64 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ midori (0.4.4-1) UNRELEASED; urgency=low
     debhelper features.                                         closes: #659773
   * debian/control:
     - update standards version to 3.9.3.
+  * debian/midori.maintscript:
+    - handle the /etc/xdg/midori/extensions/libadblock.so removal there.
 
  -- Yves-Alexis Perez <corsac@debian.org>  Thu, 08 Mar 2012 23:42:54 +0100
 

diff --git a/debian/midori.maintscript b/debian/midori.maintscript
index 015684155ce153bcf8be62c4d720a7b345df0f8c..2f048d7c875da392037d7291d3cbe94c24c8b43f 100644 (file)
--- a/debian/midori.maintscript
+++ b/debian/midori.maintscript
@@ -1 +1,2 @@
 mv_conffile /etc/xdg/midori/extensions/libadblock.so/config /etc/xdg/midori/extensions/adblock/config 0.4.1-2
+rm_conffile /etc/xdg/midori/extensions/libadblock.so 0.4.1-2

diff --git a/debian/midori.postinst.base b/debian/midori.postinst.base
index b1cedd2dee1bb9ffa2453bd745fd9f7be6dff80d..32f4b76c9cca451833ab3439e676cf8aea71384f 100644 (file)
--- a/debian/midori.postinst.base
+++ b/debian/midori.postinst.base
@@ -10,5 +10,4 @@ case "$1" in
         ;;
 esac
 #DEBHELPER#
-rmdir /etc/xdg/midori/extensions/libadblock.so || true
 exit 0