Author: rra
Date: 2008-03-03 06:21:41 +0100 (Mon, 03 Mar 2008)
New Revision: 1234
Modified:
trunk/checks/rules
trunk/checks/rules.desc
trunk/debian/changelog
trunk/testset/binary/debian/rules
trunk/testset/diffs/debian/rules
trunk/testset/tags.binary
Log:
+ [RA] Also check for make -i when checking if errors from make clean or
distclean are ignored. Thanks, J?\195?\182rg Sommer. (Closes: #469024)
Modified: trunk/checks/rules
===================================================================
--- trunk/checks/rules 2008-03-03 05:09:56 UTC (rev 1233)
+++ trunk/checks/rules 2008-03-03 05:21:41 UTC (rev 1234)
@@ -98,7 +98,8 @@
if (/\$[\(\{]PWD[\)\}]/) {
tag "debian-rules-uses-pwd", "line $.";
}
- if (/^\t\s*-(?:\$[\(\{]MAKE[\}\)]|make)\s.*(?:dist)?clean/) {
+ if (/^\t\s*-(?:\$[\(\{]MAKE[\}\)]|make)\s.*(?:dist)?clean/ ||
+ /^\t\s*(?:\$[\(\{]MAKE[\}\)]|make)\s(?:.*\s)?-\w*i.*(?:dist)?clean/) {
tag "debian-rules-ignores-make-clean-error", "line $.";
}
Modified: trunk/checks/rules.desc
===================================================================
--- trunk/checks/rules.desc 2008-03-03 05:09:56 UTC (rev 1233)
+++ trunk/checks/rules.desc 2008-03-03 05:21:41 UTC (rev 1234)
@@ -51,11 +51,13 @@
package's clean or distclean target with a line like:
.
-$(MAKE) distclean
+ or
+ $(MAKE) -i distclean
.
- The leading "-" tells make to ignore all errors. Normally this is done
- for packages using Autoconf since Makefile may not exist. However, this
- line ignores all other error messages, not just the missing Makefile
- error. It's better to use:
+ The leading "-" or the option -i tells make to ignore all errors.
+ Normally this is done for packages using Autoconf since Makefile may not
+ exist. However, this line ignores all other error messages, not just
+ the missing Makefile error. It's better to use:
.
[ ! -f Makefile ] || $(MAKE) distclean
.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-03-03 05:09:56 UTC (rev 1233)
+++ trunk/debian/changelog 2008-03-03 05:21:41 UTC (rev 1234)
@@ -4,6 +4,8 @@
+ [RA] Anchor file matches for Perl libraries and debugging symbols so
as to not match partial paths. Based on a patch from Niko Tyni.
(Closes: #466501)
+ + [RA] Also check for make -i when checking if errors from make clean or
+ distclean are ignored. Thanks, Jörg Sommer. (Closes: #469024)
* checks/changelog-file:
+ [RA] Adjust for the extra space added by Parse::DebianChangelog when
checking line length. Thanks, Robert Millan. (Closes: #467019)
Modified: trunk/testset/binary/debian/rules
===================================================================
--- trunk/testset/binary/debian/rules 2008-03-03 05:09:56 UTC (rev 1233)
+++ trunk/testset/binary/debian/rules 2008-03-03 05:21:41 UTC (rev 1234)
@@ -9,7 +9,7 @@
echo $(PWD)
clean:
- make clean
+ make -i clean
rm -f debian/files debian/substvars
binary-arch: build
Modified: trunk/testset/diffs/debian/rules
===================================================================
--- trunk/testset/diffs/debian/rules 2008-03-03 05:09:56 UTC (rev 1233)
+++ trunk/testset/diffs/debian/rules 2008-03-03 05:21:41 UTC (rev 1234)
@@ -24,7 +24,7 @@
clean:
rm -rf $(tmp)
-# make clean
+ make clean
rm -f subdir-good/config.cache subdir-good/config.log
subdir-good/config.status
.PHONY: build binary-arch binary-indep binary clean
Modified: trunk/testset/tags.binary
===================================================================
--- trunk/testset/tags.binary 2008-03-03 05:09:56 UTC (rev 1233)
+++ trunk/testset/tags.binary 2008-03-03 05:21:41 UTC (rev 1234)
@@ -50,6 +50,7 @@
I: binary: desktop-entry-contains-encoding-key
/usr/share/applications/hello.desktop:13 Encoding
I: binary: no-md5sums-control-file
W: binary source: ancient-standards-version 3.2.1 (current is 3.7.3)
+W: binary source: debian-rules-ignores-make-clean-error line 12
W: binary source: debian-rules-uses-pwd line 9
W: binary source: maintainer-upload-has-incorrect-version-number 4-1.1
W: binary source: native-package-with-dash-version
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
