[SCM] Debian package checker branch, master, updated. 2.2.10-104-g01c33b0
The following commit has been merged in the master branch:
commit ffcc0ac013025eff01b9ef5f91210dd8cecc93ae
Author: Russ Allbery <rra@debian.org>
Date: Sun Jun 14 18:05:06 2009 -0700
Adjust test suite for source format control field
dpkg no longer supports setting Format in debian/control and instead
requires debian/source/format. Update the test cases for other source
formats accordingly.
diff --git a/t/source/unpack-srcpkg-lzma/Makefile b/t/source/unpack-srcpkg-lzma/Makefile
index e32eb50..27cbe59 100644
--- a/t/source/unpack-srcpkg-lzma/Makefile
+++ b/t/source/unpack-srcpkg-lzma/Makefile
@@ -9,6 +9,8 @@ all:
cp changelog copyright control rules $(dir)/debian/
echo 7 > $(dir)/debian/compat
touch $(dir)/debian/watch
+ mkdir $(dir)/debian/source
+ echo '3.0 (quilt)' > $(dir)/debian/source/format
dpkg-source -sp -b $(dir)
clean:
diff --git a/t/source/unpack-srcpkg-lzma/control b/t/source/unpack-srcpkg-lzma/control
index 2d6a4aa..f976e57 100644
--- a/t/source/unpack-srcpkg-lzma/control
+++ b/t/source/unpack-srcpkg-lzma/control
@@ -1,5 +1,4 @@
Source: unpack-srcpkg-lzma
-Format: 3.0 (quilt)
Section: devel
Priority: optional
Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
diff --git a/t/tests/cruft-general-quilt/debian/debian/control.in b/t/tests/cruft-general-quilt/debian/debian/control.in
deleted file mode 100644
index f46e04b..0000000
--- a/t/tests/cruft-general-quilt/debian/debian/control.in
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: {$srcpkg}
-Format: 3.0 (quilt)
-Priority: extra
-Section: {$section}
-Maintainer: {$author}
-Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
-
-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.
diff --git a/t/tests/cruft-general-quilt/debian/debian/source/format b/t/tests/cruft-general-quilt/debian/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/t/tests/cruft-general-quilt/debian/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/t/tests/cruft-general-wig-pen/debian/debian/control.in b/t/tests/cruft-general-wig-pen/debian/debian/control.in
deleted file mode 100644
index d8fa784..0000000
--- a/t/tests/cruft-general-wig-pen/debian/debian/control.in
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: {$srcpkg}
-Format: 2.0
-Priority: extra
-Section: {$section}
-Maintainer: {$author}
-Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
-
-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.
diff --git a/t/tests/cruft-general-wig-pen/debian/debian/source/format b/t/tests/cruft-general-wig-pen/debian/debian/source/format
new file mode 100644
index 0000000..cd5ac03
--- /dev/null
+++ b/t/tests/cruft-general-wig-pen/debian/debian/source/format
@@ -0,0 +1 @@
+2.0
--
Debian package checker
Reply to: