[SCM] spatialite branch, master, updated. debian/3.0.0_beta20110817-3-12-gf74d151

Thu Feb 23 13:31:25 UTC 2012

The following commit has been merged in the master branch:
commit 9d0f6df564a810322e0a2fc5b40ad3cef5100e13
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Thu Feb 23 13:59:36 2012 +0100

    Simplified to support spatialite library only.

diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644
index 0000000..3e36862
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,17 @@
+spatialite (3.0.1-1) unstable; urgency=low
+
+  Starting from this release Spatialite library and Spatialtools have been
+  decoupled in two different sources as in upstream kits. Each of them now
+  follows its own releasing process and has its own version.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 23 Feb 2012 13:47:17 +0100
+
+spatialite (3.0.0~beta20110817-3) unstable; urgency=medium
+
+  From this release, powerpc will lack full EPSG initialization.
+  .
+  This means that spatialite won't support all EPSG projections,
+  but only a small subset. The list of supported projections can be
+  found in '/usr/share/doc/libspatialite-dev/EPSG.powerpc'.
+
+ -- David Paleino <dapal at debian.org>  Mon, 21 Nov 2011 11:37:16 +0100
diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian
deleted file mode 100644
index 8d8cf33..0000000
--- a/debian/NEWS.Debian
+++ /dev/null
@@ -1,9 +0,0 @@
-spatialite (3.0.0~beta20110817-3) unstable; urgency=medium
-
-  From this release, powerpc will lack full EPSG initialization.
-  .
-  This means that spatialite won't support all EPSG projections,
-  but only a small subset. The list of supported projections can be
-  found in '/usr/share/doc/libspatialite-dev/EPSG.powerpc'.
-
- -- David Paleino <dapal at debian.org>  Mon, 21 Nov 2011 11:37:16 +0100
diff --git a/debian/changelog b/debian/changelog
index 6de50b3..fb0d9e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,14 @@
 spatialite (3.0.1-1) unstable; urgency=low
 
   * New upstream release.
-  * The get-orig-source target changed (again) but temporarly not working,
-    because tools and lib currently have different versions.
-    Maybe upstream likes upsetting distribution details at every new release?
   * Patchset refreshed. Finally, Sandro is now following a sane policy with 
     SONAME versioning. Better than never.
   * This version is compatible with Freexl >= 1.0.0 only.
+  * Now spatialite source includes the library only, spatialite-tools moved
+    to a new package.
+  * Rules script greatly semplified.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 22 Feb 2012 13:48:43 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 23 Feb 2012 13:55:06 +0100
 
 spatialite (3.0.0~beta20110817-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index d47fb0f..29c4613 100644
--- a/debian/control
+++ b/debian/control
@@ -51,16 +51,3 @@ Description: Geospatial extension for SQLite - development files
  .
  This package contains development (static libraries and header files).
  
-Package: spatialite-bin
-Architecture: any
-Depends:
- ${shlibs:Depends}
- , ${misc:Depends}
-Description: Geospatial extension for SQLite - tools
- The SpatiaLite extension enables SQLite to support spatial (geometry) data
- in a way conformant to OpenGis specifications, with both WKT and WKB formats.
- .
- Spatialite also includes Virtualshape and Virtualtext to enable accessing
- shapefiles and csv/text files as virtual tables.
- .
- This package contains tools useful to manage SQLite databases.
diff --git a/debian/rules b/debian/rules
index d5192a0..3756b11 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,6 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
-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)
@@ -28,38 +27,12 @@ versions:
 	@echo "Spatialite full version: $(FULL_VERSION)"
 	@echo "Spatialite version: $(LC_VERSION)"
 
-get-orig-source:
-	mkdir -p $(CURDIR)/tmp || true
-	for archive in $(ARCHIVES); \
-	do \
-	    wget -O $(CURDIR)/$$archive.tar.gz $(BASE_URL)/$$archive-sources/$$archive-$(LC_VERSION).tar.gz; \
-		tar xzovf $(CURDIR)/$$archive.tar.gz -C $(CURDIR)/tmp; \
-		mv $(CURDIR)/tmp/$$archive-$(LC_VERSION) $(CURDIR)/tmp/$$archive; \
-	done
-	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-$(LC_VERSION)
-	rm -rf $(CURDIR)/spatialite-$(LC_VERSION)
-
 override_dh_auto_configure:
-	dh_auto_configure -Dlibspatialite -- \
+	dh_auto_configure -- \
 		--enable-geos \
 		--enable-proj \
 		$(EPSG) \
 		--disable-geosadvanced
-	dh_auto_configure -Dspatialite-tools
-
-override_dh_auto_build:
-	dh_auto_build -Dlibspatialite
-	dh_auto_build -Dspatialite-tools
-
-override_dh_auto_clean:
-	dh_auto_clean -Dlibspatialite
-	dh_auto_clean -Dspatialite-tools
-
-override_dh_auto_install:
-	dh_auto_install -Dlibspatialite
-	dh_auto_install -Dspatialite-tools
 
 override_dh_shlibdeps:
 	dh_shlibdeps -l/usr/lib:$(CURDIR)/debian/tmp/usr/lib
diff --git a/debian/spatialite-bin.install b/debian/spatialite-bin.install
deleted file mode 100644
index 5f051cb..0000000
--- a/debian/spatialite-bin.install
+++ /dev/null
@@ -1,7 +0,0 @@
-usr/bin/exif_loader
-usr/bin/shp_doctor
-usr/bin/spatialite
-usr/bin/spatialite_gml
-usr/bin/spatialite_network
-usr/bin/spatialite_osm*
-usr/bin/spatialite_tool

-- 
geospatial extension for SQLite

