* prepare-release:

  - apt-inst version isn't apt versions, so don't override variable

diff --git a/debian/changelog b/debian/changelog
index a118658911c5c55a398cfd7ce96d38180ce11b5a..fc8efb8b2468788d87908c7081b29b88fd118087 100644 (file)
--- 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 821726ae2607a32653324a9b4d9c42345adc5903..477d638c70835fdde577eeb2c639b6448e18c4b7 100755 (executable)
--- 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