[SCM] Debian package checker branch, master, updated. 2.1.2-14-gacd7417

["Jordà Polo" <jorda@ettin.org>]

The following commit has been merged in the master branch:
commit c257fad259c1f89d336337d9c292748019ba7be9
Author: Jordà Polo <jorda@ettin.org>
Date:   Tue Dec 16 17:35:35 2008 +0100

    Add source version to binary and udeb info files
    
    * lib/Read_pkglists.pm:
      + [JP] Add a new "source version" field to binary and udeb info files.
        Bump binary and udeb format version to 3 and 2 respectively.
    * unpack/list-{bin,udeb}pkg:
      + [JP] Extract source package version from source field.

diff --git a/debian/changelog b/debian/changelog
index 1af715b..fb98e5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -59,6 +59,10 @@ lintian (2.1.3) UNRELEASED; urgency=low
   * lib/Lintian/Data.pm:
     + [RA] New all() method that returns all valid keywords.
 
+  * lib/Read_pkglists.pm:
+    + [JP] Add a new "source version" field to binary and udeb info files.
+      Bump binary and udeb format version to 3 and 2 respectively.
+
   * reporting/templates/maintainer.tmpl:
     + [ADB] Print tags affecting udeb packages under a heading for that
       package, rather than merging them in to whichever binary package
@@ -68,6 +72,9 @@ lintian (2.1.3) UNRELEASED; urgency=low
       package with the same name when the binary is the first package produced
       from the source for which there are issues.
 
+  * unpack/list-{bin,udeb}pkg:
+    + [JP] Extract source package version from source field.
+
  -- Adam D. Barratt <adam@adam-barratt.org.uk>  Sun, 14 Dec 2008 17:20:38 +0000
 
 lintian (2.1.2) unstable; urgency=low
diff --git a/lib/Read_pkglists.pm b/lib/Read_pkglists.pm
index f0f982f..81c3589 100644
--- a/lib/Read_pkglists.pm
+++ b/lib/Read_pkglists.pm
@@ -28,9 +28,9 @@ use vars qw($BINLIST_FORMAT $SRCLIST_FORMAT $UDEBLIST_FORMAT %source_info %binar
 
 # these banner lines have to be changed with every incompatible change of the
 # binary and source list file formats
-$BINLIST_FORMAT = "Lintian's list of binary packages in the archive--V2";
+$BINLIST_FORMAT = "Lintian's list of binary packages in the archive--V3";
 $SRCLIST_FORMAT = "Lintian's list of source packages in the archive--V3";
-$UDEBLIST_FORMAT = "Lintian's list of udeb packages in the archive--V1";
+$UDEBLIST_FORMAT = "Lintian's list of udeb packages in the archive--V2";
 
 %source_info = ();
 %binary_info = ();
@@ -115,7 +115,7 @@ sub read_bin_list {
     chop;
 
     next if /^\s*$/o;
-    my ($bin,$ver,$source,$file,$timestamp) = split(/\;/o,$_);
+    my ($bin,$ver,$source,$source_ver,$file,$timestamp) = split(/\;/o,$_);
 
     my $bin_struct;
     %$bin_struct =
@@ -123,6 +123,7 @@ sub read_bin_list {
        'package' => $bin,
        'version' => $ver,
        'source' => $source,
+       'source-version' => $source_ver,
        'file' => $file,
        'timestamp' => $timestamp,
        );
@@ -161,7 +162,7 @@ sub read_udeb_list {
     chop;
 
     next if /^\s*$/o;
-    my ($udeb,$ver,$source,$file,$timestamp) = split(/\;/o,$_);
+    my ($udeb,$ver,$source,$source_ver,$file,$timestamp) = split(/\;/o,$_);
 
     my $udeb_struct;
     %$udeb_struct =
@@ -169,6 +170,7 @@ sub read_udeb_list {
        'package' => $udeb,
        'version' => $ver,
        'source' => $source,
+       'source-version' => $source_ver,
        'file' => $file,
        'timestamp' => $timestamp,
        );
diff --git a/unpack/list-binpkg b/unpack/list-binpkg
index 37e6447..7f519b6 100755
--- a/unpack/list-binpkg
+++ b/unpack/list-binpkg
@@ -155,11 +155,18 @@ while (!eof(IN)) {
 	next;
     }
 
+    my $source_version = $data->{'version'};
+    if ($data->{'source'} =~ /^([-+\.\w]+)\s+\((.+)\)$/) {
+	$data->{'source'} = $1;
+	$source_version = $2;
+    }
+
     # write entry to output file
     print OUT join(';',
 		   $pkg,
 		   $data->{'version'},
 		   $data->{'source'},
+		   $source_version,
 		   $deb_file,
 		   $timestamp,
 		   ),"\n";
diff --git a/unpack/list-udebpkg b/unpack/list-udebpkg
index c8c8659..e183271 100755
--- a/unpack/list-udebpkg
+++ b/unpack/list-udebpkg
@@ -156,11 +156,18 @@ while (!eof(IN)) {
 	next;
     }
 
+    my $source_version = $data->{'version'};
+    if ($data->{'source'} =~ /^([-+\.\w]+)\s+\((.+)\)$/) {
+	$data->{'source'} = $1;
+	$source_version = $2;
+    }
+
     # write entry to output file
     print OUT join(';',
 		   $pkg,
 		   $data->{'version'},
 		   $data->{'source'},
+		   $source_version,
 		   $deb_file,
 		   $timestamp,
 		   ),"\n";

-- 
Debian package checker