Author: guillem
Date: 2006-05-04 03:44:47 +0000 (Thu, 04 May 2006)
New Revision: 269
Modified:
trunk/ChangeLog
trunk/debian/changelog
trunk/scripts/dpkg-gencontrol.pl
Log:
Support binNMU safe packages even when source and binary differ in
version.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-05-03 20:39:36 UTC (rev 268)
+++ trunk/ChangeLog 2006-05-04 03:44:47 UTC (rev 269)
@@ -1,3 +1,9 @@
+2006-05-04 Guillem Jover <[EMAIL PROTECTED]>
+
+ * scripts/dpkg-gencontrol.pl: Use the source:Version substvar when
+ setting the Source field version, in case the binary package
+ has a different one from the source package.
+
2006-05-02 Guillem Jover <[EMAIL PROTECTED]>
* utils/start-stop-daemon.c (do_help): Standarize output format.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-05-03 20:39:36 UTC (rev 268)
+++ trunk/debian/changelog 2006-05-04 03:44:47 UTC (rev 269)
@@ -36,6 +36,8 @@
* Add new substvars source:Version, source:Upstream-Version and
binary:Version so packages will be able to avoid breaking on binNMUs.
Based on a patch by Ken Bloom and Jeroen van Wolffelaar. Closes: #358530
+ * Support binNMU safe packages even when source and binary differ in
+ version.
* Rename dpkg:UpstreamVersion to dpkg:Upstream-Version. Make dpkg:Version
and dpkg:Upstream-Version get the current dpkg versions instead of the
ones from the package being built.
Modified: trunk/scripts/dpkg-gencontrol.pl
===================================================================
--- trunk/scripts/dpkg-gencontrol.pl 2006-05-03 20:39:36 UTC (rev 268)
+++ trunk/scripts/dpkg-gencontrol.pl 2006-05-04 03:44:47 UTC (rev 269)
@@ -212,7 +212,7 @@
$verdiff= $f{'Version'} ne $sourceversion;
if ($oppackage ne $sourcepackage || $verdiff) {
$f{'Source'}= $sourcepackage;
- $f{'Source'}.= " ($sourceversion)" if $verdiff;
+ $f{'Source'}.= " ($substvar{'source:Version'})" if $verdiff;
}
if (!defined($substvar{'Installed-Size'})) {
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
