From 13dcb271ea7e1bd90c4e9a2e8ce69032c80c512d Mon Sep 17 00:00:00 2001 From: Yves-Alexis Perez Date: Tue, 15 May 2012 23:43:47 +0200 Subject: [PATCH] debian/compat bumped to 9. --- debian/changelog | 6 +++--- debian/compat | 2 +- debian/patches/fix-libsoup-detect.patch | 19 ------------------- debian/patches/series | 1 - 4 files changed, 4 insertions(+), 24 deletions(-) delete mode 100644 debian/patches/fix-libsoup-detect.patch diff --git a/debian/changelog b/debian/changelog index e49781ec..6e66fa66 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -midori (0.4.5-1) UNRELEASED; urgency=low +midori (0.4.6-1) UNRELEASED; urgency=low * New upstream release. * Apply patch from Colin Watson to improve conffile handling, using new @@ -9,11 +9,11 @@ midori (0.4.5-1) UNRELEASED; urgency=low - handle the /etc/xdg/midori/extensions/libadblock.so removal there. closes: #660303 * debian/patches: - - fix-libsoup detection added. - force-ssl-cert-verification added, set ssl-strict to TRUE so connections are not done if the ssl certificate can't be trusted. + * debian/compat bumped to 9. - -- Yves-Alexis Perez Sat, 14 Apr 2012 14:47:59 +0200 + -- Yves-Alexis Perez Tue, 15 May 2012 23:31:12 +0200 midori (0.4.3-1) unstable; urgency=low diff --git a/debian/compat b/debian/compat index 7f8f011e..ec635144 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/patches/fix-libsoup-detect.patch b/debian/patches/fix-libsoup-detect.patch deleted file mode 100644 index c1fcd1b2..00000000 --- a/debian/patches/fix-libsoup-detect.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/wscript b/wscript -index db74324..c7a0c87 100644 ---- a/wscript -+++ b/wscript -@@ -260,11 +260,11 @@ def configure (conf): - check_pkg ('libsoup-2.4', '2.27.90') - conf.define ('LIBSOUP_VERSION', conf.check_cfg (modversion='libsoup-2.4')) - if check_version (conf.env['LIBSOUP_VERSION'], 2, 29, 3): -- conf.define ('LIBSOUP_2_29_3', 1) -+ conf.define ('HAVE_LIBSOUP_2_29_3', 1) - if check_version (conf.env['LIBSOUP_VERSION'], 2, 29, 91): -- conf.define ('LIBSOUP_2_29_91', 1) -+ conf.define ('HAVE_LIBSOUP_2_29_91', 1) - if check_version (conf.env['LIBSOUP_VERSION'], 2, 37, 1): -- conf.define ('LIBSOUP_2_37_1', 1) -+ conf.define ('HAVE_LIBSOUP_2_37_1', 1) - check_pkg ('libxml-2.0', '2.6') - check_pkg ('sqlite3', '3.0', True, var='SQLITE') - diff --git a/debian/patches/series b/debian/patches/series index 1a1ae4a8..4aa41c59 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ add-debian-searches -fix-libsoup-detect.patch force-ssl-cert-verification.patch