Update AUTHORS and CONTRIBUTORS for PR#232

[platform/upstream/glog.git] / packages / deb.sh

diff --git a/packages/deb.sh b/packages/deb.sh
index ced98fa..a1cdf32 100755 (executable)
--- a/packages/deb.sh
+++ b/packages/deb.sh
@@ -12,6 +12,7 @@ LIB=
 #LIB=lib
 
 PACKAGE="$1"
+VERSION="$2"
 
 # We can only build Debian packages, if the Debian build tools are installed
 if [ \! -x /usr/bin/debuild ]; then
@@ -30,7 +31,7 @@ fi
 topdir="${PWD%/*}"
 
 # Find the tar archive built by "make dist"
-archive="$(basename "$(ls -1 ${topdir}/$PACKAGE*.tar.gz | tail -n 1)" .tar.gz)"
+archive="$PACKAGE-$VERSION"
 if [ -z "${archive}" ]; then
   echo "Cannot find ../$PACKAGE*.tar.gz. Run \"make dist\" first." 1>&2
   exit 0
@@ -43,16 +44,18 @@ rm -rf tmp
 mkdir -p tmp
 cd tmp
 
+package="google-glog_$VERSION"
+
 # Debian has very specific requirements about the naming of build
 # directories, and tar archives. It also wants to write all generated
 # packages to the parent of the source directory. We accommodate these
 # requirements by building directly from the tar file.
-ln -s "${topdir}/${archive}.tar.gz" "${LIB}${archive}.orig.tar.gz"
-tar zfx "${LIB}${archive}.orig.tar.gz"
-[ -n "${LIB}" ] && mv "${archive}" "${LIB}${archive}"
-cd "${LIB}${archive}"
+ln -s "${topdir}/${archive}.tar.gz" "${LIB}${package}.orig.tar.gz"
+tar zfx "${LIB}${package}.orig.tar.gz"
+mv "${archive}" "${LIB}${package}"
+cd "${LIB}${package}"
 # This is one of those 'specific requirements': where the deb control files live
-ln -s "packages/deb" "debian"
+cp -a "packages/deb" "debian"
 
 # Now, we can call Debian's standard build tool
 debuild -uc -us