Author: guillem
Date: 2006-05-02 09:13:49 +0000 (Tue, 02 May 2006)
New Revision: 261
Modified:
trunk/ChangeLog
trunk/debian/changelog
trunk/man/C/dpkg-source.1
trunk/man/ChangeLog
trunk/scripts/dpkg-genchanges.pl
trunk/scripts/dpkg-gencontrol.pl
Log:
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/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-05-02 08:51:15 UTC (rev 260)
+++ trunk/ChangeLog 2006-05-02 09:13:49 UTC (rev 261)
@@ -1,3 +1,10 @@
+2006-05-02 Guillem Jover <[EMAIL PROTECTED]>
+
+ * scripts/dpkg-genchanges.pl: Rename dpkg:UpstreamVersion to
+ dpkg:Upstream-Version. Make dpkg:Version and dpkg:Upstream-Version
+ get the current dpkg versions instead of the package being built.
+ * scripts/dpkg-gencontrol.pl: Likewise.
+
2006-05-02 Ken Bloom <[EMAIL PROTECTED]>,
Jeroen van Wolffelaar <[EMAIL PROTECTED]>,
Guillem Jover <[EMAIL PROTECTED]>
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-05-02 08:51:15 UTC (rev 260)
+++ trunk/debian/changelog 2006-05-02 09:13:49 UTC (rev 261)
@@ -35,6 +35,9 @@
* 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
+ * 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.
-- 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-05-02 08:51:15 UTC (rev 260)
+++ trunk/man/C/dpkg-source.1 2006-05-02 09:13:49 UTC (rev 261)
@@ -771,7 +771,7 @@
.B dpkg\-shlibdeps
- see above.
.TP
-.B dpkg:UpstreamVersion
+.B dpkg:Upstream\-Version
The upstream version of dpkg.
.TP
.B dpkg:Version
Modified: trunk/man/ChangeLog
===================================================================
--- trunk/man/ChangeLog 2006-05-02 08:51:15 UTC (rev 260)
+++ trunk/man/ChangeLog 2006-05-02 09:13:49 UTC (rev 261)
@@ -1,5 +1,10 @@
2006-05-02 Guillem Jover <[EMAIL PROTECTED]>
+ * C/dpkg-source.1: Rename dpkg:UpstreamVersion to
+ dpkg:Upstream-Version.
+
+2006-05-02 Guillem Jover <[EMAIL PROTECTED]>
+
* C/dpkg-source.1: Document new source:Version,
source:Upstream-Version and binary:Version substvars.
Modified: trunk/scripts/dpkg-genchanges.pl
===================================================================
--- trunk/scripts/dpkg-genchanges.pl 2006-05-02 08:51:15 UTC (rev 260)
+++ trunk/scripts/dpkg-genchanges.pl 2006-05-02 09:13:49 UTC (rev 261)
@@ -259,10 +259,9 @@
# Extract version and origversion so we can add them to our fixed list
# of substvars
-$version= $f{'Version'};
-$origversion= $version; $origversion =~ s/-[^-]+$//;
-$substvar{"dpkg:UpstreamVersion"}=$origversion;
-$substvar{"dpkg:Version"}=$version;
+$substvar{"dpkg:Version"} = $version;
+$substvar{"dpkg:Upstream-Version"} = $version;
+$substvar{"dpkg:Upstream-Version"} =~ s/-[^-]+$//;
if (!$binaryonly) {
$sec= $sourcedefault{'Section'};
Modified: trunk/scripts/dpkg-gencontrol.pl
===================================================================
--- trunk/scripts/dpkg-gencontrol.pl 2006-05-02 08:51:15 UTC (rev 260)
+++ trunk/scripts/dpkg-gencontrol.pl 2006-05-02 09:13:49 UTC (rev 261)
@@ -169,11 +169,11 @@
}
$f{'Version'}= $forceversion if length($forceversion);
-$version= $f{'Version'};
-$origversion= $version; $origversion =~ s/-[^-]+$//;
-$substvar{"dpkg:UpstreamVersion"}=$origversion;
-$substvar{"dpkg:Version"}=$version;
+$substvar{"dpkg:Version"} = $version;
+$substvar{"dpkg:Upstream-Version"} = $version;
+$substvar{"dpkg:Upstream-Version"} =~ s/-[^-]+$//;
+
for $_ (keys %fi) {
$v= $fi{$_};
if (s/^C //) {
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
