From 391691ba224bd8c67844fe6d8745cbeb324cf55d Mon Sep 17 00:00:00 2001 From: gregor herrmann Date: Tue, 15 Nov 2011 20:00:23 +0100 Subject: [PATCH] Imported Debian patch 1.21-5 --- debian/changelog | 54 +++++++++++++++++++++++++++++ debian/compat | 1 + debian/control | 22 ++++++++++++ debian/copyright | 31 +++++++++++++++++ debian/libtest-simpleunit-perl.docs | 1 + debian/patches/perl_re.patch | 53 ++++++++++++++++++++++++++++ debian/patches/series | 2 ++ debian/patches/spelling.patch | 29 ++++++++++++++++ debian/rules | 4 +++ debian/source/format | 1 + debian/watch | 4 +++ 11 files changed, 202 insertions(+) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/libtest-simpleunit-perl.docs create mode 100644 debian/patches/perl_re.patch create mode 100644 debian/patches/series create mode 100644 debian/patches/spelling.patch create mode 100755 debian/rules create mode 100644 debian/source/format create mode 100644 debian/watch diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..8b18863 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,54 @@ +libtest-simpleunit-perl (1.21-5) unstable; urgency=low + + [ Ansgar Burchardt ] + * debian/control: Convert Vcs-* fields to Git. + + [ gregor herrmann ] + * Switch to source format 3.0 (quilt). + * Add patch perl_re.patch: adjust regexp to work with older and newer + perl versions. (Closes: #636522) + * Update to debhelper (compat level) 8, use tiny debian/rules. + * debian/copyright: reformat according to current DEP5 draft. + * Set Standards-Version to 3.9.2, drop version from perl build + dependency. + * Add /me to Uploaders. + * Improve short and long description a bit. + * Add a patch to fix a spelling mistake. + + -- gregor herrmann Tue, 15 Nov 2011 20:00:23 +0100 + +libtest-simpleunit-perl (1.21-4) unstable; urgency=low + + [ Nathan Handler ] + * debian/watch: Update to ignore development releases. + + [ gregor herrmann ] + * debian/control: Changed: Switched Vcs-Browser field to ViewSVN + (source stanza). + + [ Christoph Berg ] + * Remove myself from Uploaders. + * Remove stray 12testdata.1767 file from package. + + -- Christoph Berg Wed, 09 Dec 2009 14:33:14 +0100 + +libtest-simpleunit-perl (1.21-3) unstable; urgency=low + + * Set Maintainer to Debian Perl Group. + * Add libextutils-autoinstall-perl to Build-Depends-Indep. + + -- Christoph Berg Tue, 26 May 2009 13:24:00 +0200 + +libtest-simpleunit-perl (1.21-2) unstable; urgency=low + + * Fix missing build dependency (Closes: #489115) + * Updated Standards version, no changes needed. + * Fix copyright-contains-dh-make-perl-boilerplate. + + -- Martin Zobel-Helas Sun, 06 Jul 2008 12:39:04 +0200 + +libtest-simpleunit-perl (1.21-1) unstable; urgency=low + + * Initial Release. + + -- Martin Zobel-Helas Thu, 19 Jun 2008 17:20:32 +0200 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..45a4fb7 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +8 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..fc8a799 --- /dev/null +++ b/debian/control @@ -0,0 +1,22 @@ +Source: libtest-simpleunit-perl +Section: perl +Priority: optional +Build-Depends: debhelper (>= 8) +Build-Depends-Indep: perl, + libdata-compare-perl, + libextutils-autoinstall-perl +Maintainer: Debian Perl Group +Uploaders: Martin Zobel-Helas , + gregor herrmann +Standards-Version: 3.9.2 +Homepage: http://search.cpan.org/dist/Test-SimpleUnit/ +Vcs-Git: git://git.debian.org/pkg-perl/packages/libtest-simpleunit-perl.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-perl/packages/libtest-simpleunit-perl.git + +Package: libtest-simpleunit-perl +Architecture: all +Depends: ${perl:Depends}, ${misc:Depends}, + libdata-compare-perl +Description: simplified Perl unit-testing framework + Test::SimpleUnit is a simplified Perl unit-testing framework for creating + unit tests to be run either standalone or under Test::Harness. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..798a9da --- /dev/null +++ b/debian/copyright @@ -0,0 +1,31 @@ +Format-Specification: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=markup&pathrev=135 +Maintainer: Michael Granger +Source: http://search.cpan.org/dist/Test-SimpleUnit/ +Name: Test-SimpleUnit + +Files: * +Copyright: 1999-2003, The FaerieMUD Consortium +License: Artistic or GPL-2+ + +Files: debian/* +Copyright: 2008, Martin Zobel-Helas + 2009, Christoph Berg + 2011, Ansgar Burchardt + 2011, gregor herrmann +License: Artistic or GPL-2+ + +License: Artistic + This program is free software; you can redistribute it and/or modify + it under the terms of the Artistic License, which comes with Perl. + . + On Debian systems, the complete text of the Artistic License can be + found in `/usr/share/common-licenses/Artistic'. + +License: GPL-2+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + . + On Debian systems, the complete text of version 2 of the GNU General + Public License can be found in `/usr/share/common-licenses/GPL-2'. diff --git a/debian/libtest-simpleunit-perl.docs b/debian/libtest-simpleunit-perl.docs new file mode 100644 index 0000000..e845566 --- /dev/null +++ b/debian/libtest-simpleunit-perl.docs @@ -0,0 +1 @@ +README diff --git a/debian/patches/perl_re.patch b/debian/patches/perl_re.patch new file mode 100644 index 0000000..559e3d6 --- /dev/null +++ b/debian/patches/perl_re.patch @@ -0,0 +1,53 @@ +Description: Adjust extended regexp to perl 5.14 + Cf. http://search.cpan.org/~jesse/perl-5.14.0/pod/perldelta.pod#%28?^...%29_construct_signifies_default_modifiers +Origin: vendor +Bug: https://rt.cpan.org/Ticket/Display.html?id=72449 +Bug-Debian: http://bugs.debian.org/636522 +Forwarded: https://rt.cpan.org/Ticket/Display.html?id=72449 +Author: gregor herrmann +Reviewed-by: gregor herrmann +Last-Update: 2011-11-15 + +--- a/t/10_asserts.t ++++ b/t/10_asserts.t +@@ -201,10 +201,17 @@ + # assertExceptionMatches { 1 } 'any' + eval { assertExceptionMatches {1} qr{any} }; + die "assertExceptionMatches unexpectedly succeeded" unless $@; +- die "Unexpected error message for assertExceptionMatches {1} qr{any}: $@ ", +- "(expected 'Expected an exception which matched /(?-xism:any)/, but none ", +- "was raised.')" +- unless "$@" =~ m{Expected an exception which matched \Q/(?-xism:any)/\E, but none was raised\.}; ++ if ( $] >= 5.014 ) { ++ die "Unexpected error message for assertExceptionMatches {1} qr{any}: $@ ", ++ "(expected 'Expected an exception which matched /(?^:any)/, but none ", ++ "was raised.')" ++ unless "$@" =~ m{Expected an exception which matched \Q/(?^:any)/\E, but none was raised\.}; ++ } else { ++ die "Unexpected error message for assertExceptionMatches {1} qr{any}: $@ ", ++ "(expected 'Expected an exception which matched /(?-xism:any)/, but none ", ++ "was raised.')" ++ unless "$@" =~ m{Expected an exception which matched \Q/(?-xism:any)/\E, but none was raised\.}; ++ } + + # assertExceptionMatches { 1 } 'any', $msg + eval { assertExceptionMatches {1} 'any', "Ack! No exception?"; }; +@@ -307,9 +314,15 @@ + undef $res; + + # assertMatches( qr{\s+}, 1 ) +- assertExceptionMatches { +- $res = assertMatches( qr{\s+}, 1 ) +- } qr{Tested value '1' did not match wanted regex '\Q(?-xism:\s+)\E}; ++ if ( $] >= 5.014 ) { ++ assertExceptionMatches { ++ $res = assertMatches( qr{\s+}, 1 ) ++ } qr{Tested value '1' did not match wanted regex '\Q(?^:\s+)\E}; ++ } else { ++ assertExceptionMatches { ++ $res = assertMatches( qr{\s+}, 1 ) ++ } qr{Tested value '1' did not match wanted regex '\Q(?-xism:\s+)\E}; ++ } + assertNot( $res ); + undef $res; + }, diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..7b6ebd2 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +perl_re.patch +spelling.patch diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch new file mode 100644 index 0000000..fd3ce0d --- /dev/null +++ b/debian/patches/spelling.patch @@ -0,0 +1,29 @@ +Description: minor spelling fix +Origin: vendor +Bug: https://rt.cpan.org/Ticket/Display.html?id=72450 +Forwarded: https://rt.cpan.org/Ticket/Display.html?id=72450 +Author: gregor herrmann +Last-Update: 2011-11-15 + +--- a/README ++++ b/README +@@ -73,7 +73,7 @@ + allows a test designer to change the setup function as the tests progress. See + the EXAMPLE section for an example of how to use this. + +- If a test is preceeded by multiple new setup/teardown functions, the last one ++ If a test is preceded by multiple new setup/teardown functions, the last one + to be specified is kept, and any others are discarded after being executed + once. This allows one to specify one-time setup and/or teardown functions at a + given point of testing. +--- a/lib/Test/SimpleUnit.pm ++++ b/lib/Test/SimpleUnit.pm +@@ -171,7 +171,7 @@ + allows a test designer to change the setup function as the tests progress. See + the L section for an example of how to use this. + +-If a test is preceeded by multiple new setup/teardown functions, the last one to ++If a test is preceded by multiple new setup/teardown functions, the last one to + be specified is kept, and any others are discarded after being executed + once. This allows one to specify one-time setup and/or teardown functions at a + given point of testing. diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..2d33f6a --- /dev/null +++ b/debian/rules @@ -0,0 +1,4 @@ +#!/usr/bin/make -f + +%: + dh $@ diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..c53593d --- /dev/null +++ b/debian/watch @@ -0,0 +1,4 @@ +# format version number, currently 3; this line is compulsory! +version=3 +# URL to the package page followed by a regex to search +http://search.cpan.org/dist/Test-SimpleUnit/ .*/Test-SimpleUnit-v?(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$