[SCM] Debian package checker branch, master, updated. 2.5.1-24-g8dc97a9
The following commit has been merged in the master branch:
commit 8dc97a938b879142975a5b6379ced68c80a9641a
Author: Benjamin Drung <bdrung@debian.org>
Date: Tue Jun 28 00:20:39 2011 +0200
Extended the template to cope with Ubuntu's diff for debhelper
In Ubuntu dh_installchangelogs does not install the upstream
changelog by default to reduce package size. Unfortunately
that breaks parts of the test suite, which this patch tries
to work around.
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/t/templates/pedantic/debian/rules b/t/templates/pedantic/debian/rules
index cbe925d..c00e0b5 100755
--- a/t/templates/pedantic/debian/rules
+++ b/t/templates/pedantic/debian/rules
@@ -1,3 +1,11 @@
#!/usr/bin/make -f
+
%:
dh $@
+
+# In Ubuntu, dh does not catch this file by default.
+# They have diffed it to reduce the size of packages.
+ifneq (,$(strip $(wildcard Changes)))
+override_dh_installchangelogs:
+ dh_installchangelogs Changes
+endif
diff --git a/t/tests/changelog-file-extra-upstream/debian/debian/docs b/t/tests/changelog-file-extra-upstream/debian/debian/docs
index 56631ab..6d10dce 100644
--- a/t/tests/changelog-file-extra-upstream/debian/debian/docs
+++ b/t/tests/changelog-file-extra-upstream/debian/debian/docs
@@ -1 +1 @@
-ChangeLog
+changelog
diff --git a/t/tests/changelog-file-extra-upstream/upstream/ChangeLog b/t/tests/changelog-file-extra-upstream/upstream/changelog
similarity index 100%
rename from t/tests/changelog-file-extra-upstream/upstream/ChangeLog
rename to t/tests/changelog-file-extra-upstream/upstream/changelog
diff --git a/t/tests/control-file-pedantic-space/debian/debian/control.in b/t/tests/control-file-pedantic-space/debian/debian/control.in
index bbe6d0a..9320da8 100644
--- a/t/tests/control-file-pedantic-space/debian/debian/control.in
+++ b/t/tests/control-file-pedantic-space/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority:extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 7.0.50~)
Homepage: http://lintian.debian.org/
Package: {$srcpkg}
diff --git a/t/tests/control-file-pedantic/debian/debian/control.in b/t/tests/control-file-pedantic/debian/debian/control.in
index 405b4e5..ab3a9d0 100644
--- a/t/tests/control-file-pedantic/debian/debian/control.in
+++ b/t/tests/control-file-pedantic/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 7.0.50~)
Homepage: http://lintian.debian.org/
Package: {$srcpkg}-udeb
diff --git a/t/tests/copyright-file-license-symlink/debian/debian/control.in b/t/tests/copyright-file-license-symlink/debian/debian/control.in
index eff8ca2..19e272b 100644
--- a/t/tests/copyright-file-license-symlink/debian/debian/control.in
+++ b/t/tests/copyright-file-license-symlink/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 7.0.50~)
Homepage: http://lintian.debian.org/
Package: {$srcpkg}-bad
diff --git a/t/tests/description-homepage/debian/debian/control.in b/t/tests/description-homepage/debian/debian/control.in
index ca30686..6b34296 100644
--- a/t/tests/description-homepage/debian/debian/control.in
+++ b/t/tests/description-homepage/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 7.0.50~)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/fields-no-homepage/debian/debian/control.in b/t/tests/fields-no-homepage/debian/debian/control.in
index d63c764..19297ed 100644
--- a/t/tests/fields-no-homepage/debian/debian/control.in
+++ b/t/tests/fields-no-homepage/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 7.0.50~)
Package: {$srcpkg}
Architecture: {$architecture}
--
Debian package checker
Reply to: