[SCM] pkg-kde-jenkins packaging branch, master, updated. 819a4e2608dab41a072f09e953292b59196bd946

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/pkg-kde-jenkins.git;a=commitdiff;h=1f96997

The following commit has been merged in the master branch:
commit 1f969973f6103073d044bd3edda3f9601af1e302
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri May 6 14:04:45 2016 +0200

    prepare_build, check upstream using uscan: Update variables accordingly
---
 scripts/prepare_build.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh
index 6e733fe..cecd4be 100755
--- a/scripts/prepare_build.sh
+++ b/scripts/prepare_build.sh
@@ -255,14 +255,17 @@ if [ -n "$NEW_UPSTREAM_RELEASE" ] && \
     ! git show-ref --verify --quiet "refs/tags/$NEW_UPSTREAM_TAG"; then
     gbp import-orig "${IMPORT_ORIG_ARGS[@]}" --uscan
     # Check if the upstream release includes any change at all
-    if ! git diff --quiet refs/tags/$UPSTREAM_TAG refs/tags/$NEW_UPSTREAM_TAG;
+    if ! git diff --quiet "refs/tags/$UPSTREAM_TAG" "refs/tags/$NEW_UPSTREAM_TAG";
     then
+        UPSTREAM_TAG="$NEW_UPSTREAM_TAG"
         NEW_VERSION="$NEW_UPSTREAM_RELEASE-1"
         if [ "${VERSION%%:*}" != "$VERSION" ]; then
             NEW_VERSION="${VERSION%%:*}:$NEW_VERSION"
         fi
         # TODO: This also needs to take into account dsfg versions
         DCH_ARGS+=("--new-version=$NEW_VERSION")
+    else
+        NEW_UPSTREAM_RELEASE=
     fi
 fi
 # Push new upstream tags, if any

-- 
pkg-kde-jenkins packaging