Author: djpig
Date: 2008-05-06 22:28:19 +0200 (Tue, 06 May 2008)
New Revision: 1306
Added:
trunk/testset/dh7-test/
trunk/testset/dh7-test/debian/
trunk/testset/dh7-test/debian/changelog
trunk/testset/dh7-test/debian/compat
trunk/testset/dh7-test/debian/control
trunk/testset/dh7-test/debian/copyright
trunk/testset/dh7-test/debian/rules
trunk/testset/tags.dh7-test
Modified:
trunk/checks/debhelper
trunk/checks/fields
trunk/debian/changelog
Log:
* checks/debhelper:
+ Add basic support for debhelpers new dh utility.
(Closes: #477628)
Modified: trunk/checks/debhelper
===================================================================
--- trunk/checks/debhelper 2008-05-06 19:47:49 UTC (rev 1305)
+++ trunk/checks/debhelper 2008-05-06 20:28:19 UTC (rev 1306)
@@ -88,7 +88,8 @@
my %versions
= (dh_icons => '5.0.51~',
dh_installifupdown => '5.0.44~',
- dh_lintian => '6.0.7~');
+ dh_lintian => '6.0.7~',
+ dh => '7');
open(RULES, '<', "debfiles/rules") or fail("cannot read debian/rules: $!");
my $dhcompatvalue;
@@ -115,6 +116,10 @@
}
$seencommand = 1;
$needbuilddepends = 1;
+ } elsif (m,^\s+dh\s+,) {
+ $seencommand = 1;
+ $needbuilddepends = 1;
+ push (@versioncheck, 'dh');
} elsif (m,^include\s+/usr/share/cdbs/1/rules/debhelper.mk,) {
$seencommand = 1;
$needbuilddepends = 1;
Modified: trunk/checks/fields
===================================================================
--- trunk/checks/fields 2008-05-06 19:47:49 UTC (rev 1305)
+++ trunk/checks/fields 2008-05-06 20:28:19 UTC (rev 1306)
@@ -110,7 +110,8 @@
# enough that we can't know what packages are permitted in Build-Depends and
# should bypass the build-depends-without-arch-dep check completely.
my @global_clean_bypass = (
- '^include\s*/usr/share/cdbs/1/class/ant.mk'
+ '^include\s*/usr/share/cdbs/1/class/ant.mk',
+ '^\s+dh\s+'
);
sub run {
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-05-06 19:47:49 UTC (rev 1305)
+++ trunk/debian/changelog 2008-05-06 20:28:19 UTC (rev 1306)
@@ -5,6 +5,8 @@
* checks/debhelper:
+ [FL] dh_lintian needs debhelper >= 6.0.7. Patch by David Paleino.
(Closes: #479088)
+ + [FL] Add basic support for debhelpers new dh utility.
+ (Closes: #477628)
* checks/menu-format:
+ [FL] Don't issue false positives about menu files in format menu-2.
We don't check them for errors yet, though. (Closes: #478578)
Added: trunk/testset/dh7-test/debian/changelog
===================================================================
--- trunk/testset/dh7-test/debian/changelog (rev 0)
+++ trunk/testset/dh7-test/debian/changelog 2008-05-06 20:28:19 UTC (rev
1306)
@@ -0,0 +1,6 @@
+dh7-test (1-1) unstable; urgency=low
+
+ * Initial release
+
+ -- Frank Lichtenheld <[EMAIL PROTECTED]> Thu, 4 Aug 2005 23:09:00 +0200
+
Added: trunk/testset/dh7-test/debian/compat
===================================================================
--- trunk/testset/dh7-test/debian/compat (rev 0)
+++ trunk/testset/dh7-test/debian/compat 2008-05-06 20:28:19 UTC (rev
1306)
@@ -0,0 +1 @@
+6
Added: trunk/testset/dh7-test/debian/control
===================================================================
--- trunk/testset/dh7-test/debian/control (rev 0)
+++ trunk/testset/dh7-test/debian/control 2008-05-06 20:28:19 UTC (rev
1306)
@@ -0,0 +1,12 @@
+Source: dh7-test
+Section: devel
+Priority: optional
+Maintainer: Lintian Maintainers <[email protected]>
+Build-Depends: debhelper (>= 6)
+Standards-Version: 3.7.3
+
+Package: dh7-test
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Checks related to the dh build utility
+ New in debhelper 7.
Added: trunk/testset/dh7-test/debian/copyright
===================================================================
--- trunk/testset/dh7-test/debian/copyright (rev 0)
+++ trunk/testset/dh7-test/debian/copyright 2008-05-06 20:28:19 UTC (rev
1306)
@@ -0,0 +1,5 @@
+This package was debianized by Frank Lichtenheld <[EMAIL PROTECTED]> on
+Thu, 4 Aug 2005 23:09:00 +0200.
+
+Test copyright date handling:
+Copyright 2005, 2008 Frank Lichtenheld
Added: trunk/testset/dh7-test/debian/rules
===================================================================
--- trunk/testset/dh7-test/debian/rules (rev 0)
+++ trunk/testset/dh7-test/debian/rules 2008-05-06 20:28:19 UTC (rev 1306)
@@ -0,0 +1,9 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+export DH_VERBOSE = 1
+
+clean build binary-indep binary:
+ dh $@
+
+.PHONY: clean build binary-arch binary-indep binary
Property changes on: trunk/testset/dh7-test/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/testset/tags.dh7-test
===================================================================
--- trunk/testset/tags.dh7-test (rev 0)
+++ trunk/testset/tags.dh7-test 2008-05-06 20:28:19 UTC (rev 1306)
@@ -0,0 +1,6 @@
+W: dh7-test source: changelog-should-mention-nmu
+W: dh7-test source: debhelper-script-needs-versioned-build-depends dh (>= 7)
+W: dh7-test source: native-package-with-dash-version
+W: dh7-test source: no-human-maintainers
+W: dh7-test source: source-nmu-has-incorrect-version-number 1-1
+W: dh7-test: new-package-should-close-itp-bug
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
