X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=id-deb-build%2Fmkdist.sh;h=1506220c7f4351bca04a5d914199820dcd989036;hb=f23a522439343470ed9e0df49d4d1efe222b3e44;hp=52ef1e9a318e4f1aaaabeaca635f5aa05bbbea0f;hpb=a7424f016275425f9a4fc82b7aac2e77daf13a1a;p=git-tools-moved-to-github.git diff --git a/id-deb-build/mkdist.sh b/id-deb-build/mkdist.sh index 52ef1e9..1506220 100755 --- 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