* modified build script to find out the version the way we do it now.

[citadel.git] / citadel / buildpackages

diff --git a/citadel/buildpackages b/citadel/buildpackages
index 5d74274de0b500efcdadd66acf158b2bd8ebfa85..7a9ac9b972a879b740747e710cbf9277be2c651f 100755 (executable)
--- a/citadel/buildpackages
+++ b/citadel/buildpackages
@@ -1,6 +1,7 @@
 #!/bin/bash
+# find out the package version from conf
+export `grep PACKAGE_VERSION= configure |sed -e "s;';;g" -e "s;PACKAGE;CITADEL;"`
 
-CITADEL_VERSION=`grep '#define CITADEL.*Citadel' citadel.h |sed -e 's;";;g' -e "s;.* ;;"`
 PACKAGE_VERSION=`cat packageversion`
 DATE=`date '+%a, %d %b %Y %H:%I:00 %z'`
 ACTUAL_DIR=`pwd`
@@ -40,7 +41,7 @@ case $1 in
                        -e "s;@CITADEL_VERSION@;${CITADEL_VERSION};" \
                        -e "s;@PACKAGE_VERSION@;${PACKAGE_VERSION};" \
                        > debian/files
-               if grep -q "$CITADEL_VERSION" debian/changelog; then
+               if grep -q "($CITADEL_VERSION" debian/changelog; then
                        echo rebuilding package.
                else
                        echo "citadel (${CITADEL_VERSION}-${PACKAGE_VERSION}) unstable; urgency=low