[Pkg-cli-apps-commits] [monodevelop-database] 02/03: Fix get-orig-source to handle maj.min versus maj.min.patch.build version numbering - the former is used for folder names, the latter for tarball names, from now on.

[Jo Shields]

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

directhex pushed a commit to branch master
in repository monodevelop-database.

commit fa24bde0fc303061e2e6a16dde2c2294e2b8f25e
Author: Jo Shields <jo.shields at xamarin.com>
Date:   Thu Oct 9 15:57:22 2014 +0100

    Fix get-orig-source to handle maj.min versus maj.min.patch.build version numbering - the former is used for folder names, the latter for tarball names, from now on.
---
 debian/rules | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/debian/rules b/debian/rules
index a41094c..8802a43 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,7 @@ SOURCE_DIR = $(DEBIAN_DIR)/..
 DEB_VERSION = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Version | cut -d" " -f2)   
 DEB_SOURCE_NAME = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Source | cut -d" " -f2)
 VERSION = $(shell echo $(DEB_VERSION) | cut -d"-" -f1 | sed 's/+dfsg.*//')
+SUB_VERSION = $(shell echo $(VERSION) | cut -d"." -f1-2)
 
 MDVERSION = 4.0.12
 
@@ -34,19 +35,19 @@ get-orig-source:
 		--force-download \
 		--rename \
 		--repack
-	if [ -d $(DEB_SOURCE_NAME)-$(VERSION) ]; then \
-		echo "$(DEB_SOURCE_NAME)-$(VERSION) is in the way, bailing out!"; \
+	if [ -d $(DEB_SOURCE_NAME)-$(SUB_VERSION) ]; then \
+		echo "$(DEB_SOURCE_NAME)-$(SUB_VERSION) is in the way, bailing out!"; \
 		exit 1; \
 	fi
 	tar -xzf $(DEB_SOURCE_NAME)_$(VERSION).orig.tar.gz
 	rm $(DEB_SOURCE_NAME)_$(VERSION).orig.tar.gz
-	find $(DEB_SOURCE_NAME)-$(VERSION) -name "*.exe"
-	find $(DEB_SOURCE_NAME)-$(VERSION) -name "*.exe" -delete
-	find $(DEB_SOURCE_NAME)-$(VERSION) -name "*.dll"
-	find $(DEB_SOURCE_NAME)-$(VERSION) -name "*.dll" -delete
-	tar --mtime=@1255820400 -cf ./$(DEB_SOURCE_NAME)_$(VERSION)+dfsg.orig.tar $(DEB_SOURCE_NAME)-$(VERSION)
+	find $(DEB_SOURCE_NAME)-$(SUB_VERSION) -name "*.exe"
+	find $(DEB_SOURCE_NAME)-$(SUB_VERSION) -name "*.exe" -delete
+	find $(DEB_SOURCE_NAME)-$(SUB_VERSION) -name "*.dll"
+	find $(DEB_SOURCE_NAME)-$(SUB_VERSION) -name "*.dll" -delete
+	tar --mtime=@1255820400 -cf ./$(DEB_SOURCE_NAME)_$(VERSION)+dfsg.orig.tar $(DEB_SOURCE_NAME)-$(SUB_VERSION)
 	gzip -9fn ./$(DEB_SOURCE_NAME)_$(VERSION)+dfsg.orig.tar
-	rm -r $(DEB_SOURCE_NAME)-$(VERSION)
+	rm -r $(DEB_SOURCE_NAME)-$(SUB_VERSION)
 
 %:
 	dh $@ --with autoreconf,cli

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/monodevelop-database.git