Author: guillem
Date: 2006-05-02 08:51:15 +0000 (Tue, 02 May 2006)
New Revision: 260
Modified:
trunk/ChangeLog
trunk/debian/changelog
trunk/man/C/dpkg-source.1
trunk/man/ChangeLog
trunk/scripts/controllib.pl
Log:
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
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-04-29 20:17:40 UTC (rev 259)
+++ trunk/ChangeLog 2006-05-02 08:51:15 UTC (rev 260)
@@ -1,3 +1,10 @@
+2006-05-02 Ken Bloom <[EMAIL PROTECTED]>,
+ Jeroen van Wolffelaar <[EMAIL PROTECTED]>,
+ Guillem Jover <[EMAIL PROTECTED]>
+
+ * scripts/controllib.pl (parsechangelog): Add new source:Version,
+ source:Upstream-Version and binary:Version substvars.
+
2006-04-29 Justin Pryzby <[EMAIL PROTECTED]>
* src/filesdb.c: Fix a typo (unexecpted -> unexpected).
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-04-29 20:17:40 UTC (rev 259)
+++ trunk/debian/changelog 2006-05-02 08:51:15 UTC (rev 260)
@@ -32,6 +32,9 @@
* Fix strings so that they can be more easily translated. Closes: #134358
* Strip the trailing '/dir' from '--dir-file' option parameter to make it
GNU install-info compatible (Clint Adams). Closes: #61640, #67237
+ * 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
-- Christian Perrier <[EMAIL PROTECTED]> Sat, 29 Apr 2006 14:28:55 +0200
Modified: trunk/man/C/dpkg-source.1
===================================================================
--- trunk/man/C/dpkg-source.1 2006-04-29 20:17:40 UTC (rev 259)
+++ trunk/man/C/dpkg-source.1 2006-05-02 08:51:15 UTC (rev 260)
@@ -713,8 +713,20 @@
The current build architecture (from
.BR "dpkg \-\-print\-architecture" ).
.TP
+.B source:Version
+The source package version.
+.TP
+.B source:Upstream\-Version
+The upstream source package version.
+.TP
+.B binary:Version
+The binary package version (which may differ from source:Version in a binNMU
+for example).
+.TP
.B Source\-Version
-The source package version (from the changelog file).
+The source package version (from the changelog file). This variable is now
+\fBdeprecated\fP as its meaning is different from its function, please use
+the \fBsource:Version\fP or \fBbinary:Version\fP as appropriate.
.TP
.B Installed\-Size
The total size of the package's installed files. This value is copied
Modified: trunk/man/ChangeLog
===================================================================
--- trunk/man/ChangeLog 2006-04-29 20:17:40 UTC (rev 259)
+++ trunk/man/ChangeLog 2006-05-02 08:51:15 UTC (rev 260)
@@ -1,3 +1,8 @@
+2006-05-02 Guillem Jover <[EMAIL PROTECTED]>
+
+ * C/dpkg-source.1: Document new source:Version,
+ source:Upstream-Version and binary:Version substvars.
+
2006-04-19 Nicolas Francois <[EMAIL PROTECTED]>
* C/install-info.8: Add a missing quote arround the date.
Modified: trunk/scripts/controllib.pl
===================================================================
--- trunk/scripts/controllib.pl 2006-04-29 20:17:40 UTC (rev 259)
+++ trunk/scripts/controllib.pl 2006-05-02 08:51:15 UTC (rev 260)
@@ -294,7 +294,15 @@
}
&parsecdata('L',0,"parsed version of changelog");
close(CDATA); $? && &subprocerr("parse changelog");
+
+ # XXX: Source-Version is now deprecated, remove in the future.
$substvar{'Source-Version'}= $fi{"L Version"};
+ $substvar{'binary:Version'} = $fi{"L Version"};
+ $substvar{'source:Version'} = $fi{"L Version"};
+ $substvar{'source:Version'} =~ s/\+b[0-9]+$//;
+ $substvar{'source:Upstream-Version'} = $fi{"L Version"};
+ $substvar{'source:Upstream-Version'} =~ s/-[^-]*$//;
+ $substvar{'source:Upstream-Version'} =~ s/^[0-9]+://;
}
sub checkpackagename {
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
