various miscellany related to versions, gtk2 build and packaging

tools/linux_packaging/build

@@ -89,7 +89,7 @@ if test x$STRIP != xall -a x$STRIP != xnone -a x$STRIP != xsome ; then
     exit 1
 fi
 
-. ./define_versions.sh
+. ../define_versions.sh
 
 echo "Version is $version / $commit"
 info_string="$version ($commit) built on `hostname` by `whoami` on `date`"

tools/linux_packaging/define_versions.sh

@@ -1,23 +0,0 @@
-# 
-# this is sourced by build and package, and executed from within build/linux_packaging
-#
-
-release_version=`grep -m 1 '[^A-Za-z_]LINUX_VERSION = ' ../../wscript | awk '{print $3}' | sed "s/'//g"`
-r=`cut -d'"' -f2 < ../../libs/ardour/revision.cc | sed -e 1d -e "s/$release_version-//"`
-if echo $r | grep -q -e - ; then
-    revcount=`echo $r | cut -d- -f1`
-fi
-commit=`echo $r | cut -d- -f2`
-version=${release_version}${revcount:+.$revcount}
-
-#
-# Figure out the Build Type
-#
-# Note that the name of the cache file may vary from to time
-#
-
-if grep -q "DEBUG = True" ../../build/c4che/_cache.py; then
-	DEBUG="T"
-else
-	DEBUG="F"
-fi

tools/linux_packaging/package

@@ -50,7 +50,7 @@ while [ $# -gt 0 ] ; do
 	esac
 done
 
-. ./define_versions.sh
+. ../define_versions.sh
 
 if [ x$DEBUG = xT ]; then
 	BUILDTYPE="dbg"