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

[SCM] Debian package checker branch, master, updated. 2.5.4-137-g33db01f



The following commit has been merged in the master branch:
commit 33db01faa94727cfa064fd991708b0bc42148205
Author: Niels Thykier <niels@thykier.net>
Date:   Fri Feb 3 12:31:48 2012 +0100

    Add separate tag for not having a debhelper compat file
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/debhelper b/checks/debhelper
index d14f2b8..44b8118 100644
--- a/checks/debhelper
+++ b/checks/debhelper
@@ -267,7 +267,10 @@ if (-f "$droot/compat") {
     } else {
         tag 'debhelper-compat-file-is-empty';
     }
+} else {
+    tag 'debhelper-compat-file-is-missing';
 }
+
 if (defined($level) and $level !~ m/^\d+$/ and not $compatnan) {
     tag 'debhelper-compatibility-level-not-a-number', $level;
     $level =~ s/[^\d]//g;
diff --git a/checks/debhelper.desc b/checks/debhelper.desc
index 5c8da88..5fe5c72 100644
--- a/checks/debhelper.desc
+++ b/checks/debhelper.desc
@@ -359,3 +359,14 @@ Info: The package uses a variable in one of its debhelper config
  needs more than that, and makes sure the variable is exported through
  the build one way or the othern, then this tag can be safely ignored
  or overridden.
+
+Tag: debhelper-compat-file-is-missing
+Severity: normal
+Certainty: certain
+Info: The package uses debhelper but does not ship a compat file.
+ This is deprecated and eventaully cause the package to FTBFS.
+ .
+ Please refer to the dehelper documentation on how to create the
+ compat file and the differences between each compat level.
+Ref: http://packages.qa.debian.org/d/debhelper/news/20120115T191738Z.html,
+ debhelper(7)
diff --git a/debian/changelog b/debian/changelog
index 0c6c5ae..666df92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ lintian (2.5.5) UNRELEASED; urgency=low
   * Summary of tag changes:
     + Added:
       - control-file-contains-dh_make-vcs-comment
+      - debhelper-compat-file-is-missing
       - dependency-is-not-multi-archified
       - dh-exec-install-not-allowed-here
       - dh-exec-private-helper
@@ -64,6 +65,7 @@ lintian (2.5.5) UNRELEASED; urgency=low
     + [NT] Removed tag for using dh_dhelp.  It is not shipped in
       debhelper anymore (not even Squeeze) and the tag is not
       emitted anymore (according to lintian.d.o).
+    + [NT] Added check for missing compat file.  (Closes: #656885)
   * checks/fields{,.desc}:
     + [JW] Properly handle uploader names with commas.
       (Closes: #485705)
diff --git a/t/source/debian-source-dir-traversal-2/tags b/t/source/debian-source-dir-traversal-2/tags
index 97fd61a..05e776b 100644
--- a/t/source/debian-source-dir-traversal-2/tags
+++ b/t/source/debian-source-dir-traversal-2/tags
@@ -1,2 +1,3 @@
 I: debian-source-dir-traversal-2 source: missing-debian-source-format
+W: debian-source-dir-traversal-2 source: debhelper-compat-file-is-missing
 W: debian-source-dir-traversal-2 source: package-uses-deprecated-debhelper-compat-version 1
diff --git a/t/tests/debhelper-compat-missing/debian/debian/source/options b/t/tests/debhelper-compat-missing/debian/debian/source/options
new file mode 100644
index 0000000..ef3297d
--- /dev/null
+++ b/t/tests/debhelper-compat-missing/debian/debian/source/options
@@ -0,0 +1,2 @@
+tar-ignore
+tar-ignore=*/compat
diff --git a/t/tests/debhelper-compat-missing/desc b/t/tests/debhelper-compat-missing/desc
new file mode 100644
index 0000000..fbf03a3
--- /dev/null
+++ b/t/tests/debhelper-compat-missing/desc
@@ -0,0 +1,5 @@
+Testname: debhelper-compat-missing
+Sequence: 6000
+Version: 1.0
+Description: Test for missing debian/compat
+Test-For: debhelper-compat-file-is-missing
diff --git a/t/tests/debhelper-compat-missing/tags b/t/tests/debhelper-compat-missing/tags
new file mode 100644
index 0000000..babca9c
--- /dev/null
+++ b/t/tests/debhelper-compat-missing/tags
@@ -0,0 +1,2 @@
+W: debhelper-compat-missing source: debhelper-compat-file-is-missing
+W: debhelper-compat-missing source: package-uses-deprecated-debhelper-compat-version 1
diff --git a/t/tests/generic-dh-make-2005/tags b/t/tests/generic-dh-make-2005/tags
index eb71be2..0b4b5b7 100644
--- a/t/tests/generic-dh-make-2005/tags
+++ b/t/tests/generic-dh-make-2005/tags
@@ -4,6 +4,7 @@ E: generic-dh-make-2005: section-is-dh_make-template
 I: generic-dh-make-2005 source: debian-watch-file-is-missing
 I: generic-dh-make-2005: extended-description-is-probably-too-short
 W: generic-dh-make-2005 source: ancient-standards-version 3.6.2 (current is CURRENT)
+W: generic-dh-make-2005 source: debhelper-compat-file-is-missing
 W: generic-dh-make-2005 source: debian-rules-ignores-make-clean-error line 47
 W: generic-dh-make-2005 source: debian-rules-missing-recommended-target build-arch
 W: generic-dh-make-2005 source: debian-rules-missing-recommended-target build-indep
diff --git a/testset/tags.debug b/testset/tags.debug
index 191f3de..3732702 100644
--- a/testset/tags.debug
+++ b/testset/tags.debug
@@ -26,6 +26,7 @@ W: debug source: dbg-package-missing-depends hi-dbg
 W: debug source: dbg-package-missing-depends libhello0-dbg
 W: debug source: debhelper-but-no-misc-depends hello-hello-dbg
 W: debug source: debhelper-but-no-misc-depends hi-dbg
+W: debug source: debhelper-compat-file-is-missing
 W: debug source: debian-rules-sets-DH_COMPAT line 5
 W: debug source: timewarp-standards-version (2006-04-04 < 2006-04-26)
 W: hello-hello-dbg: latest-debian-changelog-entry-without-new-version
diff --git a/testset/tags.fields b/testset/tags.fields
index 1c5a102..9345e94 100644
--- a/testset/tags.fields
+++ b/testset/tags.fields
@@ -10,6 +10,7 @@ I: fields source: missing-debian-source-format
 W: fields source: changelog-should-mention-nmu
 W: fields source: debhelper-but-no-misc-depends another-version
 W: fields source: debhelper-but-no-misc-depends fields
+W: fields source: debhelper-compat-file-is-missing
 W: fields source: debian-revision-not-well-formed 1.5-.3
 W: fields source: native-package-with-dash-version
 W: fields source: no-debian-copyright
diff --git a/testset/tags.maintainer-scripts b/testset/tags.maintainer-scripts
index cf49d75..73eb471 100644
--- a/testset/tags.maintainer-scripts
+++ b/testset/tags.maintainer-scripts
@@ -41,6 +41,7 @@ I: maintainer-scripts: output-of-updaterc.d-not-redirected-to-dev-null bar postr
 W: maintainer-scripts source: ancient-standards-version 3.1.1 (current is 3.9.2)
 W: maintainer-scripts source: changelog-should-mention-qa
 W: maintainer-scripts source: debhelper-but-no-misc-depends maintainer-scripts
+W: maintainer-scripts source: debhelper-compat-file-is-missing
 W: maintainer-scripts source: debian-watch-file-in-native-package
 W: maintainer-scripts source: debian-watch-file-should-mangle-version line 11
 W: maintainer-scripts source: debian-watch-file-should-mangle-version line 7
diff --git a/testset/tags.scripts b/testset/tags.scripts
index d7f1e81..9f24381 100644
--- a/testset/tags.scripts
+++ b/testset/tags.scripts
@@ -36,6 +36,7 @@ I: scripts: script-in-usr-share-doc usr/share/doc/scripts/rubyfoo
 W: scripts source: ancient-standards-version 3.2.1 (current is 3.9.2)
 W: scripts source: binary-arch-rules-but-pkg-is-arch-indep
 W: scripts source: debhelper-but-no-misc-depends scripts
+W: scripts source: debhelper-compat-file-is-missing
 W: scripts source: debian-watch-file-declares-multiple-versions line 7
 W: scripts source: debian-watch-file-should-use-sf-redirector line 8
 W: scripts source: debian-watch-file-specifies-old-upstream-version 5 line 8

-- 
Debian package checker


Reply to: