Use mustsetvar when setting the value of the sversion variable in

dpkg-buildpackage (Andrew Suffield). Closes: #158953

diff --git a/ChangeLog b/ChangeLog
index 43bff382ce449a16db04a02cb486ca3a4fe7f441..ef732d44f584179cec6ad4304661d4147fbfbc72 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-04  Andrew Suffield  <asuffield@debian.org>
+
+       * dpkg-buildpackage.sh: Use mustsetvar to set sversion variable.
+
 2006-04-04  Jared Spiegel  <jrrs@frontiernet.net>
 
        * utils/start-stop-daemon.c (do_help): Add '-r' option to the help

diff --git a/debian/changelog b/debian/changelog
index a93cdbf76fbfb4e8800439be6bddae6d035bc03c..05e2733431e9d123a4af9429e5aba611387faf68 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ dpkg (1.13.18~) UNRELEASED; urgency=low
     start-stop-daemon. Closes: #318771, #333066
   * Add '-r' to the help output of start-stop-daemon (Jared Spiegel).
     Closes: #354869
+  * Use mustsetvar when setting the value of the sversion variable in
+    dpkg-buildpackage (Andrew Suffield). Closes: #158953
 
  -- Christian Perrier <bubulle@debian.org>  Tue, 21 Mar 2006 20:46:24 +0100
 

diff --git a/scripts/dpkg-buildpackage.sh b/scripts/dpkg-buildpackage.sh
index b2602af1e58d41f38e2ac91b9353bba14d549e88..97753c2d5cdbb03f1a67af4caabda512ff9391dc 100755 (executable)
--- a/scripts/dpkg-buildpackage.sh
+++ b/scripts/dpkg-buildpackage.sh
@@ -153,7 +153,7 @@ if [ x$sourceonly = x ]; then
 else
        arch=source
 fi
-sversion=`echo "$version" | perl -pe 's/^\d+://'`
+mustsetvar sversion "`echo \"$version\" | perl -pe 's/^\d+://'`" "source version without epoch"
 pv="${package}_${sversion}"
 pva="${package}_${sversion}_${arch}"