merge with master, with minor conflict fixes

[ardour.git] / tools / linux_packaging / package

diff --git a/tools/linux_packaging/package b/tools/linux_packaging/package
index 7916199f3f39155cf79aff77b79a17499834e888..5fc6aee1f78e65873159878fb4d3d02a3d30cf14 100755 (executable)
--- a/tools/linux_packaging/package
+++ b/tools/linux_packaging/package
@@ -50,30 +50,20 @@ while [ $# -gt 0 ] ; do
        esac
 done
 
-
-# Figure out the Build Type
-if grep -q "DEBUG = True" ../../build/c4che/default.cache.py; then
-       DEBUG="T"
-else
-       DEBUG="F"
-fi
+. ../define_versions.sh
 
 if [ x$DEBUG = xT ]; then
        BUILDTYPE="dbg"
 fi
 
-release_version=`grep -m 1 '^VERSION' ../../wscript | awk '{print $3}' | sed "s/'//g"`
-svn_version=`grep -m 1 'svn_revision =' ../../libs/ardour/svn_revision.cc | cut -d'"' -f 2`
-
-X86_BUNDLE="${APPNAME}_x86-${release_version}_${svn_version}"
-X86_64_BUNDLE="${APPNAME}_x86_64-${release_version}_${svn_version}"
+X86_BUNDLE="${APPNAME}_x86-${release_version}"
+X86_64_BUNDLE="${APPNAME}_x86_64-${release_version}"
 
 if [ ! -z ${BUILDTYPE} ]; then
        X86_BUNDLE="${X86_BUNDLE}-${BUILDTYPE}"
        X86_64_BUNDLE="${X86_64_BUNDLE}-${BUILDTYPE}"
 fi 
 
-
 if [ ! -e ${X86_BUNDLE}.tar.bz2 ] ; then
        echo ""
        echo "Can't locate x86 bundle file ${X86_BUNDLE}.tar.bz2"
@@ -122,22 +112,22 @@ fi
 if [ -z ${BUILDTYPE} ]; then
        if [ "${SINGLE_ARCH}" = "T" ]; then
                if [ "${X86_BUNDLE_OK}" = "T" ]; then
-                       PACKAGE="${APPNAME}_32bit-${release_version}_${svn_version}"
+                       PACKAGE="${APPNAME}_32bit-${release_version}"
                else
-                       PACKAGE="${APPNAME}_64bit-${release_version}_${svn_version}"
+                       PACKAGE="${APPNAME}_64bit-${release_version}"
                fi
        else
-               PACKAGE="${APPNAME}-${release_version}_${svn_version}"
+               PACKAGE="${APPNAME}-${release_version}"
        fi
 else
        if [ "${SINGLE_ARCH}" = "T" ]; then
                if [ "${X86_BUNDLE_OK}" = "T" ]; then
-                       PACKAGE="${APPNAME}_32bit-${release_version}_${svn_version}-${BUILDTYPE}"
+                       PACKAGE="${APPNAME}_32bit-${release_version}-${BUILDTYPE}"
                else
-                       PACKAGE="${APPNAME}_64bit-${release_version}_${svn_version}-${BUILDTYPE}"
+                       PACKAGE="${APPNAME}_64bit-${release_version}-${BUILDTYPE}"
                fi
        else
-               PACKAGE="${APPNAME}-${release_version}_${svn_version}-${BUILDTYPE}"
+               PACKAGE="${APPNAME}-${release_version}-${BUILDTYPE}"
        fi
 fi