[SCM] Debian package checker branch, master, updated. 2.2.13-50-gbd5784d
The following commit has been merged in the master branch:
commit 1ae12dd1777428c28d017e1f98a89645f2b91b88
Author: Russ Allbery <rra@debian.org>
Date: Sat Aug 15 19:23:31 2009 -0700
Update default test dependencies to debhelper 7.0.50~
We want to be able to use overrides when we want in the test suite,
so increase the default debhelper dependency to permit that. Remove
the one case where we had a control.in file to do the same thing.
diff --git a/t/templates/pedantic/debian/changelog b/t/templates/pedantic/debian/changelog
index 005e963..3a71db2 100644
--- a/t/templates/pedantic/debian/changelog
+++ b/t/templates/pedantic/debian/changelog
@@ -1,3 +1,10 @@
+pedantic (1.3) unstable; urgency=low
+
+ * Raise the default dependency on debhelper to 7.0.50~ so that tests can
+ freely use overrides without a modified control.in.
+
+ -- Russ Allbery <rra@debian.org> Sat, 15 Aug 2009 19:09:44 -0700
+
pedantic (1.2) unstable; urgency=low
* New template based on the default skel template.
diff --git a/t/templates/pedantic/debian/control.in b/t/templates/pedantic/debian/control.in
index 45df06b..86fc105 100644
--- a/t/templates/pedantic/debian/control.in
+++ b/t/templates/pedantic/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/templates/skel/debian/changelog b/t/templates/skel/debian/changelog
index 583eae2..17b64c9 100644
--- a/t/templates/skel/debian/changelog
+++ b/t/templates/skel/debian/changelog
@@ -1,3 +1,10 @@
+skel (1.2) unstable; urgency=low
+
+ * Raise the default dependency on debhelper to 7.0.50~ so that tests can
+ freely use overrides without a modified control.in.
+
+ -- Russ Allbery <rra@debian.org> Sat, 15 Aug 2009 19:09:15 -0700
+
skel (1.1) unstable; urgency=low
* Parameterize the package section to make it easier to avoid spurious
diff --git a/t/templates/skel/debian/control.in b/t/templates/skel/debian/control.in
index 870e4a1..fc7a0e1 100644
--- a/t/templates/skel/debian/control.in
+++ b/t/templates/skel/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/files-general/debian/debian/control.in b/t/tests/files-general/debian/debian/control.in
deleted file mode 100644
index fc7a0e1..0000000
--- a/t/tests/files-general/debian/debian/control.in
+++ /dev/null
@@ -1,14 +0,0 @@
-Source: {$srcpkg}
-Priority: extra
-Section: {$section}
-Maintainer: {$author}
-Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
-
-Package: {$srcpkg}
-Architecture: {$architecture}
-Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
-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
- things. It should not be installed like a regular package.
--
Debian package checker
Reply to: