From fd63447c9c323976e98bf49ca3426ed9eefa9a4b Mon Sep 17 00:00:00 2001 From: Yves-Alexis Perez Date: Tue, 14 Feb 2012 08:02:30 +0100 Subject: [PATCH 01/12] 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 From 9050091b93280e611af58a202200b5fcd142d031 Mon Sep 17 00:00:00 2001 From: Yves-Alexis Perez Date: Tue, 14 Feb 2012 08:02:42 +0100 Subject: [PATCH 02/12] remove old maintainer scripts --- debian/midori.postrm | 8 -------- debian/midori.preinst | 8 -------- 2 files changed, 16 deletions(-) delete mode 100644 debian/midori.postrm delete mode 100644 debian/midori.preinst diff --git a/debian/midori.postrm b/debian/midori.postrm deleted file mode 100644 index 1266c715..00000000 --- a/debian/midori.postrm +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e -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 deleted file mode 100644 index 1266c715..00000000 --- a/debian/midori.preinst +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e -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 From 794c71685c9bf1248c363d9380d2f06838c25d4d Mon Sep 17 00:00:00 2001 From: Yves-Alexis Perez Date: Thu, 8 Mar 2012 23:48:54 +0100 Subject: [PATCH 03/12] New upstream release. * New upstream release. * debian/control: - update standards version to 3.9.3. --- debian/changelog | 7 +++++-- debian/control | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3354d822..92bc74a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,12 @@ -midori (0.4.3-2) UNRELEASED; urgency=low +midori (0.4.4-1) UNRELEASED; urgency=low + * New upstream release. * Apply patch from Colin Watson to improve conffile handling, using new debhelper features. closes: #659773 + * debian/control: + - update standards version to 3.9.3. - -- Yves-Alexis Perez Mon, 13 Feb 2012 18:33:57 +0100 + -- Yves-Alexis Perez Thu, 08 Mar 2012 23:42:54 +0100 midori (0.4.3-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 8e89acce..356a8f25 100644 --- a/debian/control +++ b/debian/control @@ -31,7 +31,7 @@ Build-Depends: debhelper (>= 8.1.0~), Build-Conflicts: gtk-doc-tools, libgtksourceview2.0-dev (>= 2.0), libhildon-1-dev -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Homepage: http://www.twotoasts.de/index.php?/pages/midori_summary.html Vcs-Git: git://git.debian.org/collab-maint/midori.git Vcs-Browser: http://git.debian.org/?p=collab-maint/midori.git;a=summary From ca25b392136032ba1dea21493467904020523d94 Mon Sep 17 00:00:00 2001 From: Yves-Alexis Perez Date: Thu, 8 Mar 2012 23:57:16 +0100 Subject: [PATCH 04/12] debian/midori.maintscript: * debian/midori.maintscript: - handle the /etc/xdg/midori/extensions/libadblock.so removal there. --- debian/changelog | 2 ++ debian/midori.maintscript | 1 + debian/midori.postinst.base | 1 - 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 92bc74a5..94e50f1c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ midori (0.4.4-1) UNRELEASED; urgency=low debhelper features. closes: #659773 * debian/control: - update standards version to 3.9.3. + * debian/midori.maintscript: + - handle the /etc/xdg/midori/extensions/libadblock.so removal there. -- Yves-Alexis Perez Thu, 08 Mar 2012 23:42:54 +0100 diff --git a/debian/midori.maintscript b/debian/midori.maintscript index 01568415..2f048d7c 100644 --- a/debian/midori.maintscript +++ b/debian/midori.maintscript @@ -1 +1,2 @@ mv_conffile /etc/xdg/midori/extensions/libadblock.so/config /etc/xdg/midori/extensions/adblock/config 0.4.1-2 +rm_conffile /etc/xdg/midori/extensions/libadblock.so 0.4.1-2 diff --git a/debian/midori.postinst.base b/debian/midori.postinst.base index b1cedd2d..32f4b76c 100644 --- a/debian/midori.postinst.base +++ b/debian/midori.postinst.base @@ -10,5 +10,4 @@ case "$1" in ;; esac #DEBHELPER# -rmdir /etc/xdg/midori/extensions/libadblock.so || true exit 0 From b104b685da32c29e1e720a135cb9530257b4ce50 Mon Sep 17 00:00:00 2001 From: Yves-Alexis Perez Date: Thu, 8 Mar 2012 23:58:56 +0100 Subject: [PATCH 05/12] add bug # --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index 94e50f1c..055fa28b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ midori (0.4.4-1) UNRELEASED; urgency=low - update standards version to 3.9.3. * debian/midori.maintscript: - handle the /etc/xdg/midori/extensions/libadblock.so removal there. + closes: #660303 -- Yves-Alexis Perez Thu, 08 Mar 2012 23:42:54 +0100 From 23b89cca6b96266eea166b30ac8d1591ffbf7b2f Mon Sep 17 00:00:00 2001 From: Yves-Alexis Perez Date: Thu, 15 Mar 2012 11:06:51 +0100 Subject: [PATCH 06/12] rebuild waf script * debian/rules: - rebuild waf script before using it. closes: #645191 --- debian/changelog | 2 ++ debian/rules | 16 +++++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 055fa28b..deede9d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ midori (0.4.4-1) UNRELEASED; urgency=low * debian/midori.maintscript: - handle the /etc/xdg/midori/extensions/libadblock.so removal there. closes: #660303 + * debian/rules: + - rebuild waf script before using it. closes: #645191 -- Yves-Alexis Perez Thu, 08 Mar 2012 23:42:54 +0100 diff --git a/debian/rules b/debian/rules index a528fdf7..b36a2f1c 100755 --- a/debian/rules +++ b/debian/rules @@ -23,7 +23,16 @@ endif %: dh $@ -WAF=./waf +WAF=./waf.regen + +$(WAF): waf + # rebuild the waf script + sed < waf -e '1,/^#==>$$/ d' -e '/^#<==$$/ d' | tr -d '\n' | sed -e 's/.//' -e 's/#[*]/\n/g' -e 's/#%/\r/g' > waf.orig.tar.bz2 + (sed -n < waf -e '1,/^#==>$$/ p'; echo REPLACED BY ENCODED TAR.BZ2; sed -n < waf -e '/^#<==$$/ p') > waf.hdr + (sed -n < waf.hdr -e '1,/^#==>$$/ p'; printf '#'; perl -pe < waf.orig.tar.bz2 's/\n/#*/g; s/\r/#%/g;'; echo; sed -n < waf.hdr -e '/^#<==$$/ p') > waf.regen + chmod 755 waf.regen + # ensure both scripts are the same + cmp waf waf.regen && (rm waf.hdr waf.orig.tar.bz2) debian/presubj: debian/presubj.in @echo "presubj parameters:" @@ -37,13 +46,14 @@ debian/presubj: debian/presubj.in override_dh_install: debian/presubj $(CMD) --fail-missing -override_dh_auto_clean: +override_dh_auto_clean: $(WAF) $(WAF) --nocache distclean rm -rf _build_ rm -rf .waf* rm -rf .lock-wscript + rm -f $(WAF) -override_dh_auto_configure: +override_dh_auto_configure: $(WAF) $(WAF) --nocache configure --debug-level=none --prefix /usr override_dh_auto_build: From da4f15e9bb5b9c832efa4407b0d9ac19d608f725 Mon Sep 17 00:00:00 2001 From: Yves-Alexis Perez Date: Sat, 14 Apr 2012 14:47:18 +0200 Subject: [PATCH 07/12] don't repack waf for now --- debian/changelog | 2 -- debian/rules | 23 +++++++++++------------ 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index deede9d0..055fa28b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,6 @@ midori (0.4.4-1) UNRELEASED; urgency=low * debian/midori.maintscript: - handle the /etc/xdg/midori/extensions/libadblock.so removal there. closes: #660303 - * debian/rules: - - rebuild waf script before using it. closes: #645191 -- Yves-Alexis Perez Thu, 08 Mar 2012 23:42:54 +0100 diff --git a/debian/rules b/debian/rules index b36a2f1c..1c82c045 100755 --- a/debian/rules +++ b/debian/rules @@ -23,16 +23,16 @@ endif %: dh $@ -WAF=./waf.regen +WAF=./waf -$(WAF): waf - # rebuild the waf script - sed < waf -e '1,/^#==>$$/ d' -e '/^#<==$$/ d' | tr -d '\n' | sed -e 's/.//' -e 's/#[*]/\n/g' -e 's/#%/\r/g' > waf.orig.tar.bz2 - (sed -n < waf -e '1,/^#==>$$/ p'; echo REPLACED BY ENCODED TAR.BZ2; sed -n < waf -e '/^#<==$$/ p') > waf.hdr - (sed -n < waf.hdr -e '1,/^#==>$$/ p'; printf '#'; perl -pe < waf.orig.tar.bz2 's/\n/#*/g; s/\r/#%/g;'; echo; sed -n < waf.hdr -e '/^#<==$$/ p') > waf.regen - chmod 755 waf.regen - # ensure both scripts are the same - cmp waf waf.regen && (rm waf.hdr waf.orig.tar.bz2) +#$(WAF): waf +# # rebuild the waf script +# sed < waf -e '1,/^#==>$$/ d' -e '/^#<==$$/ d' | tr -d '\n' | sed -e 's/.//' -e 's/#[*]/\n/g' -e 's/#%/\r/g' > waf.orig.tar.bz2 +# (sed -n < waf -e '1,/^#==>$$/ p'; echo REPLACED BY ENCODED TAR.BZ2; sed -n < waf -e '/^#<==$$/ p') > waf.hdr +# (sed -n < waf.hdr -e '1,/^#==>$$/ p'; printf '#'; perl -pe < waf.orig.tar.bz2 's/\n/#*/g; s/\r/#%/g;'; echo; sed -n < waf.hdr -e '/^#<==$$/ p') > waf.regen +# chmod 755 waf.regen +# # ensure both scripts are the same +# cmp waf waf.regen && (rm waf.hdr waf.orig.tar.bz2) debian/presubj: debian/presubj.in @echo "presubj parameters:" @@ -46,14 +46,13 @@ debian/presubj: debian/presubj.in override_dh_install: debian/presubj $(CMD) --fail-missing -override_dh_auto_clean: $(WAF) +override_dh_auto_clean: $(WAF) --nocache distclean rm -rf _build_ rm -rf .waf* rm -rf .lock-wscript - rm -f $(WAF) -override_dh_auto_configure: $(WAF) +override_dh_auto_configure: $(WAF) --nocache configure --debug-level=none --prefix /usr override_dh_auto_build: From 73c6fc50687d3272bc1be89bb4cf61d33ffe6d96 Mon Sep 17 00:00:00 2001 From: Yves-Alexis Perez Date: Sat, 14 Apr 2012 14:51:11 +0200 Subject: [PATCH 08/12] upload --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 055fa28b..31e3d2d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -midori (0.4.4-1) UNRELEASED; urgency=low +midori (0.4.4-1) unstable; urgency=low * New upstream release. * Apply patch from Colin Watson to improve conffile handling, using new @@ -9,7 +9,7 @@ midori (0.4.4-1) UNRELEASED; urgency=low - handle the /etc/xdg/midori/extensions/libadblock.so removal there. closes: #660303 - -- Yves-Alexis Perez Thu, 08 Mar 2012 23:42:54 +0100 + -- Yves-Alexis Perez Sat, 14 Apr 2012 14:47:59 +0200 midori (0.4.3-1) unstable; urgency=low From fd5d3ee02c4a216e9f54af240b83daf17e96808c Mon Sep 17 00:00:00 2001 From: Yves-Alexis Perez Date: Tue, 17 Apr 2012 23:07:00 +0200 Subject: [PATCH 09/12] fix libsoup detection --- debian/changelog | 4 +++- debian/patches/fix-libsoup-detect.patch | 19 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 debian/patches/fix-libsoup-detect.patch diff --git a/debian/changelog b/debian/changelog index 31e3d2d3..8e1ce44f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -midori (0.4.4-1) unstable; urgency=low +midori (0.4.5-1) UNRELEASED; urgency=low * New upstream release. * Apply patch from Colin Watson to improve conffile handling, using new @@ -8,6 +8,8 @@ midori (0.4.4-1) unstable; urgency=low * debian/midori.maintscript: - handle the /etc/xdg/midori/extensions/libadblock.so removal there. closes: #660303 + * debian/patches: + - fix-libsoup detection added. -- Yves-Alexis Perez Sat, 14 Apr 2012 14:47:59 +0200 diff --git a/debian/patches/fix-libsoup-detect.patch b/debian/patches/fix-libsoup-detect.patch new file mode 100644 index 00000000..c1fcd1b2 --- /dev/null +++ b/debian/patches/fix-libsoup-detect.patch @@ -0,0 +1,19 @@ +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 5367257f..6b5507a5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ add-debian-searches +fix-libsoup-detect.patch From ee57ca105651fb09f5912058e4e98be76ecb4eed Mon Sep 17 00:00:00 2001 From: Yves-Alexis Perez Date: Tue, 8 May 2012 15:42:14 +0200 Subject: [PATCH 10/12] force-ssl-cert-verification added, set ssl-strict to TRUE so connections are not done if the ssl certificate can't be trusted. --- debian/changelog | 2 ++ .../patches/force-ssl-cert-verification.patch | 22 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 25 insertions(+) create mode 100644 debian/patches/force-ssl-cert-verification.patch diff --git a/debian/changelog b/debian/changelog index 8e1ce44f..e49781ec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ midori (0.4.5-1) UNRELEASED; urgency=low 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. -- Yves-Alexis Perez Sat, 14 Apr 2012 14:47:59 +0200 diff --git a/debian/patches/force-ssl-cert-verification.patch b/debian/patches/force-ssl-cert-verification.patch new file mode 100644 index 00000000..7f668242 --- /dev/null +++ b/debian/patches/force-ssl-cert-verification.patch @@ -0,0 +1,22 @@ +diff --git a/midori/main.c b/midori/main.c +index 2ec5599..af3cc71 100644 +--- a/midori/main.c ++++ b/midori/main.c +@@ -1019,7 +1019,7 @@ midori_load_soup_session (gpointer settings) + #if defined (HAVE_LIBSOUP_2_37_1) + g_object_set (session, + "ssl-use-system-ca-file", TRUE, +- "ssl-strict", FALSE, ++ "ssl-strict", TRUE, + NULL); + #elif defined (HAVE_LIBSOUP_2_29_91) + const gchar* certificate_files[] = +@@ -1038,7 +1038,7 @@ midori_load_soup_session (gpointer settings) + { + g_object_set (session, + "ssl-ca-file", certificate_files[i], +- "ssl-strict", FALSE, ++ "ssl-strict", TRUE, + NULL); + break; + } diff --git a/debian/patches/series b/debian/patches/series index 6b5507a5..1a1ae4a8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ add-debian-searches fix-libsoup-detect.patch +force-ssl-cert-verification.patch From 13dcb271ea7e1bd90c4e9a2e8ce69032c80c512d Mon Sep 17 00:00:00 2001 From: Yves-Alexis Perez Date: Tue, 15 May 2012 23:43:47 +0200 Subject: [PATCH 11/12] 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 From 194aab34731aa7d299b336f91b0ee5828086284f Mon Sep 17 00:00:00 2001 From: Yves-Alexis Perez Date: Wed, 29 Aug 2012 15:33:00 +0200 Subject: [PATCH 12/12] update homepage address. --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 6e66fa66..d89c2cfd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ midori (0.4.6-1) UNRELEASED; urgency=low debhelper features. closes: #659773 * debian/control: - update standards version to 3.9.3. + - update homepage address. * debian/midori.maintscript: - handle the /etc/xdg/midori/extensions/libadblock.so removal there. closes: #660303 diff --git a/debian/control b/debian/control index 356a8f25..efacf8c7 100644 --- a/debian/control +++ b/debian/control @@ -32,7 +32,7 @@ Build-Conflicts: gtk-doc-tools, libgtksourceview2.0-dev (>= 2.0), libhildon-1-dev Standards-Version: 3.9.3 -Homepage: http://www.twotoasts.de/index.php?/pages/midori_summary.html +Homepage: http://www.midori-browser.org Vcs-Git: git://git.debian.org/collab-maint/midori.git Vcs-Browser: http://git.debian.org/?p=collab-maint/midori.git;a=summary