[X2Go-Commits] [buildscripts] 01/01: bin/sbuild-deb-package: really split up the upstream version at the *last* hyphen, since this character is illegal in a Debian revision and hence must belong to upstream version if encountered mid-string.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository buildscripts.

commit 6253e87e4be6dfb2e83b9b93904f6b120f544860
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Jun 30 22:51:29 2018 +0200

    bin/sbuild-deb-package: really split up the upstream version at the *last* hyphen, since this character is illegal in a Debian revision and hence must belong to upstream version if encountered mid-string.
---
 bin/sbuild-deb-package | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package
index 1a10778..d2c430b 100755
--- a/bin/sbuild-deb-package
+++ b/bin/sbuild-deb-package
@@ -331,7 +331,8 @@ build_packages() {
 				SA_OPTION=""
 				test -f "debian/source/format" && grep -Eqs '^3.0.*\(quilt\)$' "debian/source/format" && {
 					git fetch origin upstream:upstream
-					UPSTREAM_VERSION="$(dpkg-parsechangelog | grep "Version:" | cut -d " " -f2 | sed -e 's/-.*//' -e 's/^.*://')"
+					#                                                                                    v remove epoch  v remove debian revision
+					UPSTREAM_VERSION="$(dpkg-parsechangelog | grep "Version:" | cut -d " " -f2 | sed -e 's/^.*://' -e 's/-[^-]*$//')"
 					REVISION="$(dpkg-parsechangelog | grep "Version:" | cut -d " " -f2 | sed -e 's/.*-//')"
 					git archive --prefix="${PROJECT}-${UPSTREAM_VERSION}/" -o "../${PROJECT}_${UPSTREAM_VERSION}.orig.tar.gz" "upstream/${UPSTREAM_VERSION}" && {
 						SA_OPTION="--debbuildopts=-sa"

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/buildscripts.git