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

[SCM] Debian package checker branch, master, updated. 2.5.1-112-g63a0456



The following commit has been merged in the master branch:
commit 63a04560a289b5dc6e6926d96079c28888869500
Author: Niels Thykier <niels@thykier.net>
Date:   Sat Jul 16 21:31:49 2011 +0200

    Made test for libdb1-compat and fixed the check as well

diff --git a/checks/fields b/checks/fields
index 27c344c..5a6c1dc 100644
--- a/checks/fields
+++ b/checks/fields
@@ -634,7 +634,7 @@ if (($type eq 'binary') || ($type eq 'udeb')) {
 				    if ($d_pkg eq 'awk' && ! $d_version->[0] && &$is_dep_field($field) && $pkg ne 'base-files');
 
 				tag 'depends-on-libdb1-compat', $field
-				    if ($d_pkg eq 'libdb1-compat' && $pkg !~ /^libc(?:6|6.1|0.3)/ && $field =~ /^(pre-)depends$/);
+				    if ($d_pkg eq 'libdb1-compat' && $pkg !~ /^libc(?:6|6.1|0.3)/ && $field =~ m/^(?:pre-)?depends$/o);
 
 				tag 'depends-on-python-minimal', $field,
 				    if ($d_pkg =~ /^python[\d.]*-minimal$/ && &$is_dep_field($field)
diff --git a/debian/changelog b/debian/changelog
index 9d7a2c0..001dc5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -68,6 +68,8 @@ lintian (2.5.2) UNRELEASED; urgency=low
     + [NT] Added python3-dev and rmeoved python2.{4,5} from
       $PYTHON_DEV.  Thanks to Jakub Wilk for the report and the
       patch.  (Closes: #633044)
+    + [NT] Fixed a bug where the libdb1-compat tag only triggered
+      if libdb1-compat was listed in Pre-Depends.
   * checks/filename-length{,.desc}:
     + [NT] New file that checks the length of the package file
       names.  (Closes: #631656)
diff --git a/t/COVERAGE b/t/COVERAGE
index a3dce9b..9ca4221 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -36,7 +36,6 @@ debconf unknown-template-type
 fields alternates-not-allowed
 fields aspell-package-not-arch-all
 fields bad-menu-item
-fields depends-on-libdb1-compat
 fields doc-package-depends-on-main-package
 fields malformed-python-version
 fields multiline-field
diff --git a/t/tests/fields-depends-general/debian/debian/control.in b/t/tests/fields-depends-general/debian/debian/control.in
index 3bcd360..57ebf72 100644
--- a/t/tests/fields-depends-general/debian/debian/control.in
+++ b/t/tests/fields-depends-general/debian/debian/control.in
@@ -22,7 +22,7 @@ Description: {$description}
 
 Package: lib{$srcpkg}
 Architecture: {$architecture}
-Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}, libdb1-compat
 Recommends: debconf-doc
 Section: libs
 Description: {$description} -- fake library
diff --git a/t/tests/fields-depends-general/desc b/t/tests/fields-depends-general/desc
index d6b123b..eba4620 100644
--- a/t/tests/fields-depends-general/desc
+++ b/t/tests/fields-depends-general/desc
@@ -8,6 +8,7 @@ Test-For:
  conflicts-with-version
  depends-on-essential-package-without-using-version
  depends-exclusively-on-makedev
+ depends-on-libdb1-compat
  depends-on-metapackage
  depends-on-obsolete-package
  depends-on-old-emacs
diff --git a/t/tests/fields-depends-general/tags b/t/tests/fields-depends-general/tags
index 58d78a7..2eab237 100644
--- a/t/tests/fields-depends-general/tags
+++ b/t/tests/fields-depends-general/tags
@@ -3,6 +3,7 @@ E: fields-depends-general: depends-on-essential-package-without-using-version de
 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
+E: libfields-depends-general: depends-on-libdb1-compat depends
 E: py-fields-depends-general: depends-on-python-minimal 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

-- 
Debian package checker


Reply to: