The following commit has been merged in the master branch:
commit 30e6d305a32cba540efa80dbdb8838a21333e0ed
Author: Modestas Vainius <[email protected]>
Date: Sat Jan 23 18:27:21 2010 +0200
dpkg-gensymbols: add source version to the diff label.
Source version is also useful to have in the output. Also format the string
according to dpkg-name rules.
diff --git a/debian/changelog b/debian/changelog
index f2bb80c..b97c4fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -87,6 +87,8 @@ dpkg (1.15.6) UNRELEASED; urgency=low
dpkg-gensymbols is now able to detect NEW/MISSING symbols when patterns are
present in the symbol file (Closes: #541464). Please note, however, that
there is no way to detect symbol changes in the pattern match sets.
+ * Add source version to the dpkg-gensymbols diff label, reformat it according
+ to the rules of dpkg-name.
[ Jonathan Nieder ]
* Fix a file handle leak in “dpkg-deb --info”. Thanks to Raphael Geissert
diff --git a/scripts/dpkg-gensymbols.pl b/scripts/dpkg-gensymbols.pl
index 48eacdc..a2cc8c4 100755
--- a/scripts/dpkg-gensymbols.pl
+++ b/scripts/dpkg-gensymbols.pl
@@ -280,9 +280,9 @@ if ($compare) {
$output);
}
my ($a, $b) = ($before->filename, $after->filename);
- my $diff_label = sprintf("%s (%s %s)",
+ my $diff_label = sprintf("%s (%s_%s_%s)",
($ref_symfile->{file}) ? $ref_symfile->{file} : "new_symbol_file",
- $oppackage, $host_arch);
+ $oppackage, $sourceversion, $host_arch);
system("diff", "-u", "-L", $diff_label, $a, $b) if -x "/usr/bin/diff";
}
}
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
