Просмотр исходного кода

Use mustsetvar when setting the value of the sversion variable in
dpkg-buildpackage (Andrew Suffield). Closes: #158953

Guillem Jover лет назад: 20
Родитель
Сommit
9b9ec97f58
3 измененных файлов с 7 добавлено и 1 удалено
  1. 4 0
      ChangeLog
  2. 2 0
      debian/changelog
  3. 1 1
      scripts/dpkg-buildpackage.sh

+ 4 - 0
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

+ 2 - 0
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
 

+ 1 - 1
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}"