[SCM] Debian package checker branch, master, updated. 2.0.0-68-g7fd87b4
The following commit has been merged in the master branch:
commit 7fd87b44cfb61b5b00e23f5ef3364611653ff1df
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date: Fri Nov 28 17:01:44 2008 +0000
Move a couple of files in the testset from diffs to being generated.
diff --git a/debian/changelog b/debian/changelog
index 4e39f47..8bb57ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -124,10 +124,10 @@ lintian (2.1.0) unstable; urgency=low
- data/debhelper/dh_commands: mapping of debhelper commands to
packages they are contained in
- * testset/files:
- + [ADB] Generate the file "files/'\ " at build time instead of
- including it in the source package, to allow lintian to be imported
- in to Bazaar.
+ * testset/{diffs,filenames}:
+ + [ADB] Generate the files "files/'\ " and "binary.c~" at build time
+ instead of including it in the source package, to allow lintian to be
+ imported in to Bazaar.
-- Frank Lichtenheld <djpig@debian.org> Sun, 28 Sep 2008 10:35:47 +0200
diff --git a/testset/filenames/debian/rules b/testset/filenames/debian/rules
index ff0e41e..f77a857 100755
--- a/testset/filenames/debian/rules
+++ b/testset/filenames/debian/rules
@@ -25,6 +25,7 @@ clean:
touch 'files/.#Maelstrom Sound.1.1.1' 'files/Maelstrom Sounce.r121'
touch 'files/Maelstrom Sound.mine'
touch "files/'\\ "
+ touch filenames.c~
build:
diff --git a/testset/tags.diffs b/testset/tags.diffs
index c0cfb83..e4894fe 100644
--- a/testset/tags.diffs
+++ b/testset/tags.diffs
@@ -23,10 +23,8 @@ W: diffs source: configure-generated-file-in-source subdir-good/config.cache
W: diffs source: configure-generated-file-in-source subdir-good/config.log
W: diffs source: configure-generated-file-in-source subdir-good/config.status
W: diffs source: diff-contains-bzr-control-dir .bzr
-W: diffs source: diff-contains-cvs-conflict-copy .#binary.c.1.34
-W: diffs source: diff-contains-editor-backup-file binary.c~
W: diffs source: diff-contains-substvars debian/substvars
-W: diffs source: patch-system-but-direct-changes-in-diff .#binary.c.1.34 and 2 more
+W: diffs source: patch-system-but-direct-changes-in-diff .bzr/dummy
W: diffs: binary-without-manpage usr/bin/diffs
W: diffs: wrong-bug-number-in-closes l6:#nnnnnn
W: diffs: wrong-bug-number-in-closes l7:#123nnn
diff --git a/testset/tags.filenames b/testset/tags.filenames
index 9d738a4..618a9b4 100644
--- a/testset/tags.filenames
+++ b/testset/tags.filenames
@@ -59,6 +59,7 @@ W: filenames source: diff-contains-bts-control-dir debian/.be
W: filenames source: diff-contains-bzr-control-dir .bzr
W: filenames source: diff-contains-cvs-conflict-copy files/.#Maelstrom Sound.1.1.1
W: filenames source: diff-contains-cvs-control-dir CVS
+W: filenames source: diff-contains-editor-backup-file filenames.c~
W: filenames source: diff-contains-svk-commit-file files/svk-commitsEr9P.tmp
W: filenames source: diff-contains-svn-commit-file files/svn-commit.tmp
W: filenames source: diff-contains-svn-conflict-file files/Maelstrom Sounce.r121
--
Debian package checker
Reply to: