[SCM] spatialite branch, master, updated. 7a9921f59ac5999d4deee9c86fc6191cfdf225be

[David Paleino]

The following commit has been merged in the master branch:
commit 7a9921f59ac5999d4deee9c86fc6191cfdf225be
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..7882818 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,19 +23,13 @@ get-orig-source:
 		tar xzovf $(CURDIR)/$$archive.tar.gz -C $(CURDIR)/tmp; \
 		mv $(CURDIR)/tmp/$$archive-$(VERSION) $(CURDIR)/tmp/$$archive; \
 	done
-	mkdir -p $(CURDIR)/spatialite-$(FULL_VERSION)/upstream
-	tar czvf $(CURDIR)/spatialite-$(FULL_VERSION)/upstream/spatialite.tar.gz -C $(CURDIR)/tmp $(ARCHIVES)
-	rm -rf $(CURDIR)/tmp $(CURDIR)/*.tar.gz
+	-mv $(CURDIR)/tmp/libspatialite-amalgamation $(CURDIR)/tmp/libspatialite
+	mv $(CURDIR)/tmp $(CURDIR)/spatialite-$(FULL_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)
 
-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