Bug#854238: unblock: lintian/2.5.50.1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package lintian. It fixes two FTBFS bugs and a few minor bugs.
The changelog is:
"""
lintian (2.5.50.1) unstable; urgency=medium
* debian/copyright:
+ [EB] Add Edward Betts.
* data/spelling/corrections:
+ [NT] Apply patches from Edward Betts to fix bugs in the correction
word lists. (Closes: #852005, #852084)
+ [NT] Apply patch from Edward Betts to remove corrections for
"targetted" and "targetting" as they are valid alternative
spellings in AU. (Closes: #852145)
* t/runtests:
+ [NT] Re-sort test output after running the "post_test" sed script
on the output. This prevent test failures caused by the order
changing on different architectures prior to the sed script is run
(assuming the sed script otherwise normalises the differences
correctly).
* t/tests/cruft-general-upstream/pre_upstream:
+ [EB] Fix failing tests by making the fake flash object more
convincing. The most recent version of libmagic uses a more precise
definition of the data within a flash file. (Closes: #852891)
* vendors/ubuntu/main/data/changes-file/known-dists:
+ [CW] Add zesty.
-- Niels Thykier <niels@thykier.net> Sat, 04 Feb 2017 15:05:07 +0000
"""
It /also/ removes a "debian/changelog.tmp" file that I had not noticed
sneaked into the 2.5.50 upload (a dch work copy of d/changelog). The
debdiff is created with filterdiff -x '*/debian/changelog.tmp'
unblock lintian/2.5.50.1
diff -Nru lintian-2.5.50/data/spelling/corrections lintian-2.5.50.1/data/spelling/corrections
--- lintian-2.5.50/data/spelling/corrections 2016-12-26 14:33:00.000000000 +0100
+++ lintian-2.5.50.1/data/spelling/corrections 2017-01-29 21:17:10.000000000 +0100
@@ -545,7 +545,7 @@
calulates||calculates
calulating||calculating
calulation||calculation
-calulations|calculations
+calulations||calculations
cancelation||cancellation
canidate||candidate
canidates||candidates
@@ -3049,8 +3049,8 @@
sempahores||semaphores
senario||scenario
senarios||scenarios
-sensistive||insensitive
-sensistively||insensitively
+sensistive||sensitive
+sensistively||sensitively
sentance||sentence
sentances||sentences
sentinal||sentinel
@@ -3371,8 +3371,6 @@
sytem||system
sythesis||synthesis
taht||that
-targetted||targeted
-targetting||targeting
teached||taught
teh||the
temorary||temporary
diff -Nru lintian-2.5.50/debian/changelog lintian-2.5.50.1/debian/changelog
--- lintian-2.5.50/debian/changelog 2016-12-26 17:07:20.000000000 +0100
+++ lintian-2.5.50.1/debian/changelog 2017-02-04 16:05:07.000000000 +0100
@@ -1,3 +1,31 @@
+lintian (2.5.50.1) unstable; urgency=medium
+
+ * debian/copyright:
+ + [EB] Add Edward Betts.
+
+ * data/spelling/corrections:
+ + [NT] Apply patches from Edward Betts to fix bugs in the correction
+ word lists. (Closes: #852005, #852084)
+ + [NT] Apply patch from Edward Betts to remove corrections for
+ "targetted" and "targetting" as they are valid alternative
+ spellings in AU. (Closes: #852145)
+
+ * t/runtests:
+ + [NT] Re-sort test output after running the "post_test" sed script
+ on the output. This prevent test failures caused by the order
+ changing on different architectures prior to the sed script is run
+ (assuming the sed script otherwise normalises the differences
+ correctly).
+ * t/tests/cruft-general-upstream/pre_upstream:
+ + [EB] Fix failing tests by making the fake flash object more
+ convincing. The most recent version of libmagic uses a more precise
+ definition of the data within a flash file. (Closes: #852891)
+
+ * vendors/ubuntu/main/data/changes-file/known-dists:
+ + [CW] Add zesty.
+
+ -- Niels Thykier <niels@thykier.net> Sat, 04 Feb 2017 15:05:07 +0000
+
lintian (2.5.50) unstable; urgency=medium
* Summary of tag changes:
diff -Nru lintian-2.5.50/debian/copyright lintian-2.5.50.1/debian/copyright
--- lintian-2.5.50/debian/copyright 2016-10-08 15:19:53.000000000 +0200
+++ lintian-2.5.50.1/debian/copyright 2017-01-29 21:12:16.000000000 +0100
@@ -30,6 +30,7 @@
AB == Axel Beckert <abe@debian.org>
PW == Paul Wise <pabs@debian.org>
CL == Chris Lamb <lamby@debian.org>
+ EB == Edward Betts <edward@debian.org>
.
Lintian is maintained in git. The current development version may
be checked out from:
@@ -62,6 +63,7 @@
2013-2015, Bastien ROUCARIÈS
2014-2016, Axel Beckert
2016, Chris Lamb
+ 2017, Edward Betts
License: GPL-2+
This program is free software; you may redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -Nru lintian-2.5.50/t/runtests lintian-2.5.50.1/t/runtests
--- lintian-2.5.50/t/runtests 2016-12-25 12:18:26.000000000 +0100
+++ lintian-2.5.50.1/t/runtests 2017-01-29 21:10:53.000000000 +0100
@@ -426,8 +426,19 @@
# Run a sed-script if it exists, for tests that have slightly variable
# output
- runsystem_ok('sed', '-ri', '-f', "$origdir/post_test", "$rundir/tags.$pkg")
- if -e "$origdir/post_test";
+ if (-f "$origdir/post_test") {
+ runsystem_ok('sed', '-ri', '-f', "$origdir/post_test",
+ "$rundir/tags.$pkg");
+ if ($testdata->{'sort'}) {
+ # Re-sort as the sed may have changed the order lines
+ open(my $rfd, '<', "$rundir/tags.$pkg");
+ my @lines = sort(<$rfd>);
+ close($rfd);
+ open(my $wfd, '>', "$rundir/tags.$pkg");
+ print {$wfd} $_ for @lines;
+ close($wfd);
+ }
+ }
if (-x "$origdir/test_calibration") {
my $calibrated = "$rundir/expected.$pkg.calibrated";
diff -Nru lintian-2.5.50/t/tests/cruft-general-upstream/pre_upstream lintian-2.5.50.1/t/tests/cruft-general-upstream/pre_upstream
--- lintian-2.5.50/t/tests/cruft-general-upstream/pre_upstream 2016-09-25 20:22:00.000000000 +0200
+++ lintian-2.5.50.1/t/tests/cruft-general-upstream/pre_upstream 2017-01-29 21:13:45.000000000 +0100
@@ -38,7 +38,7 @@
# use old magic \001\000\000\000 part is optional but needed with old file
printf "ITSF\003\000\000\000\140\000\000\000\001\000\000\000" > "${dir}/fake-help-file.chm"
-printf "CWS\011" > "${dir}/fakeflash.swf"
+printf "CWS\011 x" > "${dir}/fakeflash.swf"
echo '//comment' > "${dir}/fake.min.js"
# Make python generate python bytecode files
# - more reliable than crafting them ourselves
diff -Nru lintian-2.5.50/vendors/ubuntu/main/data/changes-file/known-dists lintian-2.5.50.1/vendors/ubuntu/main/data/changes-file/known-dists
--- lintian-2.5.50/vendors/ubuntu/main/data/changes-file/known-dists 2016-09-25 20:22:06.000000000 +0200
+++ lintian-2.5.50.1/vendors/ubuntu/main/data/changes-file/known-dists 2017-01-29 21:09:03.000000000 +0100
@@ -17,3 +17,4 @@
wily
xenial
yakkety
+zesty
Reply to: