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

[SCM] Debian package checker branch, master, updated. 2.4.3-53-g788ac0b



The following commit has been merged in the master branch:
commit 788ac0bd5b92667c8761edc1b56b4c56549e2fc9
Author: Niels Thykier <niels@thykier.net>
Date:   Sat Dec 25 15:25:41 2010 +0100

    Added substvars tests to the new test suite.

diff --git a/t/COVERAGE b/t/COVERAGE
index 0e9284d..360551b 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -432,12 +432,6 @@ shared-libs unknown-meta-field-in-symbols-file
 shared-libs unused-shlib-entry-in-control-file
 shared-libs unused-shlib-entry-in-symbols-control-file
 
-version-substvars not-binnmuable-all-depends-any
-version-substvars not-binnmuable-any-depends-all
-version-substvars not-binnmuable-any-depends-any
-version-substvars substvar-source-version-is-deprecated
-version-substvars version-substvar-for-external-package
-
 watch-file debian-watch-file-specifies-old-upstream-version
 
 Breakdown of remaining tags in legacy test suite by test case:
@@ -480,8 +474,6 @@ binary
   no-md5sums-control-file
   non-wm-in-windowmanager-menu-section
   non-wm-module-in-wm-modules-menu-section
-  not-binnmuable-all-depends-any
-  not-binnmuable-any-depends-all
   old-fsf-address-in-copyright-file
   package-contains-hardlink
   package-contains-upstream-install-documentation
@@ -491,7 +483,6 @@ binary
   su-to-root-with-usr-sbin
   su-wrapper-not-su-to-root
   su-wrapper-without--c
-  substvar-source-version-is-deprecated
   symlink-contains-spurious-segments
   unquoted-string-in-menu-item
   unstripped-binary-or-object
@@ -541,7 +532,6 @@ debug
   syntax-error-in-symbols-file
   unknown-meta-field-in-symbols-file
   unused-shlib-entry-in-symbols-control-file
-  version-substvar-for-external-package
 
 etcfiles
   file-in-etc-not-marked-as-conffile
@@ -613,7 +603,6 @@ libbaz
   missing-dependency-on-perlapi
   missing-depends-line
   no-symbols-control-file
-  not-binnmuable-any-depends-any
   package-name-doesnt-match-sonames
   postinst-must-call-ldconfig
   postinst-should-not-set-usr-doc-link
diff --git a/t/tests/copyright-file-doc-symlink/debian/debian/control.in b/t/tests/version-substvars-general/debian/debian/control.in
similarity index 56%
copy from t/tests/copyright-file-doc-symlink/debian/debian/control.in
copy to t/tests/version-substvars-general/debian/debian/control.in
index b933d68..2dfa8b2 100644
--- a/t/tests/copyright-file-doc-symlink/debian/debian/control.in
+++ b/t/tests/version-substvars-general/debian/debian/control.in
@@ -3,36 +3,40 @@ Priority: extra
 Section: {$section}
 Maintainer: {$author}
 Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 7.0.50~)
 
-Package: {$srcpkg}
-Architecture: {$architecture}
-Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
+Package: program-bin
+Architecture: any
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\},
+         program-data (= $\{binary:Version\})
 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
  things.  It should not be installed like a regular package.  It may
  be an empty package.
 
-Package: {$srcpkg}-helper
-Architecture: {$architecture}
-Depends: {$srcpkg} (= {$version}), $\{shlibs:Depends\}, $\{misc:Depends\}
-Description: {$description} (symlink)
- Helper package with a legitimate /usr/share/doc symlink.
- .
+
+Package: program-data
+Architecture: all
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\},
+         program-bin (= $\{binary:Version\}),
+         foreign-pkg (= $\{Source-Version\})
+Description: {$description} - data
  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
  things.  It should not be installed like a regular package.  It may
  be an empty package.
-
-Package: {$srcpkg}-weak
-Architecture: {$architecture}
-Depends: {$srcpkg}, $\{shlibs:Depends\}, $\{misc:Depends\}
-Description: {$description} (weak)
- Helper package with a /usr/share/doc symlink but an insufficiently
- strong dependency.  Lintian intentionally doesn't diagnose this.
  .
+ Data package.
+
+Package: program-utils
+Architecture: any
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\},
+         program-bin (= $\{source:Version\})
+Description: {$description} - extra utils
  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
  things.  It should not be installed like a regular package.  It may
  be an empty package.
+ .
+ Extra utils.
diff --git a/t/tests/version-substvars-general/desc b/t/tests/version-substvars-general/desc
new file mode 100644
index 0000000..7629b01
--- /dev/null
+++ b/t/tests/version-substvars-general/desc
@@ -0,0 +1,10 @@
+Testname: version-substvars-general
+Sequence: 6000
+Version: 1.0
+Description: Test of substvars
+Test-For:
+ not-binnmuable-all-depends-any
+ not-binnmuable-any-depends-all
+ not-binnmuable-any-depends-any
+ substvar-source-version-is-deprecated
+ version-substvar-for-external-package
diff --git a/t/tests/version-substvars-general/tags b/t/tests/version-substvars-general/tags
new file mode 100644
index 0000000..d3e4301
--- /dev/null
+++ b/t/tests/version-substvars-general/tags
@@ -0,0 +1,5 @@
+E: version-substvars-general source: not-binnmuable-all-depends-any program-data -> program-bin
+E: version-substvars-general source: not-binnmuable-any-depends-all program-bin -> program-data
+E: version-substvars-general source: not-binnmuable-any-depends-any program-utils -> program-bin
+E: version-substvars-general source: version-substvar-for-external-package program-data -> foreign-pkg
+W: version-substvars-general source: substvar-source-version-is-deprecated program-data

-- 
Debian package checker


Reply to: