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

[SCM] Debian package checker branch, master, updated. 2.2.5-38-gcc59976



The following commit has been merged in the master branch:
commit 73e16f491af9f5ce0693e809948b1dbf3f38a442
Author: Russ Allbery <rra@debian.org>
Date:   Sat Feb 21 15:02:21 2009 -0800

    Add test of cruft in debian.tar.gz in 3.0 (quilt) packages

diff --git a/t/tests/basic-non-native-with-epoch/upstream/README b/t/tests/cruft-general-quilt/debian/README
similarity index 100%
copy from t/tests/basic-non-native-with-epoch/upstream/README
copy to t/tests/cruft-general-quilt/debian/README
diff --git a/t/templates/skel/debian/control.in b/t/tests/cruft-general-quilt/debian/debian/control.in
similarity index 95%
copy from t/templates/skel/debian/control.in
copy to t/tests/cruft-general-quilt/debian/debian/control.in
index f8f5c04..c9c7406 100644
--- a/t/templates/skel/debian/control.in
+++ b/t/tests/cruft-general-quilt/debian/debian/control.in
@@ -1,4 +1,5 @@
 Source: {$srcpkg}
+Format: 3.0 (quilt)
 Priority: extra
 Section: {$section}
 Maintainer: {$author}
diff --git a/t/tests/cruft-general-quilt/debian/debian/files b/t/tests/cruft-general-quilt/debian/debian/files
new file mode 100644
index 0000000..812cef3
--- /dev/null
+++ b/t/tests/cruft-general-quilt/debian/debian/files
@@ -0,0 +1 @@
+cruft-general-quilt_1.0-1_all.deb devel extra
diff --git a/t/tests/cruft-general-diff/debian/debian/rules b/t/tests/cruft-general-quilt/debian/debian/rules
similarity index 100%
copy from t/tests/cruft-general-diff/debian/debian/rules
copy to t/tests/cruft-general-quilt/debian/debian/rules
diff --git a/t/tests/cruft-general-diff/debian/debian/substvars b/t/tests/cruft-general-quilt/debian/debian/substvars
similarity index 100%
copy from t/tests/cruft-general-diff/debian/debian/substvars
copy to t/tests/cruft-general-quilt/debian/debian/substvars
diff --git a/t/tests/cruft-general-diff/desc b/t/tests/cruft-general-quilt/desc
similarity index 83%
copy from t/tests/cruft-general-diff/desc
copy to t/tests/cruft-general-quilt/desc
index df2634d..07e6a39 100644
--- a/t/tests/cruft-general-diff/desc
+++ b/t/tests/cruft-general-quilt/desc
@@ -1,15 +1,14 @@
-Testname: cruft-general-diff
+Testname: cruft-general-quilt
 Sequence: 6000
 Version: 1.0-1
 Type: non-native
-Description: Check for cruft added in the diff
+Description: Check for cruft added in a 3.0 (quilt) package
 Test-For:
  debian-files-list-in-source
  diff-contains-arch-control-dir
  diff-contains-arch-inventory-file
  diff-contains-bts-control-dir
  diff-contains-bzr-control-dir
- diff-contains-cmake-cache-file
  diff-contains-cvs-conflict-copy
  diff-contains-cvs-control-dir
  diff-contains-editor-backup-file
@@ -22,3 +21,4 @@ Test-For:
  diff-contains-svn-commit-file
  diff-contains-svn-conflict-file
  diff-contains-svn-control-dir
+ unsupported-source-format
diff --git a/t/tests/cruft-general-native/pre_build b/t/tests/cruft-general-quilt/pre_build
similarity index 98%
copy from t/tests/cruft-general-native/pre_build
copy to t/tests/cruft-general-quilt/pre_build
index c594074..78f359c 100755
--- a/t/tests/cruft-general-native/pre_build
+++ b/t/tests/cruft-general-quilt/pre_build
@@ -4,7 +4,7 @@
 # trigger all the tags.
 
 set -e
-dir="$1"
+dir="$1/debian"
 
 mkdir "${dir}/CVS"
 echo 'diff-contains-cvs-control-dir' > "${dir}/CVS/Entries"
diff --git a/t/tests/cruft-general-quilt/tags b/t/tests/cruft-general-quilt/tags
new file mode 100644
index 0000000..8172cbc
--- /dev/null
+++ b/t/tests/cruft-general-quilt/tags
@@ -0,0 +1,18 @@
+E: cruft-general-quilt source: debian-files-list-in-source
+E: cruft-general-quilt source: unsupported-source-format 3.0 (quilt)
+W: cruft-general-quilt source: diff-contains-arch-control-dir debian/{arch}
+W: cruft-general-quilt source: diff-contains-arch-inventory-file debian/.arch-inventory
+W: cruft-general-quilt source: diff-contains-bts-control-dir debian/.be
+W: cruft-general-quilt source: diff-contains-bzr-control-dir debian/.bzr
+W: cruft-general-quilt source: diff-contains-cvs-conflict-copy debian/.#foo.1.1
+W: cruft-general-quilt source: diff-contains-cvs-control-dir debian/CVS
+W: cruft-general-quilt source: diff-contains-editor-backup-file debian/foo~
+W: cruft-general-quilt source: diff-contains-git-control-dir debian/.git
+W: cruft-general-quilt source: diff-contains-hg-control-dir debian/.hg
+W: cruft-general-quilt source: diff-contains-hg-tags-file debian/.hgtags
+W: cruft-general-quilt source: diff-contains-patch-failure-file debian/foo.rej
+W: cruft-general-quilt source: diff-contains-substvars debian/substvars
+W: cruft-general-quilt source: diff-contains-svk-commit-file debian/svk-commit444.tmp
+W: cruft-general-quilt source: diff-contains-svn-commit-file debian/svn-commit.tmp
+W: cruft-general-quilt source: diff-contains-svn-conflict-file debian/foo.r1352
+W: cruft-general-quilt source: diff-contains-svn-control-dir debian/.svn
diff --git a/t/tests/basic-non-native-with-epoch/upstream/README b/t/tests/cruft-general-quilt/upstream/README
similarity index 100%
copy from t/tests/basic-non-native-with-epoch/upstream/README
copy to t/tests/cruft-general-quilt/upstream/README

-- 
Debian package checker


Reply to: