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

[SCM] Debian package checker branch, master, updated. 083946ba13e52aa74e7b4a43de503228a6648dab



The following commit has been merged in the master branch:
commit 083946ba13e52aa74e7b4a43de503228a6648dab
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date:   Fri Jul 4 21:40:05 2008 +0100

    Add {diff,source}-contains-bts-control-dir
    
      * checks/cruft{,.desc}:
        + [ADB] Check for BTS control directories in source packages and diffs
          in addition to the existing binary package checks.  (Closes: #481787)

diff --git a/checks/cruft b/checks/cruft
index e70d059..ae58ad3 100644
--- a/checks/cruft
+++ b/checks/cruft
@@ -52,6 +52,8 @@ my @directory_checks =
      [ qr!^(.+/)?,,.+$!       => 'arch-control-dir' ],
      [ qr,^(.+/)?\.git$,      => 'git-control-dir'  ],
      [ qr,^(.+/)?\.hg$,       => 'hg-control-dir'   ],
+     [ qr,^(.+/)?\.be$,       => 'bts-control-dir'  ],
+     [ qr,^(.+/)?\.ditrack$,  => 'bts-control-dir'  ],
     );
 
 # File checks.  These regexes match files that shouldn't be in the source
diff --git a/checks/cruft.desc b/checks/cruft.desc
index 87fd343..353a58e 100644
--- a/checks/cruft.desc
+++ b/checks/cruft.desc
@@ -250,3 +250,16 @@ Info: The referenced file has a time stamp older than year 2004 and the
  .
  Read /usr/share/doc/autotools-dev/README.Debian.gz (from the
  autotools-dev package) for information on how to fix this problem.
+
+Tag: diff-contains-bts-control-dir
+Type: warning
+Info: The Debian diff or native package contains files in a directory
+ used by a bug tracking system, which are not useful in a diff or native
+ package. Passing <tt>-i</tt> to <tt>dpkg-buildpackage</tt> or the
+ equivalent will automatically exclude them.
+
+Tag: source-contains-bts-control-dir
+Type: info
+Info: The upstream source contains a directory used by a bug tracking
+ system. It was most likely included by accident since bug tracking system
+ directories usually don't belong in releases.
diff --git a/debian/changelog b/debian/changelog
index 005c35e..0060171 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ lintian (1.24.2) unstable; urgency=low
     + [ADB] Add missing "use Dep". Thanks gregor herrmann (Closes: #488397)
   * checks/copyright-file{,.desc}:
     + [ADB] Check for over-long lines in copyright files.  (Closes: #479651)
+  * checks/cruft{,.desc}:
+    + [ADB] Check for BTS control directories in source packages and diffs
+      in addition to the existing binary package checks.  (Closes: #481787)
   * checks/debconf{,.desc}:
     + [ADB] Warn about the use of "_Choices" in templates file and suggest
       using "__Choices" instead (Closes: #481152)
diff --git a/testset/diffs_1.orig.tar.gz b/testset/diffs_1.orig.tar.gz
index 539c372..2374b99 100644
Binary files a/testset/diffs_1.orig.tar.gz and b/testset/diffs_1.orig.tar.gz differ
diff --git a/testset/filenames/debian/.be/dummy b/testset/filenames/debian/.be/dummy
new file mode 100644
index 0000000..fba37e2
--- /dev/null
+++ b/testset/filenames/debian/.be/dummy
@@ -0,0 +1 @@
+Dummy file to trigger diff-contains-bts-control-dir
diff --git a/testset/tags.diffs b/testset/tags.diffs
index d4196c6..b258eda 100644
--- a/testset/tags.diffs
+++ b/testset/tags.diffs
@@ -6,6 +6,7 @@ E: diffs: unstripped-binary-or-object ./usr/bin/diffs
 I: diffs source: build-depends-without-arch-dep dpatch
 I: diffs source: debian-watch-file-is-missing
 I: diffs source: diff-contains-editor-backup-file binary.c~
+I: diffs source: source-contains-bts-control-dir .ditrack
 I: diffs source: source-contains-git-control-dir .git
 I: diffs source: source-contains-svn-commit-file svn-commit.tmp
 I: diffs: no-md5sums-control-file
diff --git a/testset/tags.filenames b/testset/tags.filenames
index ce3b7f0..88e5325 100644
--- a/testset/tags.filenames
+++ b/testset/tags.filenames
@@ -46,6 +46,7 @@ W: filenames source: ancient-standards-version 3.1.1 (current is 3.8.0)
 W: filenames source: diff-contains-arch-control-dir .arch-ids
 W: filenames source: diff-contains-arch-control-dir {arch}
 W: filenames source: diff-contains-arch-inventory-file files/.arch-inventory
+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

-- 
Debian package checker


Reply to: