From: Yves-Alexis Perez <corsac@debian.org>
Date: Thu, 8 Mar 2012 22:57:16 +0000 (+0100)
Subject: debian/midori.maintscript:
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca25b392136032ba1dea21493467904020523d94;p=midori

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 92bc74a5..94e50f1c 100644
--- 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 01568415..2f048d7c 100644
--- 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 b1cedd2d..32f4b76c 100644
--- 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