[SCM] Debian package checker branch, master, updated. 2.5.1-200-gffd8267
The following commit has been merged in the master branch:
commit ffd826783a2612f920d882ab208bafe87dee5589
Author: Niels Thykier <niels@thykier.net>
Date: Sun Aug 7 13:36:40 2011 +0200
Aded new change for duplicate changelog files
The duplicate-files check is triggered on a lot of auto-generated
docs (i.e. doxygen output). To avoid a lot of people being
annoyed by that, create a separate tag nagging about the duplicate
changelogs.
diff --git a/checks/duplicate-files b/checks/duplicate-files
index f6b9875..65ebed6 100644
--- a/checks/duplicate-files
+++ b/checks/duplicate-files
@@ -54,7 +54,11 @@ foreach my $file (@{ $info->sorted_index }){
foreach my $hash (keys %hashmap){
my @files = @{ $hashmap{$hash} };
next if scalar(@files) < 2;
- tag 'duplicate-files', sort @files;
+ if (grep { m,changelog,io} @files) {
+ tag 'duplicate-changelog-files', sort @files;
+ } else {
+ tag 'duplicate-files', sort @files;
+ }
}
}
diff --git a/checks/duplicate-files.desc b/checks/duplicate-files.desc
index 5222eca..153e325 100644
--- a/checks/duplicate-files.desc
+++ b/checks/duplicate-files.desc
@@ -12,3 +12,13 @@ Experimental: yes
Info: The package ships the two (or more) files with the exact same
contents.
+Tag: duplicate-changelog-files
+Severity: normal
+Certainty: possible
+Info: The package appears to be shipping two copies of the changelog.
+ .
+ If the second copy is really needed, consider making it a symlink to
+ the canonical place for the relevant changelog.
+ .
+ Both upstream and debian changelogs are checked with this tag.
+
diff --git a/debian/changelog b/debian/changelog
index fd8647c..2120423 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ lintian (2.5.2) UNRELEASED; urgency=low
+ Added:
- debian-rules-uses-deprecated-makefile
- debian-rules-uses-or-modifies-user-only-variable
+ - duplicate-changelog-files
- package-has-long-file-name
- source-package-component-has-long-file-name
- udeb-uses-non-gzip-data-tarball
@@ -81,6 +82,7 @@ lintian (2.5.2) UNRELEASED; urgency=low
+ [NT] Exclude __init__.py files from the check as they are
required even if they are empty. Thanks to Daniele Tricoli
for the report. (Closes: #632789)
+ + [NT] Report duplicate changelogs as a separate tag.
* checks/fields:
+ [NT] Refactored to use Lintian::Data and use new data files
from data/fields.
diff --git a/t/COVERAGE b/t/COVERAGE
index 8b1bbdd..c4d9fad 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,5 +1,5 @@
-Last generated 2011-08-03
-Coverage: 686/914 (75.05%), w. legacy tests: 814/914 (89.06%)
+Last generated 2011-08-07
+Coverage: 687/915 (75.08%), w. legacy tests: 815/915 (89.07%)
The following tags are not tested by the test suite:
diff --git a/t/tests/duplicate-files/debian/Changes b/t/tests/duplicate-files/debian/Changes
new file mode 100644
index 0000000..79f373b
--- /dev/null
+++ b/t/tests/duplicate-files/debian/Changes
@@ -0,0 +1 @@
+This is an upstream changelog file.
diff --git a/t/tests/duplicate-files/debian/NEWS b/t/tests/duplicate-files/debian/NEWS
new file mode 100644
index 0000000..79f373b
--- /dev/null
+++ b/t/tests/duplicate-files/debian/NEWS
@@ -0,0 +1 @@
+This is an upstream changelog file.
diff --git a/t/tests/duplicate-files/debian/debian/docs b/t/tests/duplicate-files/debian/debian/docs
index d4894cd..3b4f637 100644
--- a/t/tests/duplicate-files/debian/debian/docs
+++ b/t/tests/duplicate-files/debian/debian/docs
@@ -4,3 +4,4 @@ doc-file3
doc-file4
doccy1
doccy2
+NEWS
diff --git a/t/tests/duplicate-files/desc b/t/tests/duplicate-files/desc
index f9626de..18fcbd5 100644
--- a/t/tests/duplicate-files/desc
+++ b/t/tests/duplicate-files/desc
@@ -2,5 +2,7 @@ Testname: duplicate-files
Sequence: 6000
Version: 1.0
Description: Test for duplicate files
+Skeleton: pedantic
Test-For:
+ duplicate-changelog-files
duplicate-files
diff --git a/t/tests/duplicate-files/tags b/t/tests/duplicate-files/tags
index f9a5773..cdbeb37 100644
--- a/t/tests/duplicate-files/tags
+++ b/t/tests/duplicate-files/tags
@@ -1,2 +1,3 @@
+W: duplicate-files: duplicate-changelog-files usr/share/doc/duplicate-files/NEWS.gz usr/share/doc/duplicate-files/changelog.gz
X: duplicate-files: duplicate-files usr/share/doc/duplicate-files/doc-file1 usr/share/doc/duplicate-files/doc-file2 usr/share/doc/duplicate-files/doc-file3 usr/share/doc/duplicate-files/doc-file4
X: duplicate-files: duplicate-files usr/share/doc/duplicate-files/doccy1 usr/share/doc/duplicate-files/doccy2
--
Debian package checker
Reply to: