[SCM] spatialite branch, master, updated. 8d54e260b88cef9c12314e316f5afca733bd6e32

[David Paleino]

The following commit has been merged in the master branch:
commit 8d54e260b88cef9c12314e316f5afca733bd6e32
Author: David Paleino <dapal at debian.org>
Date:   Wed Oct 5 18:18:27 2011 +0200

    New orig tarball layout

diff --git a/debian/rules b/debian/rules
index 98b822f..4a588ff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,25 +17,19 @@ VERSION=$(shell echo $(FULL_VERSION)|cut -d~ -f1)
 
 get-orig-source:
 	mkdir -p $(CURDIR)/tmp || true
+	mkdir -p $(CURDIR)/spatialite-$(FULL_VERSION) || true
 	for archive in $(ARCHIVES); \
 	do \
 	    wget -O $(CURDIR)/$$archive.tar.gz http://www.gaia-gis.it/spatialite-$(VERSION)/$$archive-$(VERSION).tar.gz; \
 		tar xzovf $(CURDIR)/$$archive.tar.gz -C $(CURDIR)/tmp; \
-		mv $(CURDIR)/tmp/$$archive-$(VERSION) $(CURDIR)/tmp/$$archive; \
+		mv $(CURDIR)/tmp/$$archive-$(VERSION) $(CURDIR)/spatialite-$(FULL_VERSION)/$$archive; \
 	done
-	mkdir -p $(CURDIR)/spatialite-$(FULL_VERSION)/upstream
-	tar czvf $(CURDIR)/spatialite-$(FULL_VERSION)/upstream/spatialite.tar.gz -C $(CURDIR)/tmp $(ARCHIVES)
+	-mv $(CURDIR)/tmp/libspatialite-amalgamation $(CURDIR)/tmp/libspatialite
 	rm -rf $(CURDIR)/tmp $(CURDIR)/*.tar.gz
 	tar czvf spatialite_$(FULL_VERSION).orig.tar.gz --exclude=debian --exclude-vcs spatialite-$(FULL_VERSION)
 	rm -rf $(CURDIR)/spatialite-$(FULL_VERSION)
 
-unpack: unpack-stamp
-unpack-stamp:
-	tar xozvf $(CURDIR)/upstream/spatialite.tar.gz --exclude-vcs
-	mv libspatialite-amalgamation libspatialite
-	touch $@
-
-override_dh_auto_configure: unpack
+override_dh_auto_configure:
 	dh_auto_configure -Dlibspatialite -- \
 		--enable-geos --with-geos-lib=/usr/lib \
 		--enable-proj --with-proj-lib=/usr/lib
@@ -46,7 +40,7 @@ override_dh_auto_build:
 	dh_auto_build -Dlibspatialite
 	dh_auto_build -Dspatialite-tools
 
-override_dh_auto_clean: unpack
+override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf $(CURDIR)/libspatialite $(CURDIR)/spatialite-tools
 	rm -rf .pc

-- 
geospatial extension for SQLite