Don't create new release when no changes were made

diff --git a/contrib/debian/build-new-package.sh b/contrib/debian/build-new-package.sh
index 67d63e5b7af1214ede1be697485c638bcdaf6d13..6e3c1f60910f93c9e31861c3b93497495f3b7d42 100755 (executable)
--- a/contrib/debian/build-new-package.sh
+++ b/contrib/debian/build-new-package.sh
@@ -9,12 +9,23 @@ 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)
 
 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)

diff --git a/contrib/debian/changelog b/contrib/debian/changelog
index 4cb42fa95f454c07620d1ff5ae8f9fc25047f211..c38ac3531d6493f7099dfeaefdabdd2950be8071 100644 (file)
--- a/contrib/debian/changelog
+++ b/contrib/debian/changelog
@@ -1,3 +1,12 @@
+netdata (0.20170201.01-0ab2) UNRELEASED; urgency=medium
+
+  * contrib/debian/build-new-package.sh
+     - Correctly get upstream Git commit description.
+     - Enhance own Git log message, add upstream commit description.
+     - Don't create new release when no changes were made.
+
+ -- Alexander Barton <alex@barton.de>  Wed, 01 Feb 2017 23:18:29 +0100
+
 netdata (0.20170201.01-0ab1) unstable; urgency=medium
 
   * Initial release.