From: Mike Taylor <mike@indexdata.com>
Date: Fri, 13 Apr 2012 11:38:39 +0000 (+0100)
Subject: Don't emit pointless Debian-related error-message when building a dist
X-Git-Url: http://jira.indexdata.com/?a=commitdiff_plain;h=fe8b905bfc510ae288fb259261b798cef9c882f1;p=git-tools-moved-to-github.git

Don't emit pointless Debian-related error-message when building a dist
tarball for a RedHat build of a package that we don't build for
Debian.
---

diff --git a/id-deb-build/mkdist.sh b/id-deb-build/mkdist.sh
index 925d249..1dec8ea 100755
--- a/id-deb-build/mkdist.sh
+++ b/id-deb-build/mkdist.sh
@@ -11,13 +11,12 @@ fi
 
 #we will keep this to get the project name
 DEBCHANGELOG=debian/changelog
-l=`head -1 $DEBCHANGELOG`
 
 if [ "x$NAME" != x ]; then
   echo "Got name $NAME from IDMETA file"
 else
-  NAME=`echo $l|sed 's/ .*//g'`
-  echo "Warning: assuming name $NAME from debian/changelog"
+  NAME=`head -1 $DEBCHANGELOG|sed 's/ .*//g'`
+  echo "Warning: assuming name $NAME from $DEBCHANGELOG"
 fi
 
 if [ "x$2" != x ]; then
@@ -28,9 +27,9 @@ fi
 if [ "x$VERSION" != x ]; then
   echo "Got version $VERSION from IDMETA file"
 else
-  FULLVERSION=`echo $l|sed 's/.*(//g'|sed 's/).*//g'`
+  FULLVERSION=`head -1 $DEBCHANGELOG|sed 's/.*(//g'|sed 's/).*//g'`
   VERSION=`echo $FULLVERSION|sed 's/-.*//g'`
-  echo "Warning: assuming version $VERSION from debian/changelog"
+  echo "Warning: assuming version $VERSION from $DEBCHANGELOG"
 fi
 
 if [ "x$1" != x ]; then