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

[SCM] Debian package checker branch, master, updated. 2.2.0-6-gc6b2da1



The following commit has been merged in the master branch:
commit 641854da8e53aa9bb18ac5c4df13b79b8651ea5a
Author: Russ Allbery <rra@debian.org>
Date:   Sun Jan 25 14:22:36 2009 -0800

    Allow but don't require libmodule-build-perl dependencies
    
    * checks/fields:
      + [RA] Allow but do not require a libmodule-build-perl dependency if
        the Build script is referenced in clean.  Thanks, Charles Plessy and
        gregor herrmann.  (Closes: #421549)

diff --git a/checks/fields b/checks/fields
index 882cc93..80e256a 100644
--- a/checks/fields
+++ b/checks/fields
@@ -107,6 +107,7 @@ my @rule_clean_depends = (
 my @rule_clean_allowed = (
 	[ patch => '^\t\s*(?:perl debian/)?yada\s+unpatch' ],
 	[ 'perl | perl-base (>= 5.6.0-16)' => '(^\t|\|\|)\s*(perl|\$\(PERL\))\s' ],
+	[ 'perl-modules (>= 5.10) | libmodule-build-perl' => '(^\t|\|\|)\s*(perl|\$\(PERL\))\s+Build\b' ],
 	[ 'python-setuptools' => '\ssetup\.py\b' ],
 );
 
diff --git a/debian/changelog b/debian/changelog
index b676d32..8fbc5bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 lintian (2.2.1) UNRELEASED; urgency=low
 
+  * checks/fields:
+    + [RA] Allow but do not require a libmodule-build-perl dependency if
+      the Build script is referenced in clean.  Thanks, Charles Plessy and
+      gregor herrmann.  (Closes: #421549)
   * checks/shared-libs.desc:
     + [RA] Add references to the UsingSymbolsFiles wiki page in the tags
       requesting generation of a symbols file.
diff --git a/t/tests/control-file-suggests-itself/debian/debian/control.in b/t/tests/fields-module-build-allowed/debian/debian/control.in
similarity index 88%
copy from t/tests/control-file-suggests-itself/debian/debian/control.in
copy to t/tests/fields-module-build-allowed/debian/debian/control.in
index 6247cd4..718bb3c 100644
--- a/t/tests/control-file-suggests-itself/debian/debian/control.in
+++ b/t/tests/fields-module-build-allowed/debian/debian/control.in
@@ -3,12 +3,11 @@ Priority: extra
 Section: {$section}
 Maintainer: {$author}
 Standards-Version: 3.8.0
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 7), libmodule-build-perl
 
 Package: {$srcpkg}
 Architecture: {$architecture}
 Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
-Suggests: {$srcpkg}
 Description: {$description}
  This is a test package designed to exercise some feature or tag of
  Lintian.  It is part of the Lintian test suite and may do very odd
diff --git a/t/tests/fields-module-build-allowed/debian/debian/rules b/t/tests/fields-module-build-allowed/debian/debian/rules
new file mode 100755
index 0000000..a87218a
--- /dev/null
+++ b/t/tests/fields-module-build-allowed/debian/debian/rules
@@ -0,0 +1,28 @@
+#!/usr/bin/make -f
+#
+# We can't use dh rule minimization, since that intentionally disables the
+# check that we're testing.
+
+build:
+install:
+
+clean:
+	dh_testdir
+	dh_testroot
+	[ ! -f Build ] || $(PERL) Build --allow_mb_mismatch 1 distclean
+	dh_clean
+
+binary: binary-arch binary-indep
+binary-arch:
+binary-indep:
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs
+	dh_installdocs
+	dh_link
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
diff --git a/t/tests/fields-module-build-allowed/desc b/t/tests/fields-module-build-allowed/desc
new file mode 100644
index 0000000..95716f5
--- /dev/null
+++ b/t/tests/fields-module-build-allowed/desc
@@ -0,0 +1,5 @@
+Testname: fields-module-build-allowed
+Sequence: 6000
+Version: 1.0
+Description: Test that libmodule-build-perl dependencies are allowed
+Test-Against: build-depends-without-arch-dep
diff --git a/t/tests/basic-non-native/tags b/t/tests/fields-module-build-allowed/tags
similarity index 100%
copy from t/tests/basic-non-native/tags
copy to t/tests/fields-module-build-allowed/tags

-- 
Debian package checker


Reply to: