[SCM] spatialite branch, master, updated. debian/3.0.0_beta20110817-3-12-gf74d151
The following commit has been merged in the master branch:
commit 9d0f6df564a810322e0a2fc5b40ad3cef5100e13
Author: Francesco Paolo Lovergine fran...@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 000..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 fran...@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 da...@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..000
--- 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 da...@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 fran...@debian.org Wed, 22 Feb 2012 13:48:43
+0100
+ -- Francesco Paolo Lovergine fran...@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
-
[SCM] spatialite branch, master, updated. debian/3.0.0_beta20110817-3-12-gf74d151
The following commit has been merged in the master branch: commit f74d1517875469a251b734517de92cfa50a27070 Author: Francesco Paolo Lovergine fran...@debian.org Date: Thu Feb 23 14:31:05 2012 +0100 Updated patchset for new source structure. diff --git a/debian/patches/00-add_automake_foreign.patch b/debian/patches/00-add_automake_foreign.patch index ef098d1..2e3ed66 100644 --- a/debian/patches/00-add_automake_foreign.patch +++ b/debian/patches/00-add_automake_foreign.patch @@ -10,10 +10,10 @@ Forwarded: no spatialite-tools/Makefile.in |2 +- 4 files changed, 4 insertions(+), 4 deletions(-) -Index: spatialite/libspatialite/Makefile.am +Index: spatialite/Makefile.am === spatialite.orig/libspatialite/Makefile.am 2012-02-17 16:53:35.0 +0100 -+++ spatialite/libspatialite/Makefile.am 2012-02-17 17:02:17.0 +0100 +--- spatialite.orig/Makefile.am2012-02-17 16:53:35.0 +0100 spatialite/Makefile.am 2012-02-17 17:02:17.0 +0100 @@ -1,6 +1,6 @@ ACLOCAL_AMFLAGS = -I m4 @@ -22,21 +22,10 @@ Index: spatialite/libspatialite/Makefile.am EXTRA_DIST = makefile.vc nmake.opt mainpage.doxy README.coverage -Index: spatialite/spatialite-tools/Makefile.am +Index: spatialite/Makefile.in === spatialite.orig/spatialite-tools/Makefile.am 2012-02-17 16:53:36.0 +0100 -+++ spatialite/spatialite-tools/Makefile.am2012-02-17 17:02:17.0 +0100 -@@ -48,5 +48,5 @@ - Makefile-static-Linux \ - Makefile-static-MacOsX - --AUTOMAKE_OPTIONS = dist-zip -+AUTOMAKE_OPTIONS = dist-zip foreign - -Index: spatialite/libspatialite/Makefile.in -=== spatialite.orig/libspatialite/Makefile.in 2012-02-17 16:53:35.0 +0100 -+++ spatialite/libspatialite/Makefile.in 2012-02-17 17:03:14.0 +0100 +--- spatialite.orig/Makefile.in2012-02-17 16:53:35.0 +0100 spatialite/Makefile.in 2012-02-17 17:03:14.0 +0100 @@ -254,7 +254,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @@ -46,16 +35,3 @@ Index: spatialite/libspatialite/Makefile.in EXTRA_DIST = makefile.vc nmake.opt mainpage.doxy README.coverage SUBDIRS = src test examples pkgconfigdir = $(libdir)/pkgconfig -Index: spatialite/spatialite-tools/Makefile.in -=== spatialite.orig/spatialite-tools/Makefile.in 2012-02-17 16:53:36.0 +0100 -+++ spatialite/spatialite-tools/Makefile.in2012-02-17 17:02:17.0 +0100 -@@ -294,7 +294,7 @@ - Makefile-static-Linux \ - Makefile-static-MacOsX - --AUTOMAKE_OPTIONS = dist-zip -+AUTOMAKE_OPTIONS = dist-zip foreign - all: all-am - - .SUFFIXES: diff --git a/debian/patches/04-fix_missing_define.patch b/debian/patches/04-fix_missing_define.patch index 00ba7a2..41dfb1e 100644 --- a/debian/patches/04-fix_missing_define.patch +++ b/debian/patches/04-fix_missing_define.patch @@ -1,7 +1,7 @@ -Index: spatialite/libspatialite/src/headers/spatialite/gaiaexif.h +Index: spatialite/src/headers/spatialite/gaiaexif.h === spatialite.orig/libspatialite/src/headers/spatialite/gaiaexif.h 2012-02-17 16:53:35.0 +0100 -+++ spatialite/libspatialite/src/headers/spatialite/gaiaexif.h 2012-02-22 11:10:40.0 +0100 +--- spatialite.orig/src/headers/spatialite/gaiaexif.h 2012-02-17 16:53:35.0 +0100 spatialite/src/headers/spatialite/gaiaexif.h 2012-02-22 11:10:40.0 +0100 @@ -87,6 +87,7 @@ #define GAIA_GEOMETRY_BLOB8 /** this BLOB does actually contain a TIFF image */ diff --git a/debian/patches/series b/debian/patches/series index 7d5d2df..fa482c6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,2 @@ 00-add_automake_foreign.patch -01-fix_local_build.patch -03-fix_typos.patch 04-fix_missing_define.patch -- geospatial extension for SQLite ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] spatialite branch, master, updated. debian/3.0.0_beta20110817-3-12-gf74d151
The following commit has been merged in the master branch: commit 6c1c8f6b94ba388dec2b5ee9988b4bdb3b24b537 Merge: c8017634aaa0b7792a61708792d1063450f912a7 848def3b75ee69480dc74a8cc60f36418253afbc Author: Francesco Paolo Lovergine fran...@debian.org Date: Thu Feb 23 13:44:16 2012 +0100 Merge branch 'upstream' Conflicts: debian/copyright ltmain.sh mainpage.doxy makefile.vc missing nmake.opt spatialite.pc.in src/Makefile.am src/Makefile.in src/gaiaaux/Makefile.am src/gaiaaux/Makefile.in src/gaiaaux/gg_sqlaux.c src/gaiaaux/gg_utf8.c src/gaiaexif/Makefile.am src/gaiaexif/Makefile.in src/gaiaexif/gaia_exif.c src/gaiageo/Makefile.am src/gaiageo/Makefile.in src/gaiageo/gg_advanced.c src/gaiageo/gg_endian.c src/gaiageo/gg_ewkt.c src/gaiageo/gg_geoJSON.c src/gaiageo/gg_geodesic.c src/gaiageo/gg_geometries.c src/gaiageo/gg_geoscvt.c src/gaiageo/gg_gml.c src/gaiageo/gg_kml.c src/gaiageo/gg_relations.c src/gaiageo/gg_shape.c src/gaiageo/gg_transform.c src/gaiageo/gg_vanuatu.c src/gaiageo/gg_wkb.c src/gaiageo/gg_wkt.c src/headers/Makefile.am src/headers/Makefile.in src/headers/spatialite.h src/headers/spatialite/gaiaaux.h src/headers/spatialite/gaiaexif.h src/headers/spatialite/gaiageo.h src/headers/spatialite/gg_advanced.h src/headers/spatialite/gg_const.h src/headers/spatialite/gg_core.h src/headers/spatialite/gg_dynamic.h src/headers/spatialite/gg_formats.h src/headers/spatialite/gg_mbr.h src/headers/spatialite/gg_structs.h src/headers/spatialite/spatialite.h src/shapefiles/Makefile.am src/shapefiles/Makefile.in src/shapefiles/shapefiles.c src/spatialite/Makefile.am src/spatialite/Makefile.in src/spatialite/mbrcache.c src/spatialite/spatialite.c src/spatialite/virtualXL.c src/spatialite/virtualdbf.c src/spatialite/virtualfdo.c src/spatialite/virtualnetwork.c src/spatialite/virtualshape.c src/spatialite/virtualspatialindex.c src/srsinit/Makefile.am src/srsinit/Makefile.in src/srsinit/srs_init.c src/versioninfo/version.c src/virtualtext/Makefile.am src/virtualtext/Makefile.in src/virtualtext/virtualtext.c test/Makefile.am test/Makefile.in test/check_create.c test/check_dbf_load.c test/check_extension.c test/check_gaia_utf8.c test/check_gaia_util.c test/check_init.c test/check_math_funcs.c test/check_mbrcache.c test/check_shp_load.c test/check_shp_load_3d.c test/check_spatialindex.c test/check_sql_stmt.c test/check_version.c test/check_virtualtable1.c test/check_virtualtable2.c test/check_virtualtable3.c test/check_virtualtable4.c test/check_virtualtable5.c test/check_virtualtable6.c test/check_xls_load.c test/shape_3d.c test/shape_cp1252.c test/shape_utf8_1.c test/shape_utf8_2.c test/shapetest1.dbf test/shapetest1.prj test/shapetest1.qpj test/shapetest1.shp test/shapetest1.shx test/shp/foggia/local_councils.dbf test/shp/foggia/local_councils.prj test/shp/foggia/local_councils.shp test/shp/foggia/local_councils.shx test/shp/gaza/aeroway.dbf test/shp/gaza/aeroway.prj test/shp/gaza/aeroway.shp test/shp/gaza/aeroway.shx test/shp/gaza/barrier.dbf test/shp/gaza/barrier.prj test/shp/gaza/barrier.shp test/shp/gaza/barrier.shx test/shp/gaza/route.dbf test/shp/gaza/route.prj test/shp/gaza/route.shp test/shp/gaza/route.shx test/shp/merano-3d/points.dbf test/shp/merano-3d/points.prj test/shp/merano-3d/points.shp test/shp/merano-3d/points.shx test/shp/merano-3d/polygons.dbf test/shp/merano-3d/polygons.prj test/shp/merano-3d/polygons.shp test/shp/merano-3d/polygons.shx test/shp/merano-3d/roads.dbf test/shp/merano-3d/roads.prj test/shp/merano-3d/roads.shp test/shp/merano-3d/roads.shx test/shp/new-caledonia/buildings.dbf test/shp/new-caledonia/buildings.prj test/shp/new-caledonia/buildings.shp test/shp/new-caledonia/buildings.shx test/shp/new-caledonia/points.dbf test/shp/new-caledonia/points.prj test/shp/new-caledonia/points.shp test/shp/new-caledonia/points.shx test/shp/new-caledonia/railways.dbf test/shp/new-caledonia/railways.shp
