From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Fri, 3 May 2013 07:36:02 +0000 (+0200)
Subject: try release versioning whenever PDNS_TAG is set explicitly
X-Git-Tag: auth-3.3-rc1~134
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=664ce6b4b09adf0a1fa1053e0c7883d789def805;p=thirdparty%2Fpdns.git

try release versioning whenever PDNS_TAG is set explicitly
---

diff --git a/build-scripts/make-jenkins-version b/build-scripts/make-jenkins-version
index d55ae906e7..f632bd1060 100755
--- a/build-scripts/make-jenkins-version
+++ b/build-scripts/make-jenkins-version
@@ -25,7 +25,7 @@ then
 	source_version=git-${source_dbg}
 	deb_version=0.0.${deb_dbg}
 	rpm_version=0.0.${rpm_dbg}
-elif [[ $GIT_BRANCH = rel/* ]]
+elif [[ $GIT_BRANCH = rel/* ]] || [ $PDNS_TAG != HEAD ]
 then
 	# on release branch
 	product_version=${GIT_BRANCH#rel/}