use dpkg-maintscript-helper to remove old config file /etc/midori/extensions/libadblo...

diff --git a/debian/changelog b/debian/changelog
index a56d3e48694fe06c58ca6be7356e77e6bb6b249e..8b97fb7e8d84e2a35786cc241afa79062004a0d6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ midori (0.2.6-1) UNRELEASED; urgency=low
     - correct link to FAQ (Closes: #582512)
   * refresh patches
   * update copyright
+  * use dpkg-maintscript-helper to remove old config file
+    /etc/midori/extensions/libadblock.so (Closes: #573208)
 
- -- Ryan Niebur <ryan@debian.org>  Sun, 30 May 2010 11:26:13 -0700
+ -- Ryan Niebur <ryan@debian.org>  Tue, 01 Jun 2010 21:23:35 -0700
 
 midori (0.2.4-3) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index cab1dd202088c53fa80bf611ec7c3e859a4e0f19..0d9be4e7cb91319b16edbada8c800d16e16b89cf 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -36,6 +36,7 @@ Vcs-Browser: http://git.ryan52.info/?p=midori;a=summary
 Package: midori
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, dbus-x11, libjs-mootools
+Pre-Depends: dpkg (>= 1.15.7.2)
 Recommends: gnome-icon-theme
 Provides: www-browser
 # For http://bugs.debian.org/522436 (missing symbols):

diff --git a/debian/midori.postinst.base b/debian/midori.postinst.base
index 32f4b76c9cca451833ab3439e676cf8aea71384f..8ab85c7ff4a7af61c099ebacc0d4ebbdaa740e99 100644 (file)
--- a/debian/midori.postinst.base
+++ b/debian/midori.postinst.base
@@ -9,5 +9,7 @@ case "$1" in
             x-www-browser.1.gz /usr/share/man/man1/midori.1.gz
         ;;
 esac
+dpkg-maintscript-helper rm_conffile \
+ /etc/midori/extensions/libadblock.so/config 0.2.2-1 midori -- "$@"
 #DEBHELPER#
 exit 0

diff --git a/debian/midori.postrm b/debian/midori.postrm
new file mode 100644 (file)
index 0000000..0ce86b6
--- /dev/null
+++ b/debian/midori.postrm
@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e
+dpkg-maintscript-helper rm_conffile \
+ /etc/midori/extensions/libadblock.so/config 0.2.2-1 midori -- "$@"
+#DEBHELPER#
+exit 0

diff --git a/debian/midori.preinst b/debian/midori.preinst
new file mode 100644 (file)
index 0000000..0ce86b6
--- /dev/null
+++ b/debian/midori.preinst
@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e
+dpkg-maintscript-helper rm_conffile \
+ /etc/midori/extensions/libadblock.so/config 0.2.2-1 midori -- "$@"
+#DEBHELPER#
+exit 0