From: David Kalnischkies <kalnischkies@gmail.com>
Date: Fri, 11 May 2012 22:40:36 +0000 (+0200)
Subject: * prepare-release:
X-Git-Tag: 0.9.4~3^2~26
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/58921d7d062257d6165d51b44712140daef01ec8?hp=742f57054fe787714c9ab59aa704cdcec25f3b28

* prepare-release:
  - apt-inst version isn't apt versions, so don't override variable
---

diff --git a/debian/changelog b/debian/changelog
index a11865891..fc8efb8b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ apt (0.9.4) UNRELEASED; urgency=low
       as we don't need a symbol for it as it is not in a header
   * Makefile, buildlib/*.mak:
     - reshuffle dependencies so that parallel building seems to work
+  * prepare-release:
+    - apt-inst version isn't apt versions, so don't override variable
 
  -- David Kalnischkies <kalnischkies@gmail.com>  Fri, 11 May 2012 23:26:59 +0200
 
diff --git a/prepare-release b/prepare-release
index 821726ae2..477d638c7 100755
--- a/prepare-release
+++ b/prepare-release
@@ -8,8 +8,8 @@ LIBAPTINSTVERSION="$(egrep '^MAJOR=' apt-inst/makefile |cut -d '=' -f 2)"
 
 if [ "$1" = 'pre-export' ]; then
 	libraryversioncheck() {
-		LIBRARY="$1"
-		VERSION="$2"
+		local LIBRARY="$1"
+		local VERSION="$2"
 		if [ ! -e "debian/${LIBRARY}${VERSION}.symbols" ]; then
 		   echo >&2 "Library ${LIBRARY} in version ${VERSION} has no symbols file! (maybe forgot to rename?)"
 		   exit 1
@@ -49,7 +49,7 @@ elif [ "$1" = 'post-build' ]; then
 elif [ "$1" = 'library' ]; then
 	librarysymbols() {
 		echo "Checking $1 in version $2"
-		tmpfile=$(mktemp)
+		local tmpfile=$(mktemp)
 		dpkg-gensymbols -p${1}${2} -ebuild/bin/${1}.so.${2} -Idebian/${1}${2}.symbols -O/dev/null 2> /dev/null > $tmpfile
 		echo '=== Missing symbols:'
 		grep '^+#MISSING' $tmpfile