Merge branch 'master' of ssh://hummus/home/git/pub/git-tools

[git-tools-moved-to-github.git] / id-deb-build / mkdist.sh

diff --git a/id-deb-build/mkdist.sh b/id-deb-build/mkdist.sh
index 52ef1e9..1506220 100755 (executable)
--- a/id-deb-build/mkdist.sh
+++ b/id-deb-build/mkdist.sh
@@ -15,15 +15,14 @@ else
 fi
 
 #we will keep this to get the project name
-DEBCHANGELOG=debian/changelog
 
 if [ "x$NAME" != x ]; then
   echo "Got name $NAME from IDMETA file"
-elif test -f $DEBCHANGELOG; then
-  NAME=`head -1 $DEBCHANGELOG|sed 's/ .*//g'`
-  echo "Warning: assuming name $NAME from $DEBCHANGELOG"
+elif test -f debian/control; then
+  NAME=`awk '/Source:/ {print $2}' debian/control`
+  echo "Warning: assuming name $NAME from debian/control"
 else
-  die "No $DEBCHANGELOG and no NAME in IDMETA"
+  die "No debian/control and no NAME in IDMETA"
 fi
 
 if [ "x$2" != x ]; then
@@ -34,9 +33,8 @@ fi
 if [ "x$VERSION" != x ]; then
   echo "Got version $VERSION from IDMETA file"
 else
-  FULLVERSION=`head -1 $DEBCHANGELOG|sed 's/.*(//g'|sed 's/).*//g'`
-  VERSION=`echo $FULLVERSION|sed 's/-.*//g'`
-  echo "Warning: assuming version $VERSION from $DEBCHANGELOG"
+  echo "No VERSION in IDMETA"
+  exit 1
 fi
 
 if [ "x$1" != x ]; then