[SCM] Debian package checker branch, master, updated. 2.2.11-7-ge4f23d3
The following commit has been merged in the master branch:
commit e4f23d3a3ba278d5d9576589c9e37150006f72a4
Author: Russ Allbery <rra@debian.org>
Date: Wed Jun 17 19:16:46 2009 -0700
Allow quilt in Build-Depends if dh_quilt_* are used
* checks/fields{,.desc}:
+ [RA] Permit quilt in Build-Depends for arch-independent packages if
dh_quilt_* programs are called in the clean target. Thanks, Daniel
Moerner. (Closes: #528003)
diff --git a/checks/fields b/checks/fields
index 3ff9203..e43a618 100644
--- a/checks/fields
+++ b/checks/fields
@@ -168,6 +168,7 @@ my @RULE_CLEAN_DEPENDS = (
[ "po-debconf" => qr'^\t\s*debconf-updatepo\s' ],
[ $PYTHON_DEPEND => qr'^\t\s*python\s', 'missing-python-build-dependency' ],
[ $PYTHON_DEPEND => qr'\ssetup\.py\b', 'missing-python-build-dependency' ],
+ [ 'quilt (>= 0.46-7~)' => qr'\t\s*dh_quilt_.+' ],
[ quilt => qr'^\t\s*(\S+=\S+\s+)*quilt\s' ],
[ yada => qr'^\t\s*yada\s' ],
);
diff --git a/debian/changelog b/debian/changelog
index 97d2911..575c939 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,9 @@ lintian (2.2.12) UNRELEASED; urgency=low
capital letters in source package names. Check source package names
for validity even when checking only source packages to be sure the
package name is syntactically valid.
+ + [RA] Permit quilt in Build-Depends for arch-independent packages if
+ dh_quilt_* programs are called in the clean target. Thanks, Daniel
+ Moerner. (Closes: #528003)
* checks/files{,.desc}:
+ [RA] Diagnose files installed into discouraged or unknown
subdirectories of /usr/share/fonts/X11 per Policy 11.8.5.
diff --git a/t/tests/fields-quilt-debhelper/debian/a b/t/tests/fields-quilt-debhelper/debian/a
new file mode 100644
index 0000000..c0acc64
--- /dev/null
+++ b/t/tests/fields-quilt-debhelper/debian/a
@@ -0,0 +1 @@
+sample text
diff --git a/t/tests/patch-systems-empty-series/debian/debian/control.in b/t/tests/fields-quilt-debhelper/debian/debian/control.in
similarity index 89%
copy from t/tests/patch-systems-empty-series/debian/debian/control.in
copy to t/tests/fields-quilt-debhelper/debian/debian/control.in
index 6307a5a..513cd02 100644
--- a/t/tests/patch-systems-empty-series/debian/debian/control.in
+++ b/t/tests/fields-quilt-debhelper/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: quilt, debhelper (>= 7)
+Build-Depends: quilt (>= 0.46-7), debhelper (>= 7)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/fields-quilt-debhelper/debian/debian/patches/01_this_patch_is_ok b/t/tests/fields-quilt-debhelper/debian/debian/patches/01_this_patch_is_ok
new file mode 100644
index 0000000..4b192a7
--- /dev/null
+++ b/t/tests/fields-quilt-debhelper/debian/debian/patches/01_this_patch_is_ok
@@ -0,0 +1,7 @@
+This is a description of the patch
+
+--- a/a.orig 2008-11-11 19:38:12.000000000 +0000
++++ b/a 2008-11-11 19:38:26.000000000 +0000
+@@ -1 +1,2 @@
+ sample text
++and some more sample text
diff --git a/t/tests/fields-quilt-debhelper/debian/debian/patches/series b/t/tests/fields-quilt-debhelper/debian/debian/patches/series
new file mode 100644
index 0000000..a342eb3
--- /dev/null
+++ b/t/tests/fields-quilt-debhelper/debian/debian/patches/series
@@ -0,0 +1 @@
+01_this_patch_is_ok
diff --git a/t/tests/fields-quilt-debhelper/debian/debian/rules b/t/tests/fields-quilt-debhelper/debian/debian/rules
new file mode 100755
index 0000000..d893de8
--- /dev/null
+++ b/t/tests/fields-quilt-debhelper/debian/debian/rules
@@ -0,0 +1,34 @@
+#!/usr/bin/make -f
+
+build:
+ dh_quilt_patch
+
+clean:
+ dh_testdir
+ dh_testroot
+ dh_quilt_unpatch
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_prep
+ dh_installdirs
+ dh_install
+
+binary: binary-indep binary-arch
+binary-arch: build install
+binary-indep: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs
+ dh_installdocs
+ dh_link
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+.PHONY: build clean binary-indep binary-arch binary install
diff --git a/t/tests/fields-quilt-debhelper/desc b/t/tests/fields-quilt-debhelper/desc
new file mode 100644
index 0000000..92b7c29
--- /dev/null
+++ b/t/tests/fields-quilt-debhelper/desc
@@ -0,0 +1,7 @@
+Testname: fields-quilt-debhelper
+Sequence: 6000
+Type: non-native
+Version: 1.0-1
+Description: Recognize quilt's debhelper add-ons
+Test-Against: build-depends-without-arch-dep
+References: Debian Bug #528003
diff --git a/t/debs/deb-format-record-size/tags b/t/tests/fields-quilt-debhelper/tags
similarity index 100%
copy from t/debs/deb-format-record-size/tags
copy to t/tests/fields-quilt-debhelper/tags
diff --git a/t/tests/fields-quilt-debhelper/upstream/a b/t/tests/fields-quilt-debhelper/upstream/a
new file mode 100644
index 0000000..c0acc64
--- /dev/null
+++ b/t/tests/fields-quilt-debhelper/upstream/a
@@ -0,0 +1 @@
+sample text
--
Debian package checker
Reply to: