[SCM] Debian package checker branch, master, updated. 2.4.3-28-g20f9f99

["Niels Thykier" <niels@thykier.net>]

The following commit has been merged in the master branch:
commit 20f9f993175b670cbc1f4d9e7a69b7593ed169a6
Author: Niels Thykier <niels@thykier.net>
Date:   Wed Dec 22 17:03:20 2010 +0100

    Added some extra binary package relation checks to
    fields-depends-general.

diff --git a/t/COVERAGE b/t/COVERAGE
index c7f01f6..c3ba494 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -253,25 +253,19 @@ debhelper uses-dh-python-with-no-pycompat
 etcfiles file-in-etc-not-marked-as-conffile
 
 fields build-depends-indep-without-arch-indep
-fields conflicts-with-dependency
 fields dbg-package-missing-depends
 fields debian-revision-not-well-formed
 fields debian-revision-should-not-be-zero
 fields debug-package-should-be-priority-extra
 fields depends-exclusively-on-makedev
-fields depends-on-essential-package-without-using-version
-fields depends-on-obsolete-package
 fields depends-on-old-emacs
 fields depends-on-python-minimal
 fields malformed-dm-upload-allowed
-fields needlessly-depends-on-awk
-fields ored-depends-on-obsolete-package
 fields package-depends-on-multiple-libpng-versions
 fields package-depends-on-multiple-libstdc-versions
 fields package-depends-on-multiple-tcl-versions
 fields package-depends-on-multiple-tk-versions
 fields package-depends-on-multiple-tkx-versions
-fields package-relation-with-self
 fields redundant-bugs-field
 fields redundant-origin-field
 fields unknown-section
@@ -678,19 +672,13 @@ maintainer-scripts
   wrong-debian-qa-group-name
 
 relations
-  conflicts-with-dependency
   depends-exclusively-on-makedev
-  depends-on-essential-package-without-using-version
-  depends-on-obsolete-package
   depends-on-old-emacs
-  needlessly-depends-on-awk
-  ored-depends-on-obsolete-package
   package-depends-on-multiple-libpng-versions
   package-depends-on-multiple-libstdc-versions
   package-depends-on-multiple-tcl-versions
   package-depends-on-multiple-tk-versions
   package-depends-on-multiple-tkx-versions
-  package-relation-with-self
   quilt-build-dep-but-no-series-file
   redundant-bugs-field
   redundant-origin-field
diff --git a/t/tests/fields-depends-general/debian/debian/control.in b/t/tests/fields-depends-general/debian/debian/control.in
index e914ad8..230d62f 100644
--- a/t/tests/fields-depends-general/debian/debian/control.in
+++ b/t/tests/fields-depends-general/debian/debian/control.in
@@ -7,9 +7,11 @@ Build-Depends: debhelper (>= 7.0.50~)
 
 Package: {$srcpkg}
 Architecture: {$architecture}
-Depends: $\{shlibs:Depends\}, $\{misc:Depends\}, xorg
-Breaks: package-without-version
-Conflicts: package-with-version (<< 3.0)
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}, xorg, bash,
+ conflict-dep, gawk | awk, new-package | xbase-clients, {$srcpkg},
+ gaim
+Breaks: package-without-version, {$srcpkg} (<< 0.1)
+Conflicts: package-with-version (<< 3.0), conflict-dep
 Description: {$description}
  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/fields-depends-general/desc b/t/tests/fields-depends-general/desc
index a39c0d9..520d978 100644
--- a/t/tests/fields-depends-general/desc
+++ b/t/tests/fields-depends-general/desc
@@ -4,7 +4,14 @@ Version: 1.0
 Description: General tests for binary package dependencies
 Test-For:
  breaks-without-version
+ conflicts-with-dependency
  conflicts-with-version
+ depends-on-essential-package-without-using-version
  depends-on-metapackage
+ depends-on-obsolete-package
  lib-recommends-documentation
+ needlessly-depends-on-awk
+ ored-depends-on-obsolete-package
+ package-depends-on-itself
+ package-relation-with-self
 
diff --git a/t/tests/fields-depends-general/tags b/t/tests/fields-depends-general/tags
index 5b34d55..1a39a46 100644
--- a/t/tests/fields-depends-general/tags
+++ b/t/tests/fields-depends-general/tags
@@ -1,4 +1,11 @@
+E: fields-depends-general: conflicts-with-dependency depends conflict-dep
+E: fields-depends-general: depends-on-essential-package-without-using-version depends: bash
 E: fields-depends-general: depends-on-metapackage depends: xorg
+E: fields-depends-general: depends-on-obsolete-package depends: gaim
+E: fields-depends-general: needlessly-depends-on-awk depends
 I: fields-depends-general: conflicts-with-version package-with-version (<< 3.0)
+I: fields-depends-general: ored-depends-on-obsolete-package depends: xbase-clients
+W: fields-depends-general source: package-depends-on-itself fields-depends-general depends
 W: fields-depends-general: breaks-without-version package-without-version
+W: fields-depends-general: package-relation-with-self breaks: fields-depends-general (<< 0.1)
 W: libfields-depends-general: lib-recommends-documentation recommends: debconf-doc

-- 
Debian package checker