[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.5.6-13-gbcb26a0

The following commit has been merged in the master branch:
commit bcb26a0b9083a41d09fb34c0874a8fea49e67420
Author: Niels Thykier <niels@thykier.net>
Date:   Thu Mar 15 09:34:14 2012 +0100

    copyright-file: Remove old tag
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/copyright-file b/checks/copyright-file
index 60451ff..8ac297f 100644
--- a/checks/copyright-file
+++ b/checks/copyright-file
@@ -107,10 +107,6 @@ foreach (@{$info->sorted_index}) {
         # Check if the link points to a package from the same source.
         check_cross_link($group, $link);
         last;
-    } elsif (m,usr/doc/copyright/$ppkg$,) {
-        tag 'old-style-copyright-file';
-        $found = 1;
-        last;
     }
 }
 
diff --git a/checks/copyright-file.desc b/checks/copyright-file.desc
index 9b2aa74..95334fc 100644
--- a/checks/copyright-file.desc
+++ b/checks/copyright-file.desc
@@ -113,13 +113,6 @@ Info: There is a symlink /usr/share/doc/<i>pkg1</i> -&gt; <i>pkg2</i>
  this when I'm checking both the binary and the corresponding source
  package.
 
-Tag: old-style-copyright-file
-Severity: serious
-Certainty: certain
-Info: The package installs a /usr/doc/copyright/<i>pkg</i> file. Instead,
- you should place the copyright file in /usr/share/doc/<i>pkg</i>/copyright.
-Ref: policy 12.5
-
 Tag: old-fsf-address-in-copyright-file
 Severity: normal
 Certainty: certain
diff --git a/data/output/ftp-master-fatal b/data/output/ftp-master-fatal
index fa133f9..046ca63 100644
--- a/data/output/ftp-master-fatal
+++ b/data/output/ftp-master-fatal
@@ -50,7 +50,6 @@ no-package-name
 no-source-field
 no-version-field
 not-allowed-control-file
-old-style-copyright-file
 package-contains-ancient-file
 package-has-no-description
 package-installs-python-bytecode
diff --git a/debian/changelog b/debian/changelog
index 297637b..02cf818 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ lintian (2.5.7) UNRELEASED; urgency=low
       - manpage-for-x11-binary-in-wrong-directory
       - obsolete-field
       - old-app-defaults-directory
+      - old-style-copyright-file
       - old-style-example-dir
       - package-installs-file-to-usr-x11r6-bin
       - package-installs-font-to-usr-x11r6
@@ -16,6 +17,8 @@ lintian (2.5.7) UNRELEASED; urgency=low
       - postinst-should-not-set-usr-doc-link
       - x11-games-should-be-in-usr-games
 
+  * checks/copyright-file{,.desc}:
+    + [NT] Remove old tags.
   * checks/fields{,.desc}:
     + [NT] Remove old tags.
   * checks/files{,.desc}:
diff --git a/profiles/debian/ftp-master-auto-reject.profile b/profiles/debian/ftp-master-auto-reject.profile
index adbfffb..f1bc6bc 100644
--- a/profiles/debian/ftp-master-auto-reject.profile
+++ b/profiles/debian/ftp-master-auto-reject.profile
@@ -28,15 +28,15 @@ Enable-Tags: FSSTND-dir-in-usr, FSSTND-dir-in-var, arch-dependent-file-in-usr-sh
  mknod-in-maintainer-script, no-architecture-field, no-copyright-file,
  no-maintainer-field, no-package-name, no-shlibs-control-file, no-source-field,
  no-version-field, non-etc-file-marked-as-conffile, not-allowed-control-file,
- old-style-copyright-file, package-contains-ancient-file,
- package-contains-info-dir-file, package-has-no-description,
- package-installs-python-bytecode, package-not-lowercase,
- package-uses-local-diversion, preinst-interpreter-without-predepends,
- section-is-dh_make-template, source-field-does-not-match-pkg-name,
- statically-linked-binary, symlink-has-too-many-up-segments,
- too-many-architectures, udeb-uses-non-gzip-data-tarball,
- uploader-address-is-on-localhost, uploader-address-malformed,
- uploader-name-missing, usr-share-doc-symlink-to-foreign-package,
+ package-contains-ancient-file, package-contains-info-dir-file,
+ package-has-no-description, package-installs-python-bytecode,
+ package-not-lowercase, package-uses-local-diversion,
+ preinst-interpreter-without-predepends, section-is-dh_make-template,
+ source-field-does-not-match-pkg-name, statically-linked-binary,
+ symlink-has-too-many-up-segments, too-many-architectures,
+ udeb-uses-non-gzip-data-tarball, uploader-address-is-on-localhost,
+ uploader-address-malformed, uploader-name-missing,
+ usr-share-doc-symlink-to-foreign-package,
  usr-share-doc-symlink-without-dependency, wrong-file-owner-uid-or-gid
 
 Tags: FSSTND-dir-in-usr, FSSTND-dir-in-var, bad-package-name, bad-relation, bad-version-number,
@@ -59,13 +59,13 @@ Tags: FSSTND-dir-in-usr, FSSTND-dir-in-var, bad-package-name, bad-relation, bad-
  maintainer-script-removes-device-files, malformed-deb-archive,
  missing-dependency-on-perlapi, no-architecture-field, no-copyright-file,
  no-maintainer-field, no-package-name, no-source-field, no-version-field,
- not-allowed-control-file, old-style-copyright-file,
- package-contains-ancient-file, package-has-no-description,
- package-installs-python-bytecode, package-not-lowercase,
- package-uses-local-diversion, section-is-dh_make-template,
- source-field-does-not-match-pkg-name, symlink-has-too-many-up-segments,
- too-many-architectures, udeb-uses-non-gzip-data-tarball,
- uploader-address-is-on-localhost, uploader-address-malformed,
- uploader-name-missing, usr-share-doc-symlink-to-foreign-package
+ not-allowed-control-file, package-contains-ancient-file,
+ package-has-no-description, package-installs-python-bytecode,
+ package-not-lowercase, package-uses-local-diversion,
+ section-is-dh_make-template, source-field-does-not-match-pkg-name,
+ symlink-has-too-many-up-segments, too-many-architectures,
+ udeb-uses-non-gzip-data-tarball, uploader-address-is-on-localhost,
+ uploader-address-malformed, uploader-name-missing,
+ usr-share-doc-symlink-to-foreign-package
 Overridable: no
 
diff --git a/t/COVERAGE b/t/COVERAGE
index c4db68f..5b2d04c 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,5 +1,5 @@
 Last generated 2012-03-15
-Coverage: 785/948 (82.81%), w. legacy tests: 890/948 (93.88%)
+Coverage: 784/947 (82.79%), w. legacy tests: 889/947 (93.88%)
 
 The following tags are not tested by the test suite:
 
diff --git a/t/tests/copyright-file-general/debian/debian/rules b/t/tests/copyright-file-general/debian/debian/rules
index 100a695..d4d50ca 100755
--- a/t/tests/copyright-file-general/debian/debian/rules
+++ b/t/tests/copyright-file-general/debian/debian/rules
@@ -9,5 +9,7 @@ override_dh_installdocs:
 	ln -s symlink debian/copyright-symlink/usr/share/doc/copyright-symlink/copyright
 	gzip -9 debian/copyright-compressed/usr/share/doc/copyright-compressed/copyright
 	mkdir -p debian/copyright-old-style/usr/doc/copyright
+	# This should (now) trigger a no-copyright-file (as there is no copyright file
+	# in the right location).
 	mv debian/copyright-old-style/usr/share/doc/copyright-old-style/copyright debian/copyright-old-style/usr/doc/copyright/copyright-old-style
 
diff --git a/t/tests/copyright-file-general/desc b/t/tests/copyright-file-general/desc
index 284e89e..afc8369 100644
--- a/t/tests/copyright-file-general/desc
+++ b/t/tests/copyright-file-general/desc
@@ -29,4 +29,4 @@ Test-For:
  copyright-without-copyright-notice
  debian-copyright-file-uses-obsolete-national-encoding
  helper-templates-in-copyright
- old-style-copyright-file
+ no-copyright-file
diff --git a/t/tests/copyright-file-general/tags b/t/tests/copyright-file-general/tags
index 2be0a69..9dc7113 100644
--- a/t/tests/copyright-file-general/tags
+++ b/t/tests/copyright-file-general/tags
@@ -14,7 +14,7 @@ E: copyright-misc-errors: copyright-refers-to-old-directory
 E: copyright-misc-errors: helper-templates-in-copyright
 E: copyright-missing-perl-license-pointer: copyright-file-lacks-pointer-to-perl-license
 E: copyright-old-style: FSSTND-dir-in-usr usr/doc/
-E: copyright-old-style: old-style-copyright-file
+E: copyright-old-style: no-copyright-file
 E: copyright-php: copyright-refers-to-bad-php-license
 E: copyright-php: copyright-refers-to-problematic-php-license
 E: copyright-poor-common-licenses: copyright-should-refer-to-common-license-file-for-gpl
@@ -27,5 +27,4 @@ W: copyright-misc-errors: copyright-contains-dh-make-perl-boilerplate
 W: copyright-misc-errors: copyright-has-url-from-dh_make-boilerplate
 W: copyright-misc-errors: copyright-refers-to-deprecated-bsd-license-file
 W: copyright-misc-errors: copyright-refers-to-nonexistent-license-file usr/share/common-licenses/GPL2
-W: copyright-old-style: copyright-without-copyright-notice
 W: copyright-poor-common-licenses: copyright-does-not-refer-to-common-license-file /GPL-3

-- 
Debian package checker
Reply to: