[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.2.13-7-ga5f818a



The following commit has been merged in the master branch:
commit e00c7700dd76ea2e23fda85bbc51aacdfb85888b
Author: Russ Allbery <rra@debian.org>
Date:   Tue Jul 21 15:18:21 2009 -0700

    Move parts of the control-file missing separator test to source suite
    
    dpkg-dev now rejects more syntax errors (and some whitespace that isn't
    a syntax error) in debian/control files, so move those portions of the
    Lintian test suite to a raw source package test that hand-assembles the
    source package.

diff --git a/t/source/control-file-missing-separator/Makefile b/t/source/control-file-missing-separator/Makefile
new file mode 100644
index 0000000..2c7dede
--- /dev/null
+++ b/t/source/control-file-missing-separator/Makefile
@@ -0,0 +1,21 @@
+name = control-file-missing-separator
+dir  = $(name)-1
+
+all:
+	mkdir $(dir)
+	mkdir $(dir)/debian
+	cp changelog copyright control rules $(dir)/debian/
+	echo 7 > $(dir)/debian/compat
+	tar cfz $(name)_1.tar.gz $(dir)
+	cp dsc.in $(name)_1.dsc
+	perl -I$(LINTIAN_ROOT)/lib -MUtil -i -pe \
+	    'BEGIN { $$h = get_file_checksum("sha1", "$(name)_1.tar.gz") } s/\@SHA1\@/$$h/g' $(name)_1.dsc
+	perl -I$(LINTIAN_ROOT)/lib -MUtil -i -pe \
+	    'BEGIN { $$h = get_file_checksum("sha256", "$(name)_1.tar.gz") } s/\@SHA256\@/$$h/g' $(name)_1.dsc
+	perl -I$(LINTIAN_ROOT)/lib -MUtil -i -pe \
+	    'BEGIN { $$h = get_file_checksum("md5", "$(name)_1.tar.gz") } s/\@MD5\@/$$h/g' $(name)_1.dsc
+	perl -i -pe 'BEGIN { $$s = (stat "$(name)_1.tar.gz")[7] } s/\@SIZE\@/$$s/g' $(name)_1.dsc
+
+clean:
+	rm -rf $(dir)
+	rm -f $(name)_1*
diff --git a/t/source/control-file-missing-separator/changelog b/t/source/control-file-missing-separator/changelog
new file mode 100644
index 0000000..85ee953
--- /dev/null
+++ b/t/source/control-file-missing-separator/changelog
@@ -0,0 +1,10 @@
+control-file-missing-separator (1) unstable; urgency=low
+
+  * Lintian Test Suite.
+  * Test: control-file-missing-separator
+
+  * Suppress "should close ITP bug" messages.  (Closes: #123456)
+
+ -- Debian Lintian Maintainers <lintian-maint@debian.org>  Tue, 21 Jul 2009 12:47:16 -0700
+
+
diff --git a/t/source/control-file-missing-separator/control b/t/source/control-file-missing-separator/control
new file mode 100644
index 0000000..38bb051
--- /dev/null
+++ b/t/source/control-file-missing-separator/control
@@ -0,0 +1,30 @@
+Source: control-file-missing-separator
+Section: devel
+Priority: optional
+Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
+Build-Depends: debhelper (>= 7),
+ fiddle [amd64 powerpc
+ mips mipsel
+ hppa
+ s390],
+ faddle
+ (>>
+ 2) [
+ sparc i386 amd64
+ ]
+Standards-Version: 3.8.2
+
+Package: control-file-missing-separator
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, foo (>= 1)
+  baz (<< 2),
+  fizz (= 2.0)
+Suggests: p1
+ p2
+ p3
+ p4
+ p5
+Description: Test for missing separators in control files
+ 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/source/package-version-0/copyright b/t/source/control-file-missing-separator/copyright
similarity index 100%
copy from t/source/package-version-0/copyright
copy to t/source/control-file-missing-separator/copyright
diff --git a/t/source/control-file-missing-separator/dsc.in b/t/source/control-file-missing-separator/dsc.in
new file mode 100644
index 0000000..1c59bff
--- /dev/null
+++ b/t/source/control-file-missing-separator/dsc.in
@@ -0,0 +1,14 @@
+Format: 1.0
+Source: control-file-missing-separator
+Binary: control-file-missing-separator
+Architecture: all
+Version: 1
+Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
+Standards-Version: 3.8.2
+Build-Depends: debhelper (>= 7), fiddle [amd64 powerpc mips mipsel hppa s390], faddle (>> 2) [sparc i386 amd64]
+Checksums-Sha1:
+ @SHA1@ @SIZE@ control-file-missing-separator_1.tar.gz
+Checksums-Sha256:
+ @SHA256@ @SIZE@ control-file-missing-separator_1.tar.gz
+Files:
+ @MD5@ @SIZE@ control-file-missing-separator_1.tar.gz
diff --git a/t/source/cruft-ancient-file/rules b/t/source/control-file-missing-separator/rules
similarity index 100%
copy from t/source/cruft-ancient-file/rules
copy to t/source/control-file-missing-separator/rules
diff --git a/t/source/control-file-missing-separator/tags b/t/source/control-file-missing-separator/tags
new file mode 100644
index 0000000..1c300ef
--- /dev/null
+++ b/t/source/control-file-missing-separator/tags
@@ -0,0 +1,2 @@
+E: control-file-missing-separator source: missing-separator-between-items in control-file-missing-separator depends field between 'foo (>= 1)' and 'baz (<< 2)'
+E: control-file-missing-separator source: missing-separator-between-items in control-file-missing-separator suggests field between 'p1' and 'p2'
diff --git a/t/tests/control-file-general/debian/debian/control.in b/t/tests/control-file-general/debian/debian/control.in
index 50226c7..3fd6ab3 100644
--- a/t/tests/control-file-general/debian/debian/control.in
+++ b/t/tests/control-file-general/debian/debian/control.in
@@ -3,10 +3,7 @@ Priority: extra
 Maintainer: {$author}
 Standards-Version: {$standards_version}
 Build-Depends: debhelper (>= 7),
- fiddle [amd64 powerpc
- mips mipsel
- hppa
- s390],
+ fiddle [amd64 powerpc mips mipsel hppa s390],
  faddle
  (>>
  2) [
@@ -48,15 +45,9 @@ Description: {$description} (two)
 Package: {$srcpkg}-3
 Section: {$section}
 Architecture: {$architecture}
-Depends: $\{shlibs:Depends\}, $\{misc:Depends\}, foo
-  bar (>= 1), baz
-  (<< 2),
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}, foo (>= 1),
+  baz (<< 2),
   fizz (= 2.0)
-Suggests: p1
- p2
- p3
- p4
- p5
 Description: {$description} (three)
  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
diff --git a/t/tests/control-file-general/tags b/t/tests/control-file-general/tags
index 53ca602..ec31f26 100644
--- a/t/tests/control-file-general/tags
+++ b/t/tests/control-file-general/tags
@@ -1,7 +1,5 @@
 E: control-file-general source: build-info-in-binary-control-file-section Package control-file-general
 E: control-file-general source: missing-separator-between-items in control-file-general depends field between '${shlibs:Depends}' and '${misc:Depends}'
-E: control-file-general source: missing-separator-between-items in control-file-general-3 depends field between 'foo' and 'bar (>= 1)'
-E: control-file-general source: missing-separator-between-items in control-file-general-3 suggests field between 'p1' and 'p2'
 I: control-file-general source: binary-control-field-duplicates-source field "maintainer" in package control-file-general
 I: control-file-general source: duplicate-long-description control-file-general control-file-general-1 control-file-general-2 control-file-general-3 control-file-general-4
 I: control-file-general source: duplicate-short-description control-file-general control-file-general-1

-- 
Debian package checker


Reply to: