From: Yves-Alexis Perez <corsac@debian.org>
Date: Mon, 14 Nov 2011 12:08:47 +0000 (+0100)
Subject: * debian/midori.{preinst,postinst,postrm}:
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4db20c930e818c83fbc697f4e2442337e983daee;p=midori

* debian/midori.{preinst,postinst,postrm}:
  - handle adblock configuration file rename.
---

diff --git a/debian/changelog b/debian/changelog
index 7406ed54..620cc482 100644
--- 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 8ab85c7f..e2918403 100644
--- 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 0ce86b64..1266c715 100644
--- 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 0ce86b64..1266c715 100644
--- 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