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

[SCM] Debian package checker branch, master, updated. 2.4.3-31-g22e2a1e



The following commit has been merged in the master branch:
commit 22e2a1ebe8dac84235665f8a2803b5ced31f30d3
Author: Niels Thykier <niels@thykier.net>
Date:   Tue Dec 7 23:48:52 2010 +0100

    Added check for unneeded build-dep on quilt when building a 3.0 (quilt)
    package, including a test case for it.
    
      * Summary of tag changes:
        + Added:
          - unneeded-build-dep-on-quilt
      * checks/patch-systems{,.desc}
        + [NT] Added check for new unneeded-build-dep-on-quilt.
          (Closes: #582767)

diff --git a/checks/patch-systems b/checks/patch-systems
index 9934d46..73337e9 100644
--- a/checks/patch-systems
+++ b/checks/patch-systems
@@ -118,6 +118,9 @@ sub run {
 	#----- quilt
 	if ($build_deps->implies("quilt") or $quilt_format) {
 		$uses_patch_system++;
+		if($quilt_format && $build_deps->implies("quilt")){
+		    tag "unneeded-build-dep-on-quilt";
+		}
 		#check for a debian/patches file:
 		if (! -r "debfiles/patches/series") {
 			tag "quilt-build-dep-but-no-series-file" unless $quilt_format;
diff --git a/checks/patch-systems.desc b/checks/patch-systems.desc
index d77749b..f04a9bd 100644
--- a/checks/patch-systems.desc
+++ b/checks/patch-systems.desc
@@ -160,3 +160,11 @@ Info: This package build-depends on a patch system such as dpatch or
  referring to <tt>/usr/share/doc/quilt/README.source</tt>.  Similarly, you
  can refer to <tt>/usr/share/doc/dpatch/README.source.gz</tt> for dpatch.
 Ref: policy 4.14
+
+Tag: unneeded-build-dep-on-quilt
+Severity: normal
+Certainty: certain
+Info: This package build-depends on quilt, which is not required since
+ dpkg-source will apply patches at unpack time for 3.0 (quilt) source
+ packages.
+
diff --git a/debian/changelog b/debian/changelog
index beea800..65fd825 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ lintian (2.4.4) UNRELEASED; urgency=low
     + Added:
       - build-depends-on-specific-java-doc-package
       - depends-on-specific-java-doc-package
+      - unneeded-build-dep-on-quilt
 
   * checks/*:
     + [NT] Use the new pre-sorted file index when iterating over files.
@@ -32,6 +33,9 @@ lintian (2.4.4) UNRELEASED; urgency=low
   * checks/nmu:
     + [RG] Completely abort if debian/changelog is a symlink.
       (Closes: #582408)
+  * checks/patch-systems{,.desc}
+    + [NT] Added check for new unneeded-build-dep-on-quilt.
+      (Closes: #582767)
   * checks/standards-version:
     + [RG] Correctly handle cases where debian/changelog is a symlink.
 
diff --git a/t/tests/debhelper-dh-clean-k-ok/debian/debian/control.in b/t/tests/patch-systems-quilt-source/debian/debian/control.in
similarity index 91%
copy from t/tests/debhelper-dh-clean-k-ok/debian/debian/control.in
copy to t/tests/patch-systems-quilt-source/debian/debian/control.in
index 4a5a774..07c8950 100644
--- a/t/tests/debhelper-dh-clean-k-ok/debian/debian/control.in
+++ b/t/tests/patch-systems-quilt-source/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
 Section: {$section}
 Maintainer: {$author}
 Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 6)
+Build-Depends: debhelper (>= 7.0.50~), quilt
 
 Package: {$srcpkg}
 Architecture: {$architecture}
diff --git a/t/tests/basic-quilt/debian/debian/source/format b/t/tests/patch-systems-quilt-source/debian/debian/source/format
similarity index 100%
copy from t/tests/basic-quilt/debian/debian/source/format
copy to t/tests/patch-systems-quilt-source/debian/debian/source/format
diff --git a/t/tests/patch-systems-quilt-source/desc b/t/tests/patch-systems-quilt-source/desc
new file mode 100644
index 0000000..d9f6dd1
--- /dev/null
+++ b/t/tests/patch-systems-quilt-source/desc
@@ -0,0 +1,7 @@
+Testname: patch-systems-quilt-source
+Sequence: 6000
+Type: non-native
+Version: 1.0-1
+Description: Test for quilt patches which do not have accompanying descriptions
+Test-For: unneeded-build-dep-on-quilt
+References: Debian Bug #582767
diff --git a/t/tests/patch-systems-quilt-source/tags b/t/tests/patch-systems-quilt-source/tags
new file mode 100644
index 0000000..856b0e2
--- /dev/null
+++ b/t/tests/patch-systems-quilt-source/tags
@@ -0,0 +1 @@
+W: patch-systems-quilt-source source: unneeded-build-dep-on-quilt
diff --git a/t/tests/basic-3.0-native/debian/README b/t/tests/patch-systems-quilt-source/upstream/README
similarity index 100%
copy from t/tests/basic-3.0-native/debian/README
copy to t/tests/patch-systems-quilt-source/upstream/README

-- 
Debian package checker


Reply to: