From fd63447c9c323976e98bf49ca3426ed9eefa9a4b Mon Sep 17 00:00:00 2001 From: Yves-Alexis Perez Date: Tue, 14 Feb 2012 08:02:30 +0100 Subject: [PATCH] Apply patch from Colin Watson to improve conffile handling, using new debhelper features. closes: #659773 --- debian/changelog | 7 +++++++ debian/control | 3 ++- debian/midori.maintscript | 1 + debian/midori.postinst.base | 6 +----- 4 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 debian/midori.maintscript diff --git a/debian/changelog b/debian/changelog index 1f6a562a..3354d822 100644 --- 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 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 92a74c5f..8e89acce 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: web Priority: optional Maintainer: Ryan Niebur Uploaders: Yves-Alexis Perez -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 index 00000000..01568415 --- /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 4ac5bf43..b1cedd2d 100644 --- 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 -- 2.39.5