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

[SCM] Debian package checker branch, master, updated. 9ff4c690cbb8dc4fe278a9ca580b5be042063530



The following commit has been merged in the master branch:
commit 4e5fc323f216995633be6abb682e8ea13751bfa6
Author: Russ Allbery <rra@debian.org>
Date:   Sun Jul 13 17:12:40 2008 -0700

    Do not warn on Ubuntu security update versions
    
    * checks/fields:
      + [RA] Recognize and do not warn about Ubuntu security update version
        numbers for multiple releases.  (Closes: #489222)

diff --git a/checks/fields b/checks/fields
index ca19905..dc72f16 100644
--- a/checks/fields
+++ b/checks/fields
@@ -164,12 +164,19 @@ if (not open (FH, '<', "fields/version")) {
 		}
 		if (defined $debian) {
 			tag "debian-revision-should-not-be-zero", "$version"
-				if $debian eq '0';
-			$debian =~ /^-([^.]+)?(?:\.[^.]+)?(?:\.[^.]+)?(\..*)?$/;
-			if (not defined $1 or defined $2) {
+				if $debian eq '-0';
+			my $ubuntu;
+			$debian =~ /^-([^.]+)(?:\.[^.]+)?(?:\.[^.]+)?(\..*)?$/;
+			my $extra = $2;
+			if (defined $extra) {
+				$debian =~ /^-([^.]+ubuntu[^.]+)(?:\.\d+){1,3}(\..*)?$/;
+				$ubuntu = 1;
+				$extra = $2;
+			}
+			if (not defined $1 or defined $extra) {
 				tag "debian-revision-not-well-formed", "$version";
 			}
-			if ($debian =~ /^-[^.-]+\.[^.-]+\./) {
+			if ($debian =~ /^-[^.-]+\.[^.-]+\./ and not $ubuntu) {
 				tag "binary-nmu-uses-old-version-style", "$version"
 					if $type eq 'binary';
 				tag "binary-nmu-debian-revision-in-source", "$version"
diff --git a/debian/changelog b/debian/changelog
index d3fd1a5..a2819e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,8 @@ lintian (1.24.2) unstable; urgency=low
       though.  Patch by Adam D. Barratt.  (Closes: #486145)
     + [ADB] Update and add some Policy and DevRef references and fix some
       typoes.  Thanks Jordà Polo.
+    + [RA] Recognize and do not warn about Ubuntu security update version
+      numbers for multiple releases.  (Closes: #489222)
   * checks/files{,.desc}:
     + [ADB] Warn if the package contains embedded copies of separately
       packaged Javascript libraries.  Patch by Chris Lamb.  (Closes: #489191)
diff --git a/testset/scripts/debian/changelog b/testset/scripts/debian/changelog
index 4ce12fa..cbdb6d1 100644
--- a/testset/scripts/debian/changelog
+++ b/testset/scripts/debian/changelog
@@ -1,7 +1,9 @@
-scripts (6ds-1) unstable; urgency=low
+scripts (6ds-1ubuntu0.5.10.1) unstable; urgency=low
 
   * I'm also not able to write my name.
   * Added a script in /etc/Xsession.d
+  * Bizarre version number courtesy of
+    https://wiki.ubuntu.com/SecurityUpdateProcedures#Prepare
 
  -- Mark 'HE' Brokschmitt <he@debian.org>  Thu, 23 Jun 2005 14:32:39 +0200
 
diff --git a/testset/tags.scripts b/testset/tags.scripts
index 99e9c7b..ae381e3 100644
--- a/testset/tags.scripts
+++ b/testset/tags.scripts
@@ -17,18 +17,17 @@ E: scripts: shell-script-fails-syntax-check ./usr/bin/sh-broken
 E: scripts: suid-perl-script-but-no-perl-suid-dep ./usr/bin/suidperlfoo2
 E: scripts: wrong-path-for-interpreter #!/bin/ruby1.8 != /usr/bin/ruby1.8 (./usr/bin/rubyfoo)
 E: scripts: wrong-path-for-interpreter #!/usr/local/bin/lefty != /usr/bin/lefty (./usr/bin/lefty-foo)
+E: scripts_6ds-1ubuntu0.5.10.1_i386.changes: bad-ubuntu-distribution-in-changes-file unstable
 I: scripts source: debian-watch-file-should-dversionmangle-not-uversionmangle
 I: scripts: init.d-script-missing-lsb-short-description /etc/init.d/lsb-other
 I: scripts: no-md5sums-control-file
 W: scripts source: ancient-standards-version 3.2.1 (current is 3.8.0)
 W: scripts source: binary-arch-rules-but-pkg-is-arch-indep
-W: scripts source: changelog-should-mention-nmu
 W: scripts source: debian-watch-file-uses-deprecated-sf-redirector-method
 W: scripts source: dpatch-missing-description 02_i_dont_have_a_description.patch
 W: scripts source: maintainer-script-lacks-debhelper-token debian/postinst
 W: scripts source: maintainer-script-lacks-debhelper-token debian/postrm
 W: scripts source: package-uses-deprecated-debhelper-compat-version 1
-W: scripts source: source-nmu-has-incorrect-version-number 6ds-1
 W: scripts source: uses-dh-python-with-no-pycompat
 W: scripts: binary-without-manpage usr/bin/envfoo
 W: scripts: binary-without-manpage usr/bin/guile-bizarre

-- 
Debian package checker


Reply to: