[SCM] spatialite branch, master, updated. upstream/2.4.0_rc4-18-ge378931

[David Paleino]

The following commit has been merged in the master branch:
commit e378931fc7ff664cac22aaf860241203dba72e04
Author: David Paleino <dapal at debian.org>
Date:   Wed Oct 5 19:04:26 2011 +0200

    Fix get-orig-source to be used with 3.0.0-BETA

diff --git a/debian/rules b/debian/rules
index 7882818..f240e30 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,9 +7,10 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
-ARCHIVES=libspatialite-amalgamation spatialite-tools
-FULL_VERSION=$(shell dpkg-parsechangelog|grep Version:|cut -d' ' -f2|cut -d- -f1)
-VERSION=$(shell echo $(FULL_VERSION)|cut -d~ -f1)
+ARCHIVES=libspatialite spatialite-tools
+FULL_VERSION := $(shell dpkg-parsechangelog | grep ^Version | cut -d' ' -f2 | cut -d- -f1)
+VERSION := $(shell echo $(FULL_VERSION) | sed -e "s/~beta[[:digit:]]\+/-BETA/")
+LC_VERSION := $(shell echo $(VERSION) | tr A-Z a-z)
 
 %:
 	-dh $@ \
@@ -19,15 +20,14 @@ get-orig-source:
 	mkdir -p $(CURDIR)/tmp || true
 	for archive in $(ARCHIVES); \
 	do \
-	    wget -O $(CURDIR)/$$archive.tar.gz http://www.gaia-gis.it/spatialite-$(VERSION)/$$archive-$(VERSION).tar.gz; \
+	    wget -O $(CURDIR)/$$archive.tar.gz http://www.gaia-gis.it/spatialite-$(VERSION)/$$archive-$(LC_VERSION).tar.gz; \
 		tar xzovf $(CURDIR)/$$archive.tar.gz -C $(CURDIR)/tmp; \
-		mv $(CURDIR)/tmp/$$archive-$(VERSION) $(CURDIR)/tmp/$$archive; \
+		mv $(CURDIR)/tmp/$$archive-$(LC_VERSION) $(CURDIR)/tmp/$$archive; \
 	done
-	-mv $(CURDIR)/tmp/libspatialite-amalgamation $(CURDIR)/tmp/libspatialite
-	mv $(CURDIR)/tmp $(CURDIR)/spatialite-$(FULL_VERSION)
+	mv $(CURDIR)/tmp $(CURDIR)/spatialite-$(LC_VERSION)
 	rm -rf $(CURDIR)/*.tar.gz
-	tar czvf spatialite_$(FULL_VERSION).orig.tar.gz --exclude=debian --exclude-vcs spatialite-$(FULL_VERSION)
-	rm -rf $(CURDIR)/spatialite-$(FULL_VERSION)
+	tar czvf spatialite_$(FULL_VERSION).orig.tar.gz --exclude=debian --exclude-vcs spatialite-$(LC_VERSION)
+	rm -rf $(CURDIR)/spatialite-$(LC_VERSION)
 
 override_dh_auto_configure:
 	dh_auto_configure -Dlibspatialite -- \

-- 
geospatial extension for SQLite