[DRE-commits] [ruby-rspec] 03/03: debian/rules report: work around new uscan output; properly report upstream version number

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-rspec.

commit d486ea8e2991e02d9c1e1fa86868f7d0a1af9dc3
Author: Cédric Boutillier <boutil at debian.org>
Date:   Mon Oct 3 00:35:11 2016 +0200

    debian/rules report: work around new uscan output; properly report upstream version number
---
 debian/rules | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/rules b/debian/rules
index 5d0d63f..b77c2e1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,16 +37,17 @@ test:
 report:
 	@dh_testdir
 	@set -e && \
-	(echo rspec $(RSPEC_VERSION); echo rspec-core $(RSPEC_CORE_VERSION); echo rspec-expectations $(RSPEC_EXPECTATIONS_VERSION); echo rspec-mocks $(RSPEC_MOCKS_VERSION); echo rspec-support $(RSPEC_SUPPORT_VERSION)) | { while read gem version; do \
-		new_version=$$(uscan --verbose --report --watch debian/$$gem.watch --upstream-version $$version | sed -n -e 's/Newest version .* on remote site is \([^,]*\), .*$$/\1/p'); \
+	(echo rspec . $(RSPEC_VERSION); echo rspec-core c $(RSPEC_CORE_VERSION); echo rspec-expectations e $(RSPEC_EXPECTATIONS_VERSION); echo rspec-mocks m $(RSPEC_MOCKS_VERSION); echo rspec-support s $(RSPEC_SUPPORT_VERSION)) | { while read gem letter version; do \
+		new_version=$$(uscan --verbose --report --watch debian/$$gem.watch --upstream-version $$version | sed -n -e 's/uscan: Newest version .* on remote site is \([^,]*\), .*$$/\1/p'); \
+		[ "$$new_version" ] || new_version=$$version; \
 		if [ "$$new_major_minor" ]; then \
 			[ "$$new_major_minor" = "$${new_version%.*}" ] || { echo 'Major/minor version mismatch between gems!' >&2; exit 1; }; \
 		fi; \
 		new_major_minor="$${new_version%.*}"; \
 		new_patchlevel="$${new_version##*.}"; \
-		new_patchlevels="$${new_patchlevels:+$$new_patchlevels+}$$new_patchlevel"; \
+		new_patchlevels="$$new_patchlevels$$letter$$new_patchlevel"; \
 	done; \
-	new_upstream_version="$$new_major_minor.$$new_patchlevels"; \
+	new_upstream_version="$$new_major_minor$$new_patchlevels"; \
 	echo "Newest version on remote site is $$new_upstream_version, local version is $(UPSTREAM_VERSION)"; \
 	if [ "$$new_upstream_version" = "$(UPSTREAM_VERSION)" ]; then \
 		echo " => Package is up to date"; \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-rspec.git