ab-debian 0.20170311.01-0ab1, upstream v1.5.0-573-g0fba967b

[netdata.git] / contrib / debian / build-new-package.sh

diff --git a/contrib/debian/build-new-package.sh b/contrib/debian/build-new-package.sh
index c2745e8d7519e1d545eea9df01a3382b81473ed4..0218bf7bda37ebf78e9b8c6d282285f4bb87a563 100755 (executable)
--- a/contrib/debian/build-new-package.sh
+++ b/contrib/debian/build-new-package.sh
@@ -9,10 +9,26 @@ branch=$(git rev-parse --abbrev-ref HEAD)
 
 git checkout master
 
+old_descr=$(git describe)
+
 git fetch --all --tags
 git pull --ff-only origin master
 
+descr=$(git describe)
+
+COMMIT_ID=$(git rev-parse HEAD)
+export COMMIT_ID
+
 git checkout "$branch"
+
+if [ "$old_descr" = "$descr" ]; then
+       if ! head -n 1 debian/changelog | fgrep " UNRELEASED;" >/dev/null; then
+               set +x
+               echo; echo "Nothing to do."; echo
+               exit 0
+       fi
+fi
+
 git merge master
 
 date=$(date +%Y%m%d)
@@ -36,11 +52,11 @@ fi
 
 version="0.$date.$rev-$suffix"
 
-dch -v "$version" "Pulled upstream Git version $(git describe)"
+dch -v "$version" "Pulled upstream Git version $descr"
 dch -r ""
 
 git add contrib/debian/changelog
-git commit -m "${branch} ${version}"
+git commit -m "${branch} ${version}, upstream $descr"
 git tag "${branch}_${version}"
 
 dpkg-buildpackage -rfakeroot -b