[SCM] Debian package checker branch, master, updated. 2.1.5-5-g1c483c8
The following commit has been merged in the master branch:
commit ebf65d68dcc7476279676eaed81cce371083cc8e
Author: Russ Allbery r...@debian.org
Date: Sun Jan 11 00:16:34 2009 -0800
Add pre_upstream hook to the test harness
* t/runtests:
+ [RA] Add pre_upstream hook to modify the upstream source before
generation of the .orig.tar.gz.
diff --git a/debian/changelog b/debian/changelog
index 9d444c2..92de3bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,10 @@ lintian (2.1.6) UNRELEASED; urgency=low
+ [RA] Error on CMakeCache.txt files added or modified in the diff.
Thanks, Joerg Jaspert. (Closes: #510957)
+ * t/runtests:
++ [RA] Add pre_upstream hook to modify the upstream source before
+ generation of the .orig.tar.gz.
+
-- Russ Allbery r...@debian.org Sat, 10 Jan 2009 23:47:46 -0800
lintian (2.1.5) unstable; urgency=low
diff --git a/t/runtests b/t/runtests
index 576adf1..e0c0446 100755
--- a/t/runtests
+++ b/t/runtests
@@ -314,6 +314,10 @@ sub test_package {
runsystem(cp, -rp, $tmpldir/skel.upstream, $targetdir);
runsystem(rm, -f, $targetdir/.dummy);
runsystem(rsync, -rp, $origdir/upstream/, $targetdir/);
+ if (-x $origdir/pre_upstream) {
+ print running pre_upstream hook... if $VERBOSE;
+ runsystem($origdir/pre_upstream, $targetdir);
+ }
runsystem(cd $RUNDIR .
tar czf ${pkg}_${orig_version}.orig.tar.gz $pkgdir);
runsystem(rsync, -rp, --exclude=debian/changelog,
diff --git a/t/tests/README b/t/tests/README
index 3983f02..a20d977 100644
--- a/t/tests/README
+++ b/t/tests/README
@@ -86,6 +86,14 @@ tags
lexicographically sorted before comparing it with tags. This file
may be empty if the test case should produce no Lintian output.
+pre_upstream
+If present and executable, this script is run for a non-native test
+type after preparing the upstream directory but before creating the
+tarball. It receives the path to the package directory as its first
+argument and can make any modifications that can't easily be
+represented in the template system (such as creating files that
+shouldn't be stored in a revision control system).
+
pre_build
If present and executable, this script is run after preparing the
upstream tarball (if any) and the package directory, but before
--
Debian package checker
--
To UNSUBSCRIBE, email to debian-lint-maint-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] Debian package checker branch, master, updated. 2.1.5-5-g1c483c8
The following commit has been merged in the master branch:
commit 1c483c8eec1b9bccbb71ca0a319d558df78b58dd
Author: Russ Allbery r...@debian.org
Date: Sun Jan 11 00:16:59 2009 -0800
Add tests for cruft in the upstream source
diff --git a/t/COVERAGE b/t/COVERAGE
index ddc8313..f0e654e 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -40,15 +40,6 @@ copyright-file usr-share-doc-symlink-to-foreign-package
cruft documentation-package-not-architecture-independent
cruft outdated-autotools-helper-file
-cruft source-contains-arch-control-dir
-cruft source-contains-arch-inventory-file
-cruft source-contains-bzr-control-dir
-cruft source-contains-cvs-conflict-copy
-cruft source-contains-cvs-control-dir
-cruft source-contains-hg-control-dir
-cruft source-contains-svk-commit-file
-cruft source-contains-svn-conflict-file
-cruft source-contains-svn-control-dir
debconf boolean-template-has-bogus-default
debconf debconf-is-not-a-registry
@@ -317,11 +308,7 @@ copyright-file old-fsf-address-in-copyright-file
copyright-file possible-gpl-code-linked-with-openssl
copyright-file usr-share-doc-symlink-without-dependency
-cruft configure-generated-file-in-source
cruft native-package-with-dash-version
-cruft source-contains-bts-control-dir
-cruft source-contains-git-control-dir
-cruft source-contains-svn-commit-file
debconf config-does-not-load-confmodule
debconf debconf-config-not-executable
diff --git a/t/tests/6000_cruft-general-upstream.desc
b/t/tests/6000_cruft-general-upstream.desc
new file mode 100644
index 000..fad1d66
--- /dev/null
+++ b/t/tests/6000_cruft-general-upstream.desc
@@ -0,0 +1,18 @@
+Testname: cruft-general-upstream
+Version: 1.0-1
+Type: non-native
+Description: Check for cruft in the upstream source
+Test-For:
+ configure-generated-file-in-source
+ source-contains-arch-control-dir
+ source-contains-arch-inventory-file
+ source-contains-bts-control-dir
+ source-contains-bzr-control-dir
+ source-contains-cvs-conflict-copy
+ source-contains-cvs-control-dir
+ source-contains-git-control-dir
+ source-contains-hg-control-dir
+ source-contains-svk-commit-file
+ source-contains-svn-commit-file
+ source-contains-svn-conflict-file
+ source-contains-svn-control-dir
diff --git a/t/tests/cruft-general-upstream/pre_upstream
b/t/tests/cruft-general-upstream/pre_upstream
new file mode 100755
index 000..775778b
--- /dev/null
+++ b/t/tests/cruft-general-upstream/pre_upstream
@@ -0,0 +1,31 @@
+#!/bin/sh
+#
+# Create all the various junk that shouldn't exist upstream. We do much of it
+# here rather than in the template so that Lintian itself can be imported into
+# revision control systems.
+
+set -e
+dir=$1
+
+mkdir ${dir}/CVS
+echo 'source-contains-cvs-control-dir' ${dir}/CVS/Entries
+mkdir ${dir}/.svn
+echo 'source-contains-svn-control-dir' ${dir}/.svn/format
+mkdir ${dir}/.bzr
+echo 'source-contains-bzr-control-dir' ${dir}/.bzr/foo
+mkdir ${dir}/{arch}
+echo 'source-contains-arch-control-dir' ${dir}/{arch}/foo
+mkdir ${dir}/.git
+echo 'source-contains-git-control-dir' ${dir}/.git/foo
+mkdir ${dir}/.hg
+echo 'source-contains-hg-control-dir' ${dir}/.hg/foo
+mkdir ${dir}/.be
+echo 'source-contains-bts-control-dir' ${dir}/.be/foo
+
+echo 'source-contains-svn-commit-file' ${dir}/svn-commit.tmp
+echo 'source-contains-svk-commit-file' ${dir}/svk-commit444.tmp
+echo 'source-contains-arch-inventory-file' ${dir}/.arch-inventory
+echo 'source-contains-cvs-conflict-copy' ${dir}/.#foo.1.1
+echo 'source-contains-svn-conflict-file' ${dir}/foo.r1352
+
+echo 'configure-generated-file-in-source' ${dir}/config.cache
diff --git a/t/tests/cruft-general-upstream/tags
b/t/tests/cruft-general-upstream/tags
new file mode 100644
index 000..cba0fd2
--- /dev/null
+++ b/t/tests/cruft-general-upstream/tags
@@ -0,0 +1,13 @@
+I: cruft-general-upstream source: source-contains-arch-control-dir {arch}
+I: cruft-general-upstream source: source-contains-arch-inventory-file
.arch-inventory
+I: cruft-general-upstream source: source-contains-bts-control-dir .be
+I: cruft-general-upstream source: source-contains-bzr-control-dir .bzr
+I: cruft-general-upstream source: source-contains-cvs-conflict-copy .#foo.1.1
+I: cruft-general-upstream source: source-contains-cvs-control-dir CVS
+I: cruft-general-upstream source: source-contains-git-control-dir .git
+I: cruft-general-upstream source: source-contains-hg-control-dir .hg
+I: cruft-general-upstream source: source-contains-svk-commit-file
svk-commit444.tmp
+I: cruft-general-upstream source: source-contains-svn-commit-file
svn-commit.tmp
+I: cruft-general-upstream source: source-contains-svn-conflict-file foo.r1352
+I: cruft-general-upstream source: source-contains-svn-control-dir .svn
+W: cruft-general-upstream source: configure-generated-file-in-source
config.cache
diff --git a/t/tests/basic-non-native/upstream/README
b/t/tests/cruft-general-upstream/upstream/README
similarity index 100%
copy from t/tests/basic-non-native/upstream/README
copy to
