diff -Nru 6tunnel-0.11rc2/debian/changelog 6tunnel-0.11rc2/debian/changelog --- 6tunnel-0.11rc2/debian/changelog 2012-03-25 04:35:47.000000000 +0000 +++ 6tunnel-0.11rc2/debian/changelog 2013-05-24 04:23:29.000000000 +0000 @@ -1,3 +1,21 @@ +6tunnel (0.11rc2-8) unstable; urgency=low + + * debian/control + - (standards-Version): Update to 3.9.4. + * debian/copyright + - Update to Format 1.0. + - Update Upstream-Contact (Closes: #709332). + Thanks to Jakub Wilk . + - Update years. + * debian/patches + - (30): New. Fix typos in manual page (Closes: #709334). + Thanks to Jakub Wilk . + * debian/watch + - Update. Add uversionmangle, dversionmangle and improve URL. + Thanks to Bart Martens . + + -- Jari Aalto Thu, 23 May 2013 12:17:40 +0300 + 6tunnel (0.11rc2-7) unstable; urgency=low * debian/control diff -Nru 6tunnel-0.11rc2/debian/control 6tunnel-0.11rc2/debian/control --- 6tunnel-0.11rc2/debian/control 2012-03-25 04:35:47.000000000 +0000 +++ 6tunnel-0.11rc2/debian/control 2013-05-24 04:23:29.000000000 +0000 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Jari Aalto Build-Depends: debhelper (>= 9), autoconf -Standards-Version: 3.9.3.1 +Standards-Version: 3.9.4 Vcs-Browser: http://git.debian.org/?p=collab-maint/6tunnel.git Vcs-Git: git://git.debian.org/git/collab-maint/6tunnel.git Homepage: http://toxygen.net/6tunnel diff -Nru 6tunnel-0.11rc2/debian/copyright 6tunnel-0.11rc2/debian/copyright --- 6tunnel-0.11rc2/debian/copyright 2012-03-25 04:35:47.000000000 +0000 +++ 6tunnel-0.11rc2/debian/copyright 2013-05-24 04:23:29.000000000 +0000 @@ -1,15 +1,14 @@ -Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174 -X-Format: http://dep.debian.net/deps/dep5 +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0 Upstream-Name: 6tunnel -Upstream-Contact: Wojtek Kaniewski +Upstream-Contact: Wojtek Kaniewski Source: http://toxygen.net/6tunnel -X-Comment: - As as of 2010-10-24 the Upstream email no longer exists. + As of 2010-10-24 the upstream address wojtekka@irc.pl mentioned in + the "ChangeLog" file no longer exists. Files: * Copyright: - 2000-2001 wojtek kaniewski -X-Comment: + 2000-2005 Wojtek Kaniewski , +Comment: Co-authors mentioned were: - Modified by tomek lipski - Thanks to KeFiR@IRCnet @@ -19,8 +18,8 @@ Files: debian/* Copyright: - 2010-2012 Jari Aalto - 2002-2006 Thomas Seyrat + 2010, 2012, 2013 Jari Aalto + 2002, 2003, 2005, 2006 Thomas Seyrat License: GPL-2+ License: GPL-2+ diff -Nru 6tunnel-0.11rc2/debian/patches/30-manpage.patch 6tunnel-0.11rc2/debian/patches/30-manpage.patch --- 6tunnel-0.11rc2/debian/patches/30-manpage.patch 1970-01-01 00:00:00.000000000 +0000 +++ 6tunnel-0.11rc2/debian/patches/30-manpage.patch 2013-05-24 04:23:29.000000000 +0000 @@ -0,0 +1,28 @@ +From: Jari Aalto +Subject: Fix typos +Bug-Debian: http://bugs.debian.org/709334 + +--- + 6tunnel.1 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/6tunnel.1 ++++ b/6tunnel.1 +@@ -76,7 +76,7 @@ + .B 6tunnel + will use the IPv4 one. In other cases, use + .B \-4 +-parameter which makes IPv4 address the preffered one. For IPv6-to-any tunnels ++parameter which makes IPv4 address the preferred one. For IPv6-to-any tunnels + use + .B \-6 + which makes +@@ -88,7 +88,7 @@ + Exit after first connection. + .TP + .B \-4 +-Preffer IPv4 endpoint if the machine has both address types. ++Prefer IPv4 endpoint if the machine has both address types. + .TP + .B \-6 + Listen on IPv6 address (IPv4 is default). diff -Nru 6tunnel-0.11rc2/debian/patches/series 6tunnel-0.11rc2/debian/patches/series --- 6tunnel-0.11rc2/debian/patches/series 2012-03-25 04:35:47.000000000 +0000 +++ 6tunnel-0.11rc2/debian/patches/series 2013-05-24 04:23:29.000000000 +0000 @@ -1,3 +1,4 @@ 10-6tunnel.c--option-f.patch 15-arm-arch.patch 20-resolve-ipv4-address--bug601030.patch +30-manpage.patch diff -Nru 6tunnel-0.11rc2/debian/watch 6tunnel-0.11rc2/debian/watch --- 6tunnel-0.11rc2/debian/watch 2012-03-25 04:35:47.000000000 +0000 +++ 6tunnel-0.11rc2/debian/watch 2013-05-24 04:23:29.000000000 +0000 @@ -1,2 +1,3 @@ version=3 -http://toxygen.net/6tunnel/ .*6tunnel-([0-6].*)\.tar\.gz +opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)\d*)$/$1~$2/,dversionmangle=s/(\d)(rc\d*)$/$1~$2/ \ +http://toxygen.net/6tunnel/6tunnel-(\d.*)\.(?:tgz|tbz2|tar\.(?:gz|bz2|xz))