Apply patch from Colin Watson to improve conffile handling, using new debhelper featu...

diff --git a/debian/changelog b/debian/changelog
index 1f6a562a1f396faaf0ebb33c6f9078d8a77eae78..3354d822bd29df1be922c62bba285d6cebb156ac 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+midori (0.4.3-2) UNRELEASED; urgency=low
+
+  * Apply patch from Colin Watson to improve conffile handling, using new
+    debhelper features.                                         closes: #659773
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Mon, 13 Feb 2012 18:33:57 +0100
+
 midori (0.4.3-1) unstable; urgency=low
 
   * New upstream release.

diff --git a/debian/control b/debian/control
index 92a74c5f7e972711415c0f54c0868e5a006ceaf5..8e89acce0e9b35cfd78303aa58d28794a099bbb3 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: web
 Priority: optional
 Maintainer: Ryan Niebur <ryan@debian.org>
 Uploaders: Yves-Alexis Perez <corsac@debian.org>
-Build-Depends: debhelper (>= 7.0.50),
+Build-Depends: debhelper (>= 8.1.0~),
  lsb-release,
  libgtk2.0-dev (>= 2.10),
  libglib2.0-dev,
@@ -38,6 +38,7 @@ Vcs-Browser: http://git.debian.org/?p=collab-maint/midori.git;a=summary
 
 Package: midori
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}, dbus-x11
 Recommends: gnome-icon-theme
 Provides: www-browser

diff --git a/debian/midori.maintscript b/debian/midori.maintscript
new file mode 100644 (file)
index 0000000..0156841
--- /dev/null
+++ b/debian/midori.maintscript
@@ -0,0 +1 @@
+mv_conffile /etc/xdg/midori/extensions/libadblock.so/config /etc/xdg/midori/extensions/adblock/config 0.4.1-2

diff --git a/debian/midori.postinst.base b/debian/midori.postinst.base
index 4ac5bf4305e52a4bf9ab2c379a4abfea3d420ab2..b1cedd2dee1bb9ffa2453bd745fd9f7be6dff80d 100644 (file)
--- a/debian/midori.postinst.base
+++ b/debian/midori.postinst.base
@@ -9,10 +9,6 @@ case "$1" in
             x-www-browser.1.gz /usr/share/man/man1/midori.1.gz
         ;;
 esac
-dpkg-maintscript-helper mv_conffile \
- /etc/xdg/midori/extensions/libadblock.so/config \
- /etc/xdg/midori/extensions/adblock/config \
- 0.4.1-2 midori -- "$@"
-rmdir /etc/xdg/midori/extensions/libadblock.so || true
 #DEBHELPER#
+rmdir /etc/xdg/midori/extensions/libadblock.so || true
 exit 0