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

[SCM] Debian package checker branch, master, updated. 2.5.0-rc1-20-g7dbe4df



The following commit has been merged in the master branch:
commit 7dbe4df8089139631242380a69ef0c2ed73469c1
Author: Niels Thykier <niels@thykier.net>
Date:   Thu Mar 24 21:56:13 2011 +0100

    Update lintian to be compatiable with future dpkg
    
    Future versions of dpkg does not accept versions that starts
    with a "non-digit" and also add a "package-list" field to
    dsc files.

diff --git a/data/common/source-fields b/data/common/source-fields
index f6ae687..452d835 100644
--- a/data/common/source-fields
+++ b/data/common/source-fields
@@ -18,6 +18,7 @@ format
 homepage
 maintainer
 origin
+package-list
 python-version
 source
 standards-version
diff --git a/debian/changelog b/debian/changelog
index 307b180..5d87901 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,12 +39,17 @@ lintian (2.5.0~rc2) UNRELEASED; urgency=low
   * data/changelog-file/ubuntu-dists:
     + [NT] Added oneiric as valid Ubuntu distribution.  Thanks to Benjamin
       Drung for the patch.
+  * data/common/source-fields:
+    + [NT] Added 'package-list' field, which is emitted by dpkg 1.16.0.
   * data/spelling/corrections:
     + [NT] Added more misspellings.
   
   * t/tests/shared-libs-la-files:
     + [NT] Fixed an issue where files would not be included in the tarball
       due to dpkg-source's exclude patterns.  (Closes: #619287)
+  * t/tests/*:
+    + [NT] Modified some versioned dependencies that the new dpkg will
+      not consider valid from 1.16.0.
 
  -- Adam D. Barratt <adam@adam-barratt.org.uk>  Fri, 25 Feb 2011 17:48:59 +0000
 
diff --git a/t/tests/lintian-display-level/debian/debian/control.in b/t/tests/lintian-display-level/debian/debian/control.in
index d352d12..1f4bd68 100644
--- a/t/tests/lintian-display-level/debian/debian/control.in
+++ b/t/tests/lintian-display-level/debian/debian/control.in
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 7.0.50~)
 
 Package: {$srcpkg}
 Architecture: {$architecture}
-Depends: $\{misc:Depends\}, libssl0.9.8 (>= abcd)
+Depends: $\{misc:Depends\}, libssl0.9.8 (>= 0abcd)
 Essential:yes
 Section: {$section}
 Description: {$description}.
diff --git a/t/tests/lintian-ftp-rejects/debian/debian/control.in b/t/tests/lintian-ftp-rejects/debian/debian/control.in
index d352d12..1f4bd68 100644
--- a/t/tests/lintian-ftp-rejects/debian/debian/control.in
+++ b/t/tests/lintian-ftp-rejects/debian/debian/control.in
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 7.0.50~)
 
 Package: {$srcpkg}
 Architecture: {$architecture}
-Depends: $\{misc:Depends\}, libssl0.9.8 (>= abcd)
+Depends: $\{misc:Depends\}, libssl0.9.8 (>= 0abcd)
 Essential:yes
 Section: {$section}
 Description: {$description}.
diff --git a/t/tests/lintian-output-colons/debian/debian/control.in b/t/tests/lintian-output-colons/debian/debian/control.in
index f390eab..10055d9 100644
--- a/t/tests/lintian-output-colons/debian/debian/control.in
+++ b/t/tests/lintian-output-colons/debian/debian/control.in
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 7.0.50~)
 
 Package: {$srcpkg}
 Architecture: {$architecture}
-Depends: $\{misc:Depends\}, libssl0.9.8 (>= abcd)
+Depends: $\{misc:Depends\}, libssl0.9.8 (>= 0abcd)
 Essential:yes
 Section: {$section}
 Description: {$description}.
diff --git a/t/tests/lintian-output-letter/debian/debian/control.in b/t/tests/lintian-output-letter/debian/debian/control.in
index f390eab..10055d9 100644
--- a/t/tests/lintian-output-letter/debian/debian/control.in
+++ b/t/tests/lintian-output-letter/debian/debian/control.in
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 7.0.50~)
 
 Package: {$srcpkg}
 Architecture: {$architecture}
-Depends: $\{misc:Depends\}, libssl0.9.8 (>= abcd)
+Depends: $\{misc:Depends\}, libssl0.9.8 (>= 0abcd)
 Essential:yes
 Section: {$section}
 Description: {$description}.
diff --git a/t/tests/lintian-output-xml/debian/debian/control.in b/t/tests/lintian-output-xml/debian/debian/control.in
index f390eab..10055d9 100644
--- a/t/tests/lintian-output-xml/debian/debian/control.in
+++ b/t/tests/lintian-output-xml/debian/debian/control.in
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 7.0.50~)
 
 Package: {$srcpkg}
 Architecture: {$architecture}
-Depends: $\{misc:Depends\}, libssl0.9.8 (>= abcd)
+Depends: $\{misc:Depends\}, libssl0.9.8 (>= 0abcd)
 Essential:yes
 Section: {$section}
 Description: {$description}.

-- 
Debian package checker


Reply to: