[ack] 02/02: Update packaging for the new upstream release candidate 2.19.01
Axel Beckert
abe at deuxchevaux.org
Sat Dec 9 01:08:03 UTC 2017
This is an automated email from the git hooks/post-receive script.
abe pushed a commit to branch master
in repository ack.
commit a4cfdbbd24c765581b973dd8139dcfa75736c9dd
Author: Axel Beckert <abe at deuxchevaux.org>
Date: Sat Dec 9 01:51:54 2017 +0100
Update packaging for the new upstream release candidate 2.19.01
* Update debian/copyright wrt. to public domain texts now used as
texts for the test suite. They're either all from authors who died
more than 70 years ago or government works of the United States
which are excluded from copyright law and hence in the public
domain.
* Drop repack instructions from debian/watch, but keep Files-Excluded
header in debian/copyright so that lintian warns us if those
non-free files show up by accident again.
* No more skip any tests. Also remove the now no more applying
changelog items for test suite improvements by gregor herrmann.
Thanks for the improvements anyway, gregoa!
* Refresh sole patch.
---
debian/changelog | 19 ++++++-----
debian/copyright | 38 ++++++++++++++++++++++
.../no-standalone-test-but-autopkgtests.patch | 6 ++--
debian/rules | 7 ----
debian/tests/pkg-perl/smoke-skip | 23 -------------
debian/watch | 1 -
6 files changed, 52 insertions(+), 42 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 02e07c3..89e3a65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,17 @@
-ack (2.18+dfsg-2) UNRELEASED; urgency=medium
-
- [ gregor herrmann ]
- * Use debian/tests/pkg-perl/smoke-skip in debian/rules as well.
- * autopkgtest: enable use.t by adding debian/tests/pkg-perl/use-name.
-
- [ Axel Beckert ]
+ack (2.19.01-1) UNRELEASED; urgency=medium
+
+ * New upstream release candidate.
+ + Update debian/copyright wrt. to public domain texts now used as
+ texts for the test suite.
+ + Drop repack instructions from debian/watch, but keep Files-Excluded
+ header in debian/copyright so that lintian warns us if those
+ non-free files show up by accident again.
+ + No more skip any tests.
+ + Refresh sole patch.
* Update GitHub URLs in debian/upstream/metadata from
…/petdance/ack2 to …/beyondgrep/ack2.
- -- gregor herrmann <gregoa at debian.org> Fri, 01 Dec 2017 22:28:20 +0100
+ -- Axel Beckert <abe at debian.org> Sat, 09 Dec 2017 01:48:03 +0100
ack (2.18+dfsg-1) unstable; urgency=high
diff --git a/debian/copyright b/debian/copyright
index 33199da..1ffeebe 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -34,6 +34,44 @@ Copyright: 2005 by Michael Neumann
2006-2009 by Mike Dalessio
License: GPL-2
+Files: t/text/amontillado.txt
+Copyright: 1846 Edgar Allan Poe (died in 1849)
+License: public-domain
+Source: https://en.wikipedia.org/wiki/The_Cask_of_Amontillado
+
+Files: t/text/bill-of-rights.txt
+Copyright: 1789-1791 James Madison (died in 1836)
+License: public-domain
+Source: https://en.wikipedia.org/wiki/United_States_Bill_of_Rights
+
+Files: t/text/constitution.txt
+Copyright: 1787-1788 Philadelphia Convention
+License: public-domain
+Source: https://en.wikipedia.org/wiki/United_States_Constitution
+
+Files: t/text/gettysburg.txt
+Copyright: 1863 Abraham Lincoln (died in 1865)
+License: public-domain
+Source: https://en.wikipedia.org/wiki/Gettysburg_Address
+
+Files: t/text/ozymandias.txt
+Copyright: 1818 Percy Bysshe Shelley (died in 1822)
+License: public-domain
+Source: https://en.wikipedia.org/wiki/Ozymandias
+
+Files: t/text/raven.txt
+Copyright: 1845 Edgar Allan Poe (died in 1849)
+License: public-domain
+Source: https://en.wikipedia.org/wiki/The_Raven
+
+License: public-domain
+ These texts are in the public domain because either their author died
+ more than 70 years ago and hence the copyright has expired, or they
+ are government works of the United States and are excluded from
+ copyright law.
+Source: https://en.wikipedia.org/wiki/Public_domain#Expiration_of_copyright
+ https://en.wikipedia.org/wiki/Public_domain#Government_works
+
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.
diff --git a/debian/patches/no-standalone-test-but-autopkgtests.patch b/debian/patches/no-standalone-test-but-autopkgtests.patch
index a5ac868..ea89485 100644
--- a/debian/patches/no-standalone-test-but-autopkgtests.patch
+++ b/debian/patches/no-standalone-test-but-autopkgtests.patch
@@ -89,9 +89,9 @@ Last-Update: 2017-03-05
else {
--- a/t/ack-x.t
+++ b/t/ack-x.t
-@@ -98,7 +98,7 @@
- my @lhs_args = ( $perl, '-Mblib', build_ack_invocation( '--sort-files', '-g', 'of', 't/text' ) );
- my @rhs_args = ( $perl, '-Mblib', build_ack_invocation( '-x', 'the' ) ); # for now
+@@ -82,7 +82,7 @@
+ my @lhs_args = ( $perl, '-Mblib', build_ack_invocation( '--sort-files', '-g', '[vz]', 't/text' ) );
+ my @rhs_args = ( $perl, '-Mblib', build_ack_invocation( '-x', '-i', 'that' ) );
-if ( $ENV{'ACK_TEST_STANDALONE'} ) {
+if ( $ENV{'AUTOPKGTEST_TMP'} ) {
diff --git a/debian/rules b/debian/rules
index 5141767..7bdf8ae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,7 @@
#!/usr/bin/make -f
-SKIP_TESTS=$(shell cat debian/tests/pkg-perl/smoke-skip)
-TEST_FILES = $(filter-out $(SKIP_TESTS), $(wildcard t/*.t))
-
%:
dh $@
override_dh_clean:
dh_clean --exclude=t/swamp/
-
-# Temporarily only run those tests which require the non-free example text files
-override_dh_auto_test:
- dh_auto_test -- TEST_FILES="$(TEST_FILES)"
diff --git a/debian/tests/pkg-perl/smoke-skip b/debian/tests/pkg-perl/smoke-skip
deleted file mode 100644
index ee79cd4..0000000
--- a/debian/tests/pkg-perl/smoke-skip
+++ /dev/null
@@ -1,23 +0,0 @@
-t/ack-1.t
-t/ack-c.t
-t/ack-color.t
-t/ack-column.t
-t/ack-g.t
-t/ack-group.t
-t/ack-interactive.t
-t/ack-line.t
-t/ack-m.t
-t/ack-match.t
-t/ack-o.t
-t/ack-output.t
-t/ack-pager.t
-t/ack-print0.t
-t/ack-v.t
-t/ack-w.t
-t/ack-x.t
-t/anchored.t
-t/context.t
-t/exit-code.t
-t/highlighting.t
-t/incomplete-last-line.t
-t/mutex-options.t
diff --git a/debian/watch b/debian/watch
index 4abdecb..f06f824 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,3 @@
# format version number, currently 3; this line is compulsory!
version=3
-opts=repack,repacksuffix=+dfsg,compression=xz,dversionmangle=s/\+dfsg// \
https://metacpan.org/release/ack .*/ack-([0-9.]*).tar.gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/ack.git
More information about the Pkg-perl-cvs-commits
mailing list