* debian/midori.{preinst,postinst,postrm}:

  - handle adblock configuration file rename.

diff --git a/debian/changelog b/debian/changelog
index 7406ed545976f6d5c0b933a30971aba8ffc25c85..620cc48205be4cf0732a3755893d2a071964dc3a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 midori (0.4.2-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * debian/midori.{preinst,postinst,postrm}:
+    - handle adblock configuration file rename.
 
  -- Yves-Alexis Perez <corsac@debian.org>  Mon, 14 Nov 2011 11:02:09 +0100
 

diff --git a/debian/midori.postinst.base b/debian/midori.postinst.base
index 8ab85c7ff4a7af61c099ebacc0d4ebbdaa740e99..e2918403b2e78fdbff5b6ae064bdf5dc4ae7491b 100644 (file)
--- a/debian/midori.postinst.base
+++ b/debian/midori.postinst.base
@@ -9,7 +9,9 @@ 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 -- "$@"
+dpkg-maintscript-helper mv_conffile \
+ /etc/xdg/midori/extensions/libadblock.so/config \
+ /etc/xdg/midori/extensions/adblock/config \
+ 0.4.1-2 midori -- "$@"
 #DEBHELPER#
 exit 0

diff --git a/debian/midori.postrm b/debian/midori.postrm
index 0ce86b6453a1d4ed2247ee99c59ccca4b382efaf..1266c7157b52a25c169f53ae13158225185d16d3 100644 (file)
--- a/debian/midori.postrm
+++ b/debian/midori.postrm
@@ -1,6 +1,8 @@
 #!/bin/sh
 set -e
-dpkg-maintscript-helper rm_conffile \
- /etc/midori/extensions/libadblock.so/config 0.2.2-1 midori -- "$@"
+dpkg-maintscript-helper mv_conffile \
+ /etc/xdg/midori/extensions/libadblock.so/config \
+ /etc/xdg/midori/extensions/adblock/config \
+ 0.4.1-2 midori -- "$@"
 #DEBHELPER#
 exit 0

diff --git a/debian/midori.preinst b/debian/midori.preinst
index 0ce86b6453a1d4ed2247ee99c59ccca4b382efaf..1266c7157b52a25c169f53ae13158225185d16d3 100644 (file)
--- a/debian/midori.preinst
+++ b/debian/midori.preinst
@@ -1,6 +1,8 @@
 #!/bin/sh
 set -e
-dpkg-maintscript-helper rm_conffile \
- /etc/midori/extensions/libadblock.so/config 0.2.2-1 midori -- "$@"
+dpkg-maintscript-helper mv_conffile \
+ /etc/xdg/midori/extensions/libadblock.so/config \
+ /etc/xdg/midori/extensions/adblock/config \
+ 0.4.1-2 midori -- "$@"
 #DEBHELPER#
 exit 0