[SCM] spatialite branch, master, updated. debian/3.0.0_beta20110817-3-45-g30b6919
The following commit has been merged in the master branch: commit 10a5d15df599b67f6390f11584d8d97a042dc5d9 Merge: b4f33585dfe0e534aad666794f7184cf6a1cb369 2d602f4880efbc1b46d5897eb6a181f6ada542a4 Author: David Paleino Date: Mon Nov 26 18:32:04 2012 +0100 Merge tag 'upstream/4.0.0' Upstream version 4.0.0 -- 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-45-g30b6919
The following commit has been merged in the master branch: commit cdf293f969c57949abc15f866a07bb93ed316b23 Author: David Paleino Date: Thu Oct 4 11:33:05 2012 +0200 New upstream release candidate. diff --git a/debian/changelog b/debian/changelog index 59ea896..25823be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +spatialite (4.0.0~rc1-1) UNRELEASED; urgency=low + + * New upstream release candidate. + + -- David Paleino Thu, 04 Oct 2012 11:32:55 +0200 + spatialite (3.1.0~rc2-1) unstable; urgency=low * New upstream release candidate. -- 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-45-g30b6919
The following commit has been merged in the master branch: commit 997ae406a78b005de01d6a5c6ff520bbb6cd49e2 Author: David Paleino Date: Thu Oct 4 11:34:02 2012 +0200 Updated debian/watch diff --git a/debian/changelog b/debian/changelog index 25823be..ccdff2b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ spatialite (4.0.0~rc1-1) UNRELEASED; urgency=low * New upstream release candidate. + * Updated debian/watch - -- David Paleino Thu, 04 Oct 2012 11:32:55 +0200 + -- David Paleino Thu, 04 Oct 2012 11:33:55 +0200 spatialite (3.1.0~rc2-1) unstable; urgency=low diff --git a/debian/watch b/debian/watch index 7682fa9..eaca2c0 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,3 @@ -# See uscan(1) for format -# Compulsory line, this is a version 3 file version=3 -http://www.gaia-gis.it/spatialite/sources.html libspatialite-(\d+\.\d+(\.\d+)?)\.tar\.gz +opts=uversionmangle=s/-RC/~rc/ \ +http://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-(\d+.*)\.tar\.gz -- 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-45-g30b6919
The following commit has been merged in the master branch: commit 8e3748f9ab601b64dd2d56f8d709938907f09db3 Author: David Paleino Date: Thu Oct 4 11:37:34 2012 +0200 Patchset refreshed, 04-fix_missing_define.patch dropped. diff --git a/debian/changelog b/debian/changelog index ccdff2b..bac1af1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ spatialite (4.0.0~rc1-1) UNRELEASED; urgency=low * New upstream release candidate. * Updated debian/watch + * Patchset refreshed, 04-fix_missing_define.patch dropped. - -- David Paleino Thu, 04 Oct 2012 11:33:55 +0200 + -- David Paleino Thu, 04 Oct 2012 11:37:18 +0200 spatialite (3.1.0~rc2-1) unstable; urgency=low diff --git a/debian/patches/00-add_automake_foreign.patch b/debian/patches/00-add_automake_foreign.patch index 379a6aa..8b15324 100644 --- a/debian/patches/00-add_automake_foreign.patch +++ b/debian/patches/00-add_automake_foreign.patch @@ -4,16 +4,12 @@ Origin: vendor Forwarded: no --- - libspatialite/Makefile.am|2 +- - libspatialite/Makefile.in|2 +- - spatialite-tools/Makefile.am |2 +- - spatialite-tools/Makefile.in |2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) + Makefile.am |2 +- + Makefile.in |2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) -Index: spatialite/Makefile.am -=== spatialite.orig/Makefile.am2012-04-03 14:22:32.0 +0200 -+++ spatialite/Makefile.am 2012-04-03 14:57:53.0 +0200 +--- spatialite.orig/Makefile.am spatialite/Makefile.am @@ -1,6 +1,6 @@ ACLOCAL_AMFLAGS = -I m4 @@ -22,11 +18,9 @@ Index: spatialite/Makefile.am EXTRA_DIST = makefile.vc nmake.opt Android.mk mainpage.doxy README.coverage \ spatialite-sql-latest.html -Index: spatialite/Makefile.in -=== spatialite.orig/Makefile.in2012-04-03 14:22:32.0 +0200 -+++ spatialite/Makefile.in 2012-04-03 14:58:36.0 +0200 -@@ -253,7 +253,7 @@ +--- spatialite.orig/Makefile.in spatialite/Makefile.in +@@ -263,7 +263,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I m4 diff --git a/debian/patches/04-fix_missing_define.patch b/debian/patches/04-fix_missing_define.patch deleted file mode 100644 index c5382a9..000 --- a/debian/patches/04-fix_missing_define.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: spatialite/src/headers/spatialite/gaiaexif.h -=== spatialite.orig/src/headers/spatialite/gaiaexif.h 2012-03-02 11:56:59.0 +0100 -+++ spatialite/src/headers/spatialite/gaiaexif.h 2012-03-02 11:57:11.0 +0100 -@@ -87,6 +87,7 @@ - #define GAIA_GEOMETRY_BLOB8 - /** this BLOB does actually contain a TIFF image */ - #define GAIA_TIFF_BLOB9 -+#define GAIA_WAVELET_BLOB 10 - - /* constants used for EXIF value types */ - /** unrecognized EXIF value */ diff --git a/debian/patches/series b/debian/patches/series index 4a07f17..27d2927 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ 00-add_automake_foreign.patch -04-fix_missing_define.patch 07-fix_spatialite_pc.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-45-g30b6919
The following commit has been merged in the master branch: commit 2872b944e630baa00bebd155cbbe9d6091a582d9 Author: David Paleino Date: Thu Oct 4 11:38:09 2012 +0200 Debhelper compatibility bumped to 9. diff --git a/debian/changelog b/debian/changelog index bac1af1..694deac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ spatialite (4.0.0~rc1-1) UNRELEASED; urgency=low * New upstream release candidate. * Updated debian/watch * Patchset refreshed, 04-fix_missing_define.patch dropped. + * Debhelper compatibility bumped to 9. - -- David Paleino Thu, 04 Oct 2012 11:37:18 +0200 + -- David Paleino Thu, 04 Oct 2012 11:37:55 +0200 spatialite (3.1.0~rc2-1) unstable; urgency=low diff --git a/debian/compat b/debian/compat index 45a4fb7..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +9 diff --git a/debian/control b/debian/control index 2c55618..3ab090a 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: extra Maintainer: Debian GIS Project Uploaders: Francesco Paolo Lovergine , David Paleino Build-Depends: - debhelper (>= 8) + debhelper (>= 9) , autotools-dev , libsqlite3-dev (>= 3.6.11) , libgeos-dev (>= 3.3.0) -- 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-45-g30b6919
The following commit has been merged in the master branch: commit b18234c3669dfe2bac64365787aece3a0821ea50 Author: David Paleino Date: Thu Oct 4 11:38:16 2012 +0200 Fix changelog diff --git a/debian/changelog b/debian/changelog index 694deac..db3ba16 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ spatialite (4.0.0~rc1-1) UNRELEASED; urgency=low * New upstream release candidate. - * Updated debian/watch + * Updated debian/watch. * Patchset refreshed, 04-fix_missing_define.patch dropped. * Debhelper compatibility bumped to 9. -- 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-45-g30b6919
The following commit has been merged in the master branch: commit ece7184b8bfaa76cf439a40434ca5fdd4811f739 Author: David Paleino Date: Thu Oct 4 11:39:06 2012 +0200 Cosmetic changes diff --git a/debian/control b/debian/control index 3ab090a..8551d57 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,9 @@ Source: spatialite Section: science Priority: extra Maintainer: Debian GIS Project -Uploaders: Francesco Paolo Lovergine , David Paleino +Uploaders: + Francesco Paolo Lovergine + , David Paleino Build-Depends: debhelper (>= 9) , autotools-dev @@ -51,4 +53,3 @@ Description: Geospatial extension for SQLite - development files shapefiles and csv/text files as virtual tables. . This package contains development (static libraries and header files). - -- 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-45-g30b6919
The following commit has been merged in the master branch: commit ff9f6533eff35b32a7b9171072525025a8ab204b Author: David Paleino Date: Thu Oct 4 11:39:24 2012 +0200 Standards-Version bump to 3.9.4, no changes needed. diff --git a/debian/changelog b/debian/changelog index db3ba16..8a1e254 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,9 @@ spatialite (4.0.0~rc1-1) UNRELEASED; urgency=low * Updated debian/watch. * Patchset refreshed, 04-fix_missing_define.patch dropped. * Debhelper compatibility bumped to 9. + * Standards-Version bump to 3.9.4, no changes needed. - -- David Paleino Thu, 04 Oct 2012 11:37:55 +0200 + -- David Paleino Thu, 04 Oct 2012 11:39:14 +0200 spatialite (3.1.0~rc2-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 8551d57..b1a3204 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends: , libexpat1-dev , libfreexl-dev (>= 1.0.0) , pkg-config -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 Homepage: http://www.gaia-gis.it/spatialite/ Vcs-Browser: http://git.debian.org/?p=pkg-grass/spatialite.git Vcs-Git: git://git.debian.org/pkg-grass/spatialite.git -- 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-45-g30b6919
The following commit has been merged in the master branch: commit 04743cf6450ea476201b2aa4fc689e7aad7f2dce Author: David Paleino Date: Thu Oct 4 11:41:12 2012 +0200 Also build a debugging symbols package: libspatialite3-dbg. diff --git a/debian/changelog b/debian/changelog index 8a1e254..1eaa09e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,9 @@ spatialite (4.0.0~rc1-1) UNRELEASED; urgency=low * Patchset refreshed, 04-fix_missing_define.patch dropped. * Debhelper compatibility bumped to 9. * Standards-Version bump to 3.9.4, no changes needed. + * Also build a debugging symbols package: libspatialite3-dbg. - -- David Paleino Thu, 04 Oct 2012 11:39:14 +0200 + -- David Paleino Thu, 04 Oct 2012 11:40:53 +0200 spatialite (3.1.0~rc2-1) unstable; urgency=low diff --git a/debian/control b/debian/control index b1a3204..83f1714 100644 --- a/debian/control +++ b/debian/control @@ -53,3 +53,19 @@ Description: Geospatial extension for SQLite - development files shapefiles and csv/text files as virtual tables. . This package contains development (static libraries and header files). + +Package: libspatialite3-dbg +Architecture: any +Section: debug +Depends: + libspatialite3 (= ${binary:Version}) + , ${shlibs:Depends} + , ${misc:Depends} +Description: Geospatial extension for SQLite - debugging symbols + 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 debugging symbols for the libraries. diff --git a/debian/rules b/debian/rules index 175b14d..29bf22f 100755 --- a/debian/rules +++ b/debian/rules @@ -35,3 +35,6 @@ override_dh_auto_configure: override_dh_shlibdeps: dh_shlibdeps -l/usr/lib:$(CURDIR)/debian/tmp/usr/lib + +override_dh_strip: + dh_strip --dbg-package=libspatialite3-dbg -- 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-45-g30b6919
The following commit has been merged in the master branch: commit f5c995911317270694993202d723d98fd242b66b Author: David Paleino Date: Mon Nov 26 18:35:26 2012 +0100 New upstream version. diff --git a/debian/changelog b/debian/changelog index 1eaa09e..1e0385a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -spatialite (4.0.0~rc1-1) UNRELEASED; urgency=low +spatialite (4.0.0-1) UNRELEASED; urgency=low - * New upstream release candidate. + * New upstream version. * Updated debian/watch. * Patchset refreshed, 04-fix_missing_define.patch dropped. * Debhelper compatibility bumped to 9. -- 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-45-g30b6919
The following commit has been merged in the master branch: commit ee3c9fcb64cbe96507895ed2332767332c07b33a Author: David Paleino Date: Mon Nov 26 18:35:48 2012 +0100 Refresh patch diff --git a/debian/patches/00-add_automake_foreign.patch b/debian/patches/00-add_automake_foreign.patch index 8b15324..5be4c64 100644 --- a/debian/patches/00-add_automake_foreign.patch +++ b/debian/patches/00-add_automake_foreign.patch @@ -17,15 +17,15 @@ Forwarded: no +AUTOMAKE_OPTIONS = dist-zip foreign EXTRA_DIST = makefile.vc nmake.opt Android.mk mainpage.doxy README.coverage \ - spatialite-sql-latest.html + spatialite-sql-latest.html config-msvc.h --- spatialite.orig/Makefile.in +++ spatialite/Makefile.in -@@ -263,7 +263,7 @@ top_build_prefix = @top_build_prefix@ +@@ -285,7 +285,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I m4 -AUTOMAKE_OPTIONS = dist-zip +AUTOMAKE_OPTIONS = dist-zip foreign EXTRA_DIST = makefile.vc nmake.opt Android.mk mainpage.doxy README.coverage \ - spatialite-sql-latest.html + spatialite-sql-latest.html config-msvc.h -- 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-45-g30b6919
The following commit has been merged in the master branch: commit f58e98819e16d3b77d02b3c5e64819682e4d001d Author: David Paleino Date: Thu Nov 29 21:33:25 2012 +0100 Fix paths for multi-archified package diff --git a/debian/libspatialite-dev.install b/debian/libspatialite-dev.install index 9950ed3..0ac221f 100644 --- a/debian/libspatialite-dev.install +++ b/debian/libspatialite-dev.install @@ -1,6 +1,6 @@ -usr/lib/libspatialite.a -usr/lib/libspatialite.so +usr/lib/*/libspatialite.a +usr/lib/*/libspatialite.so usr/include -usr/lib/pkgconfig/spatialite.pc +usr/lib/*/pkgconfig/spatialite.pc debian/EPSG.powerpcusr/share/doc/libspatialite-dev/ diff --git a/debian/libspatialite3.install b/debian/libspatialite3.install index 76db4b2..2aebaed 100644 --- a/debian/libspatialite3.install +++ b/debian/libspatialite3.install @@ -1 +1 @@ -usr/lib/libspatialite.so.* +usr/lib/*/libspatialite.so.* -- 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-45-g30b6919
The following commit has been merged in the master branch: commit c05d1eef9de92de9d316ff25e417bc2d3b801de3 Author: David Paleino Date: Thu Nov 29 21:37:08 2012 +0100 Remove files modified during build diff --git a/debian/clean b/debian/clean new file mode 100644 index 000..e716f06 --- /dev/null +++ b/debian/clean @@ -0,0 +1,2 @@ +test/*.sqlite +test/sql_stmt_tests/*.sqlite -- 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-45-g30b6919
The following commit has been merged in the master branch: commit bda88cee5a12ec28976d175f3c57e10124e9e313 Author: David Paleino Date: Thu Nov 29 21:44:19 2012 +0100 SONAME bump: from libspatialite3 to libspatialite5. diff --git a/debian/changelog b/debian/changelog index 1e0385a..2e88455 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,8 +6,9 @@ spatialite (4.0.0-1) UNRELEASED; urgency=low * Debhelper compatibility bumped to 9. * Standards-Version bump to 3.9.4, no changes needed. * Also build a debugging symbols package: libspatialite3-dbg. + * SONAME bump: from libspatialite3 to libspatialite5. - -- David Paleino Thu, 04 Oct 2012 11:40:53 +0200 + -- David Paleino Thu, 29 Nov 2012 21:43:17 +0100 spatialite (3.1.0~rc2-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 83f1714..74367d0 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,7 @@ Homepage: http://www.gaia-gis.it/spatialite/ Vcs-Browser: http://git.debian.org/?p=pkg-grass/spatialite.git Vcs-Git: git://git.debian.org/pkg-grass/spatialite.git -Package: libspatialite3 +Package: libspatialite5 Architecture: any Section: libs Breaks: spatialite-bin (<< 3.0.0-1~) @@ -40,7 +40,7 @@ Package: libspatialite-dev Architecture: any Section: libdevel Depends: - libspatialite3 (= ${binary:Version}) + libspatialite5 (= ${binary:Version}) , ${shlibs:Depends} , ${misc:Depends} , libsqlite3-dev (>= 3.3.6) @@ -54,11 +54,11 @@ Description: Geospatial extension for SQLite - development files . This package contains development (static libraries and header files). -Package: libspatialite3-dbg +Package: libspatialite5-dbg Architecture: any Section: debug Depends: - libspatialite3 (= ${binary:Version}) + libspatialite5 (= ${binary:Version}) , ${shlibs:Depends} , ${misc:Depends} Description: Geospatial extension for SQLite - debugging symbols diff --git a/debian/libspatialite3.install b/debian/libspatialite5.install similarity index 100% rename from debian/libspatialite3.install rename to debian/libspatialite5.install diff --git a/debian/libspatialite3.symbols b/debian/libspatialite5.symbols similarity index 100% rename from debian/libspatialite3.symbols rename to debian/libspatialite5.symbols diff --git a/debian/rules b/debian/rules index 29bf22f..8fc5089 100755 --- a/debian/rules +++ b/debian/rules @@ -37,4 +37,4 @@ override_dh_shlibdeps: dh_shlibdeps -l/usr/lib:$(CURDIR)/debian/tmp/usr/lib override_dh_strip: - dh_strip --dbg-package=libspatialite3-dbg + dh_strip --dbg-package=libspatialite5-dbg -- 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-45-g30b6919
The following commit has been merged in the master branch: commit 708e9eecd42ed5e833c74887a1213f816a9ac9df Author: David Paleino Date: Sat Dec 1 12:19:10 2012 +0100 Backup and restore test databases, they get modified during build-time tests. diff --git a/debian/changelog b/debian/changelog index 392a48a..1526021 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,10 @@ spatialite (4.0.0-1) UNRELEASED; urgency=low * Also build a debugging symbols package: libspatialite3-dbg. * SONAME bump: from libspatialite3 to libspatialite5. * Updated symbols file. + * Backup and restore test databases, they get modified during +build-time tests. - -- David Paleino Thu, 29 Nov 2012 21:46:44 +0100 + -- David Paleino Sat, 01 Dec 2012 12:18:49 +0100 spatialite (3.1.0~rc2-1) unstable; urgency=low diff --git a/debian/clean b/debian/clean deleted file mode 100644 index e716f06..000 --- a/debian/clean +++ /dev/null @@ -1,2 +0,0 @@ -test/*.sqlite -test/sql_stmt_tests/*.sqlite diff --git a/debian/rules b/debian/rules index 8fc5089..d9825d6 100755 --- a/debian/rules +++ b/debian/rules @@ -33,6 +33,15 @@ override_dh_auto_configure: $(EPSG) \ --enable-proj +override_dh_auto_test: + mkdir -p debian/backup/stmt + cp test/*.sqlite debian/backup/ + cp test/sql_stmt_tests/*.sqlite debian/backup/stmt/ + dh_auto_test + cp debian/backup/stmt/*.sqlite test/sql_stmt_tests/ + cp debian/backup/*.sqlite test/ + rm -rf debian/backup + override_dh_shlibdeps: dh_shlibdeps -l/usr/lib:$(CURDIR)/debian/tmp/usr/lib -- 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-45-g30b6919
The following commit has been merged in the master branch: commit dffdda0976730263a6b1b0f3d00e45418091cb26 Author: David Paleino Date: Thu Nov 29 21:46:57 2012 +0100 Updated symbols file. diff --git a/debian/changelog b/debian/changelog index 2e88455..392a48a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,9 @@ spatialite (4.0.0-1) UNRELEASED; urgency=low * Standards-Version bump to 3.9.4, no changes needed. * Also build a debugging symbols package: libspatialite3-dbg. * SONAME bump: from libspatialite3 to libspatialite5. + * Updated symbols file. - -- David Paleino Thu, 29 Nov 2012 21:43:17 +0100 + -- David Paleino Thu, 29 Nov 2012 21:46:44 +0100 spatialite (3.1.0~rc2-1) unstable; urgency=low diff --git a/debian/libspatialite5.symbols b/debian/libspatialite5.symbols index 2846885..ef52355 100644 --- a/debian/libspatialite5.symbols +++ b/debian/libspatialite5.symbols @@ -1,9 +1,7 @@ -libspatialite.so.3 libspatialite3 #MINVER# - EwktError@Base 3.0.0~beta20110817 +libspatialite.so.5 libspatialite5 #MINVER# EwktLval@Base 3.0.0~beta20110817 Ewkt_create_buffer@Base 3.0.0~beta20110817 Ewkt_delete_buffer@Base 3.0.0~beta20110817 - Ewkt_flex_debug@Base 3.0.0~beta20110817 Ewkt_flush_buffer@Base 3.0.0~beta20110817 Ewkt_scan_buffer@Base 3.0.0~beta20110817 Ewkt_scan_bytes@Base 3.0.0~beta20110817 @@ -11,33 +9,31 @@ libspatialite.so.3 libspatialite3 #MINVER# Ewkt_switch_to_buffer@Base 3.0.0~beta20110817 Ewktalloc@Base 3.0.0~beta20110817 Ewktfree@Base 3.0.0~beta20110817 + Ewktget_column@Base 4.0.0 Ewktget_debug@Base 3.0.0~beta20110817 + Ewktget_extra@Base 4.0.0 Ewktget_in@Base 3.0.0~beta20110817 Ewktget_leng@Base 3.0.0~beta20110817 Ewktget_lineno@Base 3.0.0~beta20110817 Ewktget_out@Base 3.0.0~beta20110817 Ewktget_text@Base 3.0.0~beta20110817 - Ewktin@Base 3.0.0~beta20110817 - Ewktleng@Base 3.0.0~beta20110817 - Ewktlex@Base 3.0.0~beta20110817 Ewktlex_destroy@Base 3.0.0~beta20110817 - Ewktlineno@Base 3.0.0~beta20110817 - Ewktout@Base 3.0.0~beta20110817 + Ewktlex_init@Base 4.0.0 + Ewktlex_init_extra@Base 4.0.0 Ewktpop_buffer_state@Base 3.0.0~beta20110817 Ewktpush_buffer_state@Base 3.0.0~beta20110817 Ewktrealloc@Base 3.0.0~beta20110817 Ewktrestart@Base 3.0.0~beta20110817 + Ewktset_column@Base 4.0.0 Ewktset_debug@Base 3.0.0~beta20110817 + Ewktset_extra@Base 4.0.0 Ewktset_in@Base 3.0.0~beta20110817 Ewktset_lineno@Base 3.0.0~beta20110817 Ewktset_out@Base 3.0.0~beta20110817 - Ewkttext@Base 3.0.0~beta20110817 Ewktwrap@Base 3.0.0~beta20110817 - GeoJsonError@Base 3.0.0~beta20110817 GeoJsonLval@Base 3.0.0~beta20110817 GeoJson_create_buffer@Base 3.0.0~beta20110817 GeoJson_delete_buffer@Base 3.0.0~beta20110817 - GeoJson_flex_debug@Base 3.0.0~beta20110817 GeoJson_flush_buffer@Base 3.0.0~beta20110817 GeoJson_scan_buffer@Base 3.0.0~beta20110817 GeoJson_scan_bytes@Base 3.0.0~beta20110817 @@ -45,33 +41,31 @@ libspatialite.so.3 libspatialite3 #MINVER# GeoJson_switch_to_buffer@Base 3.0.0~beta20110817 GeoJsonalloc@Base 3.0.0~beta20110817 GeoJsonfree@Base 3.0.0~beta20110817 + GeoJsonget_column@Base 4.0.0 GeoJsonget_debug@Base 3.0.0~beta20110817 + GeoJsonget_extra@Base 4.0.0 GeoJsonget_in@Base 3.0.0~beta20110817 GeoJsonget_leng@Base 3.0.0~beta20110817 GeoJsonget_lineno@Base 3.0.0~beta20110817 GeoJsonget_out@Base 3.0.0~beta20110817 GeoJsonget_text@Base 3.0.0~beta20110817 - GeoJsonin@Base 3.0.0~beta20110817 - GeoJsonleng@Base 3.0.0~beta20110817 - GeoJsonlex@Base 3.0.0~beta20110817 GeoJsonlex_destroy@Base 3.0.0~beta20110817 - GeoJsonlineno@Base 3.0.0~beta20110817 - GeoJsonout@Base 3.0.0~beta20110817 + GeoJsonlex_init@Base 4.0.0 + GeoJsonlex_init_extra@Base 4.0.0 GeoJsonpop_buffer_state@Base 3.0.0~beta20110817 GeoJsonpush_buffer_state@Base 3.0.0~beta20110817 GeoJsonrealloc@Base 3.0.0~beta20110817 GeoJsonrestart@Base 3.0.0~beta20110817 + GeoJsonset_column@Base 4.0.0 GeoJsonset_debug@Base 3.0.0~beta20110817 + GeoJsonset_extra@Base 4.0.0 GeoJsonset_in@Base 3.0.0~beta20110817 GeoJsonset_lineno@Base 3.0.0~beta20110817 GeoJsonset_out@Base 3.0.0~beta20110817 - GeoJsontext@Base 3.0.0~beta20110817 GeoJsonwrap@Base 3.0.0~beta20110817 - GmlError@Base 3.0.0~beta20110817 GmlLval@Base 3.0.0~beta20110817 Gml_create_buffer@Base 3.0.0~beta20110817 Gml_delete_buffer@Base 3.0.0~beta20110817 - Gml_flex_debug@Base 3.0.0~beta20110817 Gml_flush_buffer@Base 3.0.0~beta20110817 Gml_scan_buffer@Base 3.0.0~beta20110817 Gml_scan_bytes@Base 3.0.0~beta20110817 @@ -79,33 +73,31 @@ libspatialite.so.3 libspatialite3 #MINVER# Gml_switch_to_buffer@Base 3.0.0~beta20110817 Gmlalloc@Base 3.0.0~beta20110817 Gmlfree@Base 3.0.0~beta20110817 + Gmlget_column@Base 4.0.0 Gmlget_debug@Base 3.0.0~beta20110817 + Gmlget_extra@Base 4.0.0 Gmlget_in@Base 3.0.0~beta20110817 Gmlget_leng@Base 3.0.0~beta20110817 Gmlget_lineno@Base 3.0.0~beta20110817 Gmlget_out@Base 3.0.0~beta20110817 Gmlget_text@Base 3.0.0~beta20110817 - Gmlin@Base
[SCM] spatialite branch, master, updated. debian/3.0.0_beta20110817-3-45-g30b6919
The following commit has been merged in the master branch: commit 30b691949f95074723fb241b3e1a09f02301e26d Author: David Paleino Date: Sat Dec 1 18:26:00 2012 +0100 Uploading to experimental diff --git a/debian/changelog b/debian/changelog index 4ff8535..95d7de7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -spatialite (4.0.0-1) UNRELEASED; urgency=low +spatialite (4.0.0-1) experimental; urgency=low * New upstream version. * Updated debian/watch. @@ -12,7 +12,7 @@ spatialite (4.0.0-1) UNRELEASED; urgency=low build-time tests. * Multi-archified package. - -- David Paleino Sat, 01 Dec 2012 12:55:35 +0100 + -- David Paleino Sat, 01 Dec 2012 18:25:53 +0100 spatialite (3.1.0~rc2-1) unstable; urgency=low -- 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-45-g30b6919
The following commit has been merged in the master branch: commit 69299fba4498e9c768cfa7b4a634dcc75eeba052 Author: David Paleino Date: Sat Dec 1 12:56:18 2012 +0100 Multi-archified package. diff --git a/debian/changelog b/debian/changelog index 1526021..4ff8535 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,8 +10,9 @@ spatialite (4.0.0-1) UNRELEASED; urgency=low * Updated symbols file. * Backup and restore test databases, they get modified during build-time tests. + * Multi-archified package. - -- David Paleino Sat, 01 Dec 2012 12:18:49 +0100 + -- David Paleino Sat, 01 Dec 2012 12:55:35 +0100 spatialite (3.1.0~rc2-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 74367d0..d3ebbcc 100644 --- a/debian/control +++ b/debian/control @@ -24,6 +24,8 @@ Package: libspatialite5 Architecture: any Section: libs Breaks: spatialite-bin (<< 3.0.0-1~) +Multi-Arch: same +Pre-Depends: multiarch-support Depends: ${shlibs:Depends} , ${misc:Depends} @@ -39,6 +41,7 @@ Description: Geospatial extension for SQLite - libraries Package: libspatialite-dev Architecture: any Section: libdevel +Multi-Arch: same Depends: libspatialite5 (= ${binary:Version}) , ${shlibs:Depends} @@ -57,6 +60,7 @@ Description: Geospatial extension for SQLite - development files Package: libspatialite5-dbg Architecture: any Section: debug +Multi-Arch: same Depends: libspatialite5 (= ${binary:Version}) , ${shlibs:Depends} -- 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, pristine-tar, updated. db7ce99ced0b482f1cbacee572816aa349b1ee5c
The following commit has been merged in the pristine-tar branch: commit 358494e9e76a3465ce0dcf051c79ef51f6212209 Author: David Paleino Date: Thu Oct 4 11:32:36 2012 +0200 pristine-tar data for spatialite_4.0.0~rc1.orig.tar.gz diff --git a/spatialite_4.0.0~rc1.orig.tar.gz.delta b/spatialite_4.0.0~rc1.orig.tar.gz.delta new file mode 100644 index 000..e5912b2 Binary files /dev/null and b/spatialite_4.0.0~rc1.orig.tar.gz.delta differ diff --git a/spatialite_4.0.0~rc1.orig.tar.gz.id b/spatialite_4.0.0~rc1.orig.tar.gz.id new file mode 100644 index 000..f83f5d1 --- /dev/null +++ b/spatialite_4.0.0~rc1.orig.tar.gz.id @@ -0,0 +1 @@ +8a68984d3eb0f6792f7c616ecef1920accdcb903 -- 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, pristine-tar, updated. db7ce99ced0b482f1cbacee572816aa349b1ee5c
The following commit has been merged in the pristine-tar branch: commit db7ce99ced0b482f1cbacee572816aa349b1ee5c Author: David Paleino Date: Mon Nov 26 17:49:23 2012 +0100 pristine-tar data for spatialite_4.0.0.orig.tar.gz diff --git a/spatialite_4.0.0.orig.tar.gz.delta b/spatialite_4.0.0.orig.tar.gz.delta new file mode 100644 index 000..2bb90f4 Binary files /dev/null and b/spatialite_4.0.0.orig.tar.gz.delta differ diff --git a/spatialite_4.0.0.orig.tar.gz.id b/spatialite_4.0.0.orig.tar.gz.id new file mode 100644 index 000..477cef9 --- /dev/null +++ b/spatialite_4.0.0.orig.tar.gz.id @@ -0,0 +1 @@ +4963e8233a5e4d0945e9502d362ca8940bb40d85 -- 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 annotated tag, debian/4.0.0-1, created. debian/4.0.0-1
The annotated tag, debian/4.0.0-1 has been created at 9250a3930934d0dc879c4f2de9704657ade826ed (tag) tagging 30b691949f95074723fb241b3e1a09f02301e26d (commit) replaces debian/3.0.0_beta20110817-3 tagged by David Paleino on Sat Dec 1 20:40:41 2012 +0100 - Shortlog Debian release -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iEYEABECAAYFAlC6XTkACgkQ5qqQFxOSsXR1/wCgi9rpARuOTimrupg4Ceez7Iba zzwAoI3BonhSep8S1xuW3OX9433jWPAB =EQzo -END PGP SIGNATURE- David Paleino (19): Imported Upstream version 4.0.0 Merge tag 'upstream/4.0.0' New upstream release candidate. Updated debian/watch Patchset refreshed, 04-fix_missing_define.patch dropped. Debhelper compatibility bumped to 9. Fix changelog Cosmetic changes Standards-Version bump to 3.9.4, no changes needed. Also build a debugging symbols package: libspatialite3-dbg. New upstream version. Refresh patch Fix paths for multi-archified package Remove files modified during build SONAME bump: from libspatialite3 to libspatialite5. Updated symbols file. Backup and restore test databases, they get modified during build-time tests. Multi-archified package. Uploading to experimental Francesco Paolo Lovergine (26): Initial changes for 3.0.1 version. Imported Upstream version 3.0.1 Merge tag 'upstream/3.0.1' Removing foreign stuff. Removing foregn stuff Patchset updated for 3.0.1 It is requested a recent freexl to work. Merge branch 'master' of ssh://git.debian.org/git/pkg-grass/spatialite Upstream reset to pure 3.0.1 library without spatialtools merge. Merge branch 'upstream' Simplified to support spatialite library only. Updated patchset for new source structure. A few changes for using Geos 3.3. Bumping policy. Avoid relinking with the C++ binding for Geos. Fixed SONAME versioning. Updated symbol file. Avoid unuseful relinking. Merge tag 'upstream/3.0.2_20120302' Imported Upstream version 3.0.2~20120302 Updated to new upstream snapshot. Updated symbols file. Merge tag 'upstream/3.1.0_rc2' Imported Upstream version 3.1.0~rc2 Moved to 3.1.0~RC2 Removed obsolete patches. --- -- 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 annotated tag, upstream/4.0.0, created. upstream/4.0.0
The annotated tag, upstream/4.0.0 has been created at 73f1f2db615a8f0cc54bfb617633eb7c90646170 (tag) tagging 2d602f4880efbc1b46d5897eb6a181f6ada542a4 (commit) replaces upstream/3.1.0_rc2 tagged by David Paleino on Mon Nov 26 17:49:23 2012 +0100 - Shortlog Upstream version 4.0.0 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iEYEABECAAYFAlCznZMACgkQ5qqQFxOSsXTzMACfeUTO4PSDJ7J7UTI6m/q+gzI9 BQsAnRbyyW4JW51wGeM5erNe0cQSgc7V =1oEK -END PGP SIGNATURE- David Paleino (1): Imported Upstream version 4.0.0 --- -- 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 annotated tag, upstream/4.0.0_rc1, created. upstream/4.0.0_rc1
The annotated tag, upstream/4.0.0_rc1 has been created at a4ac7047c8498d2245befd03eec9b8107712232b (tag) tagging 01c49a4ade272fe160742de0479398b200b78c48 (commit) replaces upstream/3.1.0_rc2 tagged by David Paleino on Thu Oct 4 11:32:36 2012 +0200 - Shortlog Upstream version 4.0.0~rc1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iEYEABECAAYFAlBtV7QACgkQ5qqQFxOSsXSTUQCdHtcRvGPaR1u70vOb6G3zLoay aH0An1W+v2mb8VZH7pHEP5sSOG6k4Ek9 =eXxY -END PGP SIGNATURE- David Paleino (1): Imported Upstream version 4.0.0~rc1 --- -- 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-tools branch, master, updated. debian/3.1.0b-1-9-gc1684ec
The following commit has been merged in the master branch: commit 35e3273c8b110984ff5988dce130f16f8bf13ffd Merge: a20865c7025592aaa1a447aeaf84af790ee5a488 b413848948819599583ac83846461a9dc591b27c Author: David Paleino Date: Sat Dec 1 20:48:08 2012 +0100 Merge tag 'upstream/4.0.0' Upstream version 4.0.0 # gpg: Signature made sab 01 dic 2012 20:48:06 CET using DSA key ID 1392B174 # gpg: Good signature from "David Paleino " # gpg: aka "[jpeg image of size 6708]" # gpg: aka "Hanska " # gpg: aka "David Paleino " # gpg: aka "David Paleino " -- Spatialite Tools ___ 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-tools branch, master, updated. debian/3.1.0b-1-9-gc1684ec
The following commit has been merged in the master branch: commit cf00f6b1e5a56cb1386a09a10a14049b3c4b877d Author: David Paleino Date: Sat Dec 1 20:50:08 2012 +0100 New upstream version diff --git a/debian/changelog b/debian/changelog index 6379bdc..0335cc5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +spatialite-tools (4.0.0-1) UNRELEASED; urgency=low + + * New upstream version + + -- David Paleino Sat, 01 Dec 2012 20:49:26 +0100 + spatialite-tools (3.1.0b-1) unstable; urgency=low * New upstream version -- Spatialite Tools ___ 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-tools branch, master, updated. debian/3.1.0b-1-9-gc1684ec
The following commit has been merged in the master branch: commit c6c86b9e19b3ac307121e496c2e330ead3c24ea6 Author: David Paleino Date: Sat Dec 1 20:50:31 2012 +0100 Bump requirement of libspatialite to >= 4.0.0 diff --git a/debian/changelog b/debian/changelog index 0335cc5..7a6262b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ spatialite-tools (4.0.0-1) UNRELEASED; urgency=low * New upstream version + * Bump requirement of libspatialite to >= 4.0.0 - -- David Paleino Sat, 01 Dec 2012 20:49:26 +0100 + -- David Paleino Sat, 01 Dec 2012 20:50:18 +0100 spatialite-tools (3.1.0b-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 65b933a..c450b0d 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Uploaders: Build-Depends: debhelper (>= 8) , autotools-dev - , libspatialite-dev (>= 3.0.1~) + , libspatialite-dev (>= 4.0.0~) , libsqlite3-dev (>= 3.6.11) , libreadline-dev , pkg-config -- Spatialite Tools ___ 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-tools branch, master, updated. debian/3.1.0b-1-9-gc1684ec
The following commit has been merged in the master branch: commit 65e7411da55f378f34d7a85560edba51ebd716d4 Author: David Paleino Date: Sat Dec 1 20:57:15 2012 +0100 Dropped useless .install file diff --git a/debian/rules b/debian/rules index 35c52dd..35cc7f0 100755 --- a/debian/rules +++ b/debian/rules @@ -19,6 +19,3 @@ DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) versions: @echo "Spatialite full version: $(FULL_VERSION)" @echo "Spatialite version: $(LC_VERSION)" - -override_dh_install: - diff --git a/debian/spatialite-bin.install b/debian/spatialite-bin.install deleted file mode 100644 index 5f051cb..000 --- 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 -- Spatialite Tools ___ 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-tools branch, master, updated. debian/3.1.0b-1-9-gc1684ec
The following commit has been merged in the master branch: commit 0e825483694a43373ae28527c9c1a0e65d13a554 Author: David Paleino Date: Sat Dec 1 20:51:35 2012 +0100 Patches refreshed diff --git a/debian/patches/00-add_automake_foreign.patch b/debian/patches/00-add_automake_foreign.patch index c4cd633..650e240 100644 --- a/debian/patches/00-add_automake_foreign.patch +++ b/debian/patches/00-add_automake_foreign.patch @@ -10,7 +10,7 @@ Forwarded: no --- spatialite-tools.orig/Makefile.am +++ spatialite-tools/Makefile.am -@@ -45,5 +45,5 @@ EXTRA_DIST = makefile.vc nmake.opt \ +@@ -60,5 +60,5 @@ EXTRA_DIST = makefile.vc nmake.opt \ Makefile-static-Linux \ Makefile-static-MacOsX @@ -19,7 +19,7 @@ Forwarded: no --- spatialite-tools.orig/Makefile.in +++ spatialite-tools/Makefile.in -@@ -300,7 +300,7 @@ EXTRA_DIST = makefile.vc nmake.opt \ +@@ -352,7 +352,7 @@ EXTRA_DIST = makefile.vc nmake.opt \ Makefile-static-Linux \ Makefile-static-MacOsX diff --git a/debian/patches/03-fix_typos.patch b/debian/patches/03-fix_typos.patch index 18625de..897f3e8 100644 --- a/debian/patches/03-fix_typos.patch +++ b/debian/patches/03-fix_typos.patch @@ -12,7 +12,7 @@ Forwarded: no --- spatialite-tools.orig/spatialite_gml.c +++ spatialite-tools/spatialite_gml.c -@@ -1921,7 +1921,7 @@ main (int argc, char *argv[]) +@@ -1931,7 +1931,7 @@ main (int argc, char *argv[]) ret = sqlite3_backup_finish (backup); sqlite3_close (handle); handle = disk_db_handle; @@ -23,7 +23,7 @@ Forwarded: no sqlite3_close (handle); --- spatialite-tools.orig/spatialite_osm_map.c +++ spatialite-tools/spatialite_osm_map.c -@@ -1976,7 +1976,7 @@ db_vacuum (sqlite3 * db_handle) +@@ -1980,7 +1980,7 @@ db_vacuum (sqlite3 * db_handle) sqlite3_free (sql_err); return; } @@ -32,7 +32,7 @@ Forwarded: no } static void -@@ -2810,7 +2810,7 @@ main (int argc, char *argv[]) +@@ -2820,7 +2820,7 @@ main (int argc, char *argv[]) ret = sqlite3_backup_finish (backup); sqlite3_close (handle); handle = disk_db_handle; @@ -43,7 +43,7 @@ Forwarded: no /* VACUUMing */ --- spatialite-tools.orig/spatialite_osm_net.c +++ spatialite-tools/spatialite_osm_net.c -@@ -1326,7 +1326,7 @@ create_qualified_nodes (struct aux_param +@@ -1330,7 +1330,7 @@ create_qualified_nodes (struct aux_param fprintf (stderr, "COMMIT TRANSACTION error: %s\n", sql_err); sqlite3_free (sql_err); } @@ -52,7 +52,7 @@ Forwarded: no return 1; error: if (query_stmt != NULL) -@@ -1746,7 +1746,7 @@ db_vacuum (sqlite3 * handle) +@@ -1757,7 +1757,7 @@ db_vacuum (sqlite3 * handle) sqlite3_free (sql_err); return; } @@ -61,7 +61,7 @@ Forwarded: no } static int -@@ -2466,7 +2466,7 @@ main (int argc, char *argv[]) +@@ -2477,7 +2477,7 @@ main (int argc, char *argv[]) error = 1; } if (print_template (template_path, railways)) @@ -70,7 +70,7 @@ Forwarded: no template_path); return 0; } -@@ -2503,7 +2503,7 @@ main (int argc, char *argv[]) +@@ -2514,7 +2514,7 @@ main (int argc, char *argv[]) error = 1; } if (parse_template (¶ms, template_path)) @@ -79,7 +79,7 @@ Forwarded: no template_path); else return -1; -@@ -2721,7 +2721,7 @@ main (int argc, char *argv[]) +@@ -2732,7 +2732,7 @@ main (int argc, char *argv[]) ret = sqlite3_backup_finish (backup); sqlite3_close (handle); handle = disk_handle; @@ -90,7 +90,7 @@ Forwarded: no db_vacuum (handle); --- spatialite-tools.orig/spatialite_osm_raw.c +++ spatialite-tools/spatialite_osm_raw.c -@@ -1204,7 +1204,7 @@ main (int argc, char *argv[]) +@@ -1214,7 +1214,7 @@ main (int argc, char *argv[]) ret = sqlite3_backup_finish (backup); sqlite3_close (handle); handle = disk_db_handle; -- Spatialite Tools ___ 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-tools branch, master, updated. debian/3.1.0b-1-9-gc1684ec
The following commit has been merged in the master branch: commit 9f76cfec492ed092b43a45d3d89b1429f0bb85b7 Author: David Paleino Date: Sat Dec 1 21:04:32 2012 +0100 Fix more typos diff --git a/debian/patches/03-fix_typos.patch b/debian/patches/03-fix_typos.patch index 897f3e8..4290640 100644 --- a/debian/patches/03-fix_typos.patch +++ b/debian/patches/03-fix_typos.patch @@ -4,11 +4,13 @@ Origin: vendor Forwarded: no --- + shell.c |2 +- + spatialite_convert.c |2 +- spatialite_gml.c |2 +- spatialite_osm_map.c |4 ++-- spatialite_osm_net.c | 10 +- spatialite_osm_raw.c |2 +- - 4 files changed, 9 insertions(+), 9 deletions(-) + 6 files changed, 11 insertions(+), 11 deletions(-) --- spatialite-tools.orig/spatialite_gml.c +++ spatialite-tools/spatialite_gml.c @@ -99,3 +101,25 @@ Forwarded: no } /* closing the DB connection */ +--- spatialite-tools.orig/shell.c spatialite-tools/shell.c +@@ -2579,7 +2579,7 @@ static int do_meta_command(char *zLine, + { + int cnt1 = sqlite3_total_changes(p->db); + if (cnt1 > cnt0) +- fprintf(stderr, "SpatialTable \"%s\" succesfully removed\n", azArg[1]); ++ fprintf(stderr, "SpatialTable \"%s\" successfully removed\n", azArg[1]); + else + fprintf(stderr, "SpatialTable \"%s\" seems not to exist\n", azArg[1]); + } +--- spatialite-tools.orig/spatialite_convert.c spatialite-tools/spatialite_convert.c +@@ -7025,7 +7025,7 @@ main (int argc, char *argv[]) + sqlite3_free (sql_err); + goto stop; + } +-printf ("\tDB-file succesfully converted !!!\n\n"); ++printf ("\tDB-file successfully converted !!!\n\n"); + goto end; + + /* closing the DB */ -- Spatialite Tools ___ 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-tools branch, master, updated. debian/3.1.0b-1-9-gc1684ec
The following commit has been merged in the master branch: commit c1684ec95279deeeb60ccc90a53d6dcaeee603b9 Author: David Paleino Date: Sat Dec 1 21:18:29 2012 +0100 Releasing to experimental diff --git a/debian/changelog b/debian/changelog index 057b871..7aedd51 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -spatialite-tools (4.0.0-1) UNRELEASED; urgency=low +spatialite-tools (4.0.0-1) experimental; urgency=low * New upstream version * Bump requirement of libspatialite to >= 4.0.0 * Added hardening instructions to debian/rules - -- David Paleino Sat, 01 Dec 2012 21:15:46 +0100 + -- David Paleino Sat, 01 Dec 2012 21:18:10 +0100 spatialite-tools (3.1.0b-1) unstable; urgency=low -- Spatialite Tools ___ 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-tools branch, master, updated. debian/3.1.0b-1-9-gc1684ec
The following commit has been merged in the master branch: commit de45e28a8c37a2d28b5c94c05b907fda621a3c92 Author: David Paleino Date: Sat Dec 1 21:15:57 2012 +0100 Added hardening instructions to debian/rules diff --git a/debian/changelog b/debian/changelog index 7a6262b..057b871 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ spatialite-tools (4.0.0-1) UNRELEASED; urgency=low * New upstream version * Bump requirement of libspatialite to >= 4.0.0 + * Added hardening instructions to debian/rules - -- David Paleino Sat, 01 Dec 2012 20:50:18 +0100 + -- David Paleino Sat, 01 Dec 2012 21:15:46 +0100 spatialite-tools (3.1.0b-1) unstable; urgency=low diff --git a/debian/control b/debian/control index c450b0d..98095e5 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,7 @@ Uploaders: Build-Depends: debhelper (>= 8) , autotools-dev + , hardening-includes , libspatialite-dev (>= 4.0.0~) , libsqlite3-dev (>= 3.6.11) , libreadline-dev diff --git a/debian/rules b/debian/rules index 35cc7f0..d49d617 100755 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,13 @@ #export DH_VERBOSE=1 # This has to be exported to make some magic below work. -export DH_OPTIONS +#export DH_OPTIONS + +include /usr/share/hardening-includes/hardening.make +CFLAGS = $(shell dpkg-buildflags --get CFLAGS) +LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) +CFLAGS += $(HARDENING_CFLAGS) +LDFLAGS += $(HARDENING_LDFLAGS) FULL_VERSION := $(shell dpkg-parsechangelog | grep ^Version | cut -d' ' -f2 | cut -d- -f1) VERSION := $(shell echo $(FULL_VERSION) | sed -e "s/~beta[[:digit:]]\+/-BETA/") -- Spatialite Tools ___ 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-tools annotated tag, debian/4.0.0-1, created. debian/4.0.0-1
The annotated tag, debian/4.0.0-1 has been created at b7b22ae17dc103b3f1a469b0fb21ad5d7f361286 (tag) tagging c1684ec95279deeeb60ccc90a53d6dcaeee603b9 (commit) replaces debian/3.1.0b-1 tagged by David Paleino on Sat Dec 1 21:22:10 2012 +0100 - Shortlog Debian release -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iEYEABECAAYFAlC6ZvIACgkQ5qqQFxOSsXSG6QCgsKIN2UcxaGA0XFp1Jm8Yddtt Ar0AnjnIN2SVT84rnX0Z6PSNwlWkGXjD =PD8X -END PGP SIGNATURE- David Paleino (9): Imported Upstream version 4.0.0 Merge tag 'upstream/4.0.0' New upstream version Bump requirement of libspatialite to >= 4.0.0 Patches refreshed Dropped useless .install file Fix more typos Added hardening instructions to debian/rules Releasing to experimental --- -- Spatialite Tools ___ 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-tools annotated tag, upstream/4.0.0, created. upstream/4.0.0
The annotated tag, upstream/4.0.0 has been created at 015a356579970b0bf2aec8e148f97de020f7de61 (tag) tagging b413848948819599583ac83846461a9dc591b27c (commit) replaces upstream/3.1.0b tagged by David Paleino on Sat Dec 1 20:48:06 2012 +0100 - Shortlog Upstream version 4.0.0 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iEYEABECAAYFAlC6XvYACgkQ5qqQFxOSsXR7PQCgg4NJAkaJWjkJTZugFZJHxa5f i8IAniAVsZRUMhhDsUzxxuL3VvaC81gh =FMyh -END PGP SIGNATURE- David Paleino (1): Imported Upstream version 4.0.0 --- -- Spatialite Tools ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Processing of spatialite-tools_4.0.0-1_i386.changes
spatialite-tools_4.0.0-1_i386.changes uploaded successfully to localhost along with the files: spatialite-tools_4.0.0-1.dsc spatialite-tools_4.0.0.orig.tar.gz spatialite-tools_4.0.0-1.debian.tar.gz spatialite-bin_4.0.0-1_i386.deb Greetings, Your Debian queue daemon (running on host franck.debian.org) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
spatialite-tools_4.0.0-1_i386.changes ACCEPTED into experimental
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Format: 1.8 Date: Sat, 01 Dec 2012 21:18:10 +0100 Source: spatialite-tools Binary: spatialite-bin Architecture: source i386 Version: 4.0.0-1 Distribution: experimental Urgency: low Maintainer: Debian GIS Project Changed-By: David Paleino Description: spatialite-bin - Geospatial extension for SQLite - tools Changes: spatialite-tools (4.0.0-1) experimental; urgency=low . * New upstream version * Bump requirement of libspatialite to >= 4.0.0 * Added hardening instructions to debian/rules Checksums-Sha1: 37f0916d79130ccf7597bbe971d16ca3322eb945 1600 spatialite-tools_4.0.0-1.dsc ab70abdc487a869252b0042f51813c6ff6ffdadb 471952 spatialite-tools_4.0.0.orig.tar.gz 50a50cc6e6becb19eaa1f7259f9413b4dfe7bcc1 6258 spatialite-tools_4.0.0-1.debian.tar.gz d882d84292d6f85d30d2b18dae33ff9fed9f1175 166596 spatialite-bin_4.0.0-1_i386.deb Checksums-Sha256: 411caf2105c4f62dcf43e7ebe64f714c0f694d35844e21ea00715bdd8ac02501 1600 spatialite-tools_4.0.0-1.dsc b504697b63b92f4cd181a3db93b4997ffe5d2ddbda69421818c804e8ea911948 471952 spatialite-tools_4.0.0.orig.tar.gz 8bc0c96bd1ab37319a2f042783ca6f96ff09713acadde2d004eddec23bf513d5 6258 spatialite-tools_4.0.0-1.debian.tar.gz 7b96a19404c44474123e3b80628eea4d46e2315bb6e7c591eb754d82f14c7b2b 166596 spatialite-bin_4.0.0-1_i386.deb Files: 38b782862de06fc59d84ef4d2c0fd0ac 1600 science extra spatialite-tools_4.0.0-1.dsc 2eab56d3a91ae872d985e32a3623ec6f 471952 science extra spatialite-tools_4.0.0.orig.tar.gz 9be9f0f66144fa8eeb4fd539535e32eb 6258 science extra spatialite-tools_4.0.0-1.debian.tar.gz 06977d92d3b499aee967ff4f3b0a02f1 166596 science extra spatialite-bin_4.0.0-1_i386.deb -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iEYEARECAAYFAlC6ZqIACgkQ5qqQFxOSsXT2MQCgyKkwS85cdSnxu+rdEPcmZ9I8 PkwAoIaVqbBbFzO6AHqe4geDuVhJO+Vi =i65D -END PGP SIGNATURE- Thank you for your contribution to Debian. ___ 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-gui annotated tag, debian/1.6.0-1, created. debian/1.6.0-1
The annotated tag, debian/1.6.0-1 has been created at 46e1d9a5def9c02fdc3681927b4232799be37747 (tag) tagging 4d595b56f3f502ab0bedcdb68ccf8848b08435e3 (commit) replaces debian/1.5.0-1 tagged by David Paleino on Sat Dec 1 22:03:23 2012 +0100 - Shortlog Debian release -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iEYEABECAAYFAlC6cJsACgkQ5qqQFxOSsXQGwACeKvQ6Iiq/9fUQcEAB4ZCq9V3y MFMAn2u59Kk9C6G+Ej8FqnFaPE9wztuF =WuFL -END PGP SIGNATURE- David Paleino (12): Updated 00-fix_build.patch to include debugging symbols during compilation Merge branch 'experimental/master' Imported Upstream version 1.6.0 Merge tag 'upstream/1.6.0' New upstream version Fix changelog Patch removed Patches refreshed Bump requirement on libspatialite to >= 4.0.0 Fix linking to geos_c One more typo Uploading to experimental Francesco Paolo Lovergine (3): Fixed #663646 Re-added geos_c linking. Re-added proj linking. --- -- user-friendly graphical user interface for spatialite ___ 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-gui annotated tag, upstream/1.6.0, created. upstream/1.6.0
The annotated tag, upstream/1.6.0 has been created at 948569c9b405d34fdb020cbf9f3ab545b3cdd90a (tag) tagging d9108a16b7e9dd5118c92acf05e34b04bef21f73 (commit) replaces upstream/1.5.0 tagged by David Paleino on Sat Dec 1 21:28:11 2012 +0100 - Shortlog Upstream version 1.6.0 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iEYEABECAAYFAlC6aFsACgkQ5qqQFxOSsXSmrwCeLLAQJO6jtvrNWb3o3v8CLkVN 6UUAoIwsItVByIhzfynZAUUyTP3xozX1 =f2iP -END PGP SIGNATURE- David Paleino (1): Imported Upstream version 1.6.0 --- -- user-friendly graphical user interface for spatialite ___ 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-gui branch, master, updated. debian/1.6.0-1
The following commit has been merged in the master branch: commit 4976388c7c3aff65d799746389470d04d2f6c4ac Merge: 9d0a7625a32005ba16e413fcc8a7e90e6be936f1 50204837a0494efd07f3a49979d5a5402a66dbed Author: David Paleino Date: Sat Dec 1 21:27:12 2012 +0100 Merge branch 'experimental/master' Conflicts: debian/changelog diff --combined debian/changelog index d46e89a,7fe9f2b..bf4caa2 --- a/debian/changelog +++ b/debian/changelog @@@ -1,17 -1,13 +1,27 @@@ + spatialite-gui (1.5.0-1) experimental; urgency=low + + * New upstream version (Closes: #689192) + * Add missing Build-Depends on libgaiagraphics-dev and libfreexl-dev + * Bumped debhelper compatibility to 9 + * Standards-Version bump to 3.9.4, no changes needed + * Updated debian/copyright + + -- David Paleino Sun, 30 Sep 2012 16:30:32 +0200 + +spatialite-gui (1.2.1-4) UNRELEASED; urgency=low + + * Updated 00-fix_build.patch to include debugging symbols during +compilation + + -- David Paleino Sun, 30 Sep 2012 21:22:48 +0200 + +spatialite-gui (1.2.1-3) unstable; urgency=low + + * Fixed FTBS due to relinking in Makefile-linux and the new geos lib. +(closes: #663646) + + -- Francesco Paolo Lovergine Tue, 13 Mar 2012 00:20:05 +0100 + spatialite-gui (1.2.1-2) unstable; urgency=low * Fix package description, be more verbose. -- user-friendly graphical user interface for spatialite ___ 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-gui branch, master, updated. debian/1.6.0-1
The following commit has been merged in the master branch: commit eb0b1cc838c5b3b937b8efb276c110db2179d4e1 Merge: 4976388c7c3aff65d799746389470d04d2f6c4ac d9108a16b7e9dd5118c92acf05e34b04bef21f73 Author: David Paleino Date: Sat Dec 1 21:28:11 2012 +0100 Merge tag 'upstream/1.6.0' Upstream version 1.6.0 # gpg: Signature made sab 01 dic 2012 21:28:11 CET using DSA key ID 1392B174 # gpg: Good signature from "David Paleino " # gpg: aka "[jpeg image of size 6708]" # gpg: aka "Hanska " # gpg: aka "David Paleino " # gpg: aka "David Paleino " -- user-friendly graphical user interface for spatialite ___ 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-gui branch, master, updated. debian/1.6.0-1
The following commit has been merged in the master branch: commit 9ea9de8bb3443e1a8a133dd48f438ff76581fd92 Author: David Paleino Date: Sat Dec 1 21:28:25 2012 +0100 New upstream version diff --git a/debian/changelog b/debian/changelog index bf4caa2..706561c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +spatialite-gui (1.6.0-1) UNRELEASED; urgency=low + + * New upstream version + + -- David Paleino Sat, 01 Dec 2012 21:28:15 +0100 + spatialite-gui (1.5.0-1) experimental; urgency=low * New upstream version (Closes: #689192) -- user-friendly graphical user interface for spatialite ___ 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-gui branch, master, updated. debian/1.6.0-1
The following commit has been merged in the master branch: commit 8486bf9bbeee3c9483e5e479f1bce1238c149804 Author: David Paleino Date: Sat Dec 1 21:28:46 2012 +0100 Fix changelog diff --git a/debian/changelog b/debian/changelog index 706561c..edfd2d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ spatialite-gui (1.6.0-1) UNRELEASED; urgency=low * New upstream version + * Updated 00-fix_build.patch to include debugging symbols during +compilation -- David Paleino Sat, 01 Dec 2012 21:28:15 +0100 @@ -14,13 +16,6 @@ spatialite-gui (1.5.0-1) experimental; urgency=low -- David Paleino Sun, 30 Sep 2012 16:30:32 +0200 -spatialite-gui (1.2.1-4) UNRELEASED; urgency=low - - * Updated 00-fix_build.patch to include debugging symbols during -compilation - - -- David Paleino Sun, 30 Sep 2012 21:22:48 +0200 - spatialite-gui (1.2.1-3) unstable; urgency=low * Fixed FTBS due to relinking in Makefile-linux and the new geos lib. -- user-friendly graphical user interface for spatialite ___ 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-gui branch, master, updated. debian/1.6.0-1
The following commit has been merged in the master branch: commit 8ec7011446a4ff32b65a135d23ba8a736639e6f6 Author: David Paleino Date: Sat Dec 1 21:29:39 2012 +0100 Patch removed diff --git a/debian/changelog b/debian/changelog index edfd2d1..94c8480 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,6 @@ spatialite-gui (1.6.0-1) UNRELEASED; urgency=low * New upstream version - * Updated 00-fix_build.patch to include debugging symbols during -compilation -- David Paleino Sat, 01 Dec 2012 21:28:15 +0100 diff --git a/debian/patches/00-fix_build.patch b/debian/patches/00-fix_build.patch deleted file mode 100644 index d9547a3..000 --- a/debian/patches/00-fix_build.patch +++ /dev/null @@ -1,42 +0,0 @@ -From: David Paleino -Subject: fix buildsystem -Forwarded: no - - Makefile-linux | 16 +++- - 1 file changed, 7 insertions(+), 9 deletions(-) - spatialite-gui.orig/Makefile-linux -+++ spatialite-gui/Makefile-linux -@@ -6,24 +6,22 @@ SRC = Main.cpp TableTree.cpp QueryView.c - MetadataInit.cpp - OBJ = Main.o TableTree.o QueryView.o ResultSetView.o BlobExplorer.o Dialogs.o \ - Shapefiles.o Network.o Exif.o TextCsv.o Objects.o MetadataInit.o --EXE = ./bin/spatialite-gui -+EXE = spatialite-gui - INCLUDE = Classdef.h - - # Define default flags: --CXXFLAGS = $(shell wx-config --cxxflags) --LIB = $(shell wx-config --libs) -lgeotiff -+CXXFLAGS = $(shell wx-config --cxxflags) -g -+LIB = $(shell wx-config --libs) \ -+ -lspatialite -lgeos_c -lproj -lrasterlite -lsqlite3 - EXTRAFLAGS = -Wall -Wextra -Wno-ctor-dtor-privacy \ -- -fno-strict-aliasing -I/usr/local/include -D_LARGE_FILE=1 \ -+ -fno-strict-aliasing -I/usr/include -D_LARGE_FILE=1 \ - -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1 --EXTRALIBS = /usr/local/lib/libspatialite.a /usr/local/lib/libgeos_c.a \ -- /usr/local/lib/libgeos.a /usr/local/lib/libproj.a \ -- /usr/local/lib/librasterlite.a /usr/local/lib/libgeotiff.a -+EXTRALIBS = - - all: $(EXE) - --$(EXE): $(OBJ) $(EXTRALIBS) -+$(EXE): $(OBJ) - $(CXX) $(OBJ) -o $(EXE) $(LIB) $(EXTRALIBS) -- strip --strip-all $(EXE) - - clean : - $(RM) $(OBJ) $(EXE) -- user-friendly graphical user interface for spatialite ___ 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-gui branch, master, updated. debian/1.6.0-1
The following commit has been merged in the master branch: commit 30947f477fbdd3cbbfee612106496177eab0aa23 Author: David Paleino Date: Sat Dec 1 21:34:10 2012 +0100 Bump requirement on libspatialite to >= 4.0.0 diff --git a/debian/changelog b/debian/changelog index 94c8480..c263713 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ spatialite-gui (1.6.0-1) UNRELEASED; urgency=low * New upstream version + * Bump requirement on libspatialite to >= 4.0.0 - -- David Paleino Sat, 01 Dec 2012 21:28:15 +0100 + -- David Paleino Sat, 01 Dec 2012 21:33:58 +0100 spatialite-gui (1.5.0-1) experimental; urgency=low diff --git a/debian/control b/debian/control index 37a93cd..0582dc7 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 9~) , wx-common , wx2.8-headers , libwxgtk2.8-dev - , libspatialite-dev + , libspatialite-dev (>= 4.0.0) , libproj-dev , libgeos-dev , librasterlite-dev -- user-friendly graphical user interface for spatialite ___ 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-gui branch, master, updated. debian/1.6.0-1
The following commit has been merged in the master branch: commit d8e21af115ed637ba95fc0c4fc6ada2b542c1636 Author: David Paleino Date: Sat Dec 1 21:32:52 2012 +0100 Patches refreshed diff --git a/debian/patches/00-fix_buildsystem.patch b/debian/patches/00-fix_buildsystem.patch new file mode 100644 index 000..d9e8709 --- /dev/null +++ b/debian/patches/00-fix_buildsystem.patch @@ -0,0 +1,25 @@ +From: David Paleino +Subject: fix buildsystem +Origin: vendor +Forwarded: no + +--- + configure.ac |2 +- + m4/.gitignore |1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +--- spatialite-gui.orig/configure.ac spatialite-gui/configure.ac +@@ -6,7 +6,7 @@ AC_INIT(spatialite_gui, 1.6.0, a.furieri + AC_LANG(C) + AC_CONFIG_MACRO_DIR([m4]) + +-AM_INIT_AUTOMAKE ++AM_INIT_AUTOMAKE([foreign]) + AM_MAINTAINER_MODE + AM_CONFIG_HEADER(config.h) + +--- /dev/null spatialite-gui/m4/.gitignore +@@ -0,0 +1 @@ ++# empty dir to make "autoreconf" work diff --git a/debian/patches/00-fix_geos_linking.patch b/debian/patches/00-fix_geos_linking.patch deleted file mode 100644 index b46811e..000 --- a/debian/patches/00-fix_geos_linking.patch +++ /dev/null @@ -1,47 +0,0 @@ -From: David Paleino -Subject: don't try to link to the C++ version of libgeos -Origin: vendor -Forwarded: no - - configure.ac | 10 +- - m4/.gitignore |1 + - 2 files changed, 6 insertions(+), 5 deletions(-) - spatialite-gui.orig/configure.ac -+++ spatialite-gui/configure.ac -@@ -6,7 +6,7 @@ AC_INIT(spatialite_gui, 1.5.0-stable, a. - AC_LANG(C) - AC_CONFIG_MACRO_DIR([m4]) - --AM_INIT_AUTOMAKE -+AM_INIT_AUTOMAKE([foreign]) - AM_MAINTAINER_MODE - - # Checks for programs. -@@ -55,17 +55,17 @@ AC_FUNC_STRFTIME - AC_CHECK_FUNCS([memset sqrt strcasecmp strerror strncasecmp strstr fdatasync ftruncate getcwd gettimeofday localtime_r memmove strerror]) - - AC_CHECK_LIB(proj,pj_init_plus,,AC_MSG_ERROR(['libproj' is required but it doesn't seem to be installed on this system.]),-lm) --AC_CHECK_LIB(geos_c,GEOSTopologyPreserveSimplify,,AC_MSG_ERROR(['libgeos_c' is required but it doesn't seem to be installed on this system.]),-lm -lgeos) -+AC_CHECK_LIB(geos_c,GEOSTopologyPreserveSimplify,,AC_MSG_ERROR(['libgeos_c' is required but it doesn't seem to be installed on this system.]),-lm -lgeos_c) - --PKG_CHECK_MODULES([LIBGAIAGRAPHICS], [gaiagraphics], , AC_MSG_ERROR(['libgaiagraphics' is required but it doesn't seem to be installed on this system.])) -+PKG_CHECK_MODULES([LIBGAIAGRAPHICS], [gaiagraphics], [], AC_MSG_ERROR(['libgaiagraphics' is required but it doesn't seem to be installed on this system.])) - AC_SUBST(LIBGAIAGRAPHICS_CFLAGS) - AC_SUBST(LIBGAIAGRAPHICS_LIBS) - --PKG_CHECK_MODULES([LIBFREEXL], [freexl], , AC_MSG_ERROR(['libfreexl' is required but it doesn't seem to be installed on this system.])) -+PKG_CHECK_MODULES([LIBFREEXL], [freexl], [], AC_MSG_ERROR(['libfreexl' is required but it doesn't seem to be installed on this system.])) - AC_SUBST(LIBFREEXL_CFLAGS) - AC_SUBST(LIBFREEXL_LIBS) - --PKG_CHECK_MODULES([LIBSPATIALITE], [spatialite], , AC_MSG_ERROR(['libspatialite' is required but it doesn't seem to be installed on this system.])) -+PKG_CHECK_MODULES([LIBSPATIALITE], [spatialite], [], AC_MSG_ERROR(['libspatialite' is required but it doesn't seem to be installed on this system.])) - AC_SUBST(LIBSPATIALITE_CFLAGS) - AC_SUBST(LIBSPATIALITE_LIBS) - /dev/null -+++ spatialite-gui/m4/.gitignore -@@ -0,0 +1 @@ -+# empty dir to make "autoreconf" work diff --git a/debian/patches/01-fix_binary_name.patch b/debian/patches/01-fix_binary_name.patch index a32aedf..f9b79fd 100644 --- a/debian/patches/01-fix_binary_name.patch +++ b/debian/patches/01-fix_binary_name.patch @@ -10,23 +10,22 @@ Forwarded: no --- spatialite-gui.orig/Makefile.am +++ spatialite-gui/Makefile.am -@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I m4 - CXXFLAGS += @LIBGAIAGRAPHICS_CFLAGS@ @LIBSPATIALITE_CFLAGS@ \ - @LIBFREEXL_CFLAGS@ +@@ -1,6 +1,6 @@ + ACLOCAL_AMFLAGS = -I m4 -bin_PROGRAMS = spatialite_gui +bin_PROGRAMS = spatialite-gui INCLUDES = @CFLAGS@ - + INCLUDES += -I$(top_srcdir) --- spatialite-gui.orig/configure.ac +++ spatialite-gui/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) --AC_INIT(spatialite_gui, 1.5.0-stable, a.furi...@lqt.it) -+AC_INIT(spatialite-gui, 1.5.0-stable, a.furi...@lqt.it) +-AC_INIT(spatialite_gui, 1.6.0, a.furi...@lqt.it) ++AC_INIT(spatialite-gui, 1.6.0, a.furi...@lqt.it) AC_LANG(C) AC_CONFIG_MACRO_DIR([m4]) diff --git a/debian/patches/02-fix_typos.patch b/debian/patches/02-fix_typos.patch index fb689f3..edc5db9 100644 --- a/debian/patches/02-fix_typos.patch +++ b/debian/patches/02-fix_typos.patch @@ -25,7 +25,7 @@ Forwarded: no InitTableTree(); --- spatialite-gui.orig/Dialogs.cpp +++ spatialite-gui/Dialogs.cpp -@@ -3837,7 +3837,7 @@ void AutoSaveDialog::OnChangePath(wxComm +@@ -4326,7 +4326,7
[SCM] spatialite-gui branch, master, updated. debian/1.6.0-1
The following commit has been merged in the master branch: commit f24e7fe4af0e2750479f7b337c33e821518e72d1 Author: David Paleino Date: Sat Dec 1 21:47:22 2012 +0100 Fix linking to geos_c diff --git a/debian/patches/00-fix_buildsystem.patch b/debian/patches/00-fix_buildsystem.patch index d9e8709..ebb1ee2 100644 --- a/debian/patches/00-fix_buildsystem.patch +++ b/debian/patches/00-fix_buildsystem.patch @@ -4,9 +4,10 @@ Origin: vendor Forwarded: no --- + Makefile.am |2 +- configure.ac |2 +- m4/.gitignore |1 + - 2 files changed, 2 insertions(+), 1 deletion(-) + 3 files changed, 3 insertions(+), 2 deletions(-) --- spatialite-gui.orig/configure.ac +++ spatialite-gui/configure.ac @@ -23,3 +24,14 @@ Forwarded: no +++ spatialite-gui/m4/.gitignore @@ -0,0 +1 @@ +# empty dir to make "autoreconf" work +--- spatialite-gui.orig/Makefile.am spatialite-gui/Makefile.am +@@ -13,7 +13,7 @@ spatialite_gui_SOURCES = Classdef.h Blob + TextCsv.cpp + + LDADD = @WX_LIBS@ @LIBGAIAGRAPHICS_LIBS@ @LIBSPATIALITE_LIBS@ \ +- @LIBFREEXL_LIBS@ ++ @LIBFREEXL_LIBS@ -lgeos_c + + EXTRA_DIST = Makefile-static-MinGW \ + Makefile-static-Linux \ -- user-friendly graphical user interface for spatialite ___ 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-gui branch, master, updated. debian/1.6.0-1
The following commit has been merged in the master branch: commit 2c42dcda25d837504e7e343b0afe6091bad29fff Author: David Paleino Date: Sat Dec 1 21:55:16 2012 +0100 One more typo diff --git a/debian/patches/02-fix_typos.patch b/debian/patches/02-fix_typos.patch index edc5db9..213023a 100644 --- a/debian/patches/02-fix_typos.patch +++ b/debian/patches/02-fix_typos.patch @@ -7,8 +7,8 @@ Forwarded: no Exif.cpp |4 ++-- Main.cpp | 12 ++-- MalformedGeoms.cpp |2 +- - TableTree.cpp |2 +- - 5 files changed, 11 insertions(+), 11 deletions(-) + TableTree.cpp |4 ++-- + 5 files changed, 12 insertions(+), 12 deletions(-) --- spatialite-gui.orig/Exif.cpp +++ spatialite-gui/Exif.cpp @@ -107,3 +107,12 @@ Forwarded: no wxOK | wxICON_INFORMATION, this); else wxMessageBox(wxT("ERROR: unable to recover Spatial Index idx_") + +@@ -3078,7 +3078,7 @@ void MyTableTree::OnCmdRepairPolygons(wx + if (count > 0) + { + char str[256]; +- sprintf(str, "%d Geometries were succesfully updated", count); ++ sprintf(str, "%d Geometries were successfully updated", count); + wxMessageBox(wxString::FromUTF8(str), wxT("spatialite_gui"), +wxOK | wxICON_INFORMATION, this); + ::wxEndBusyCursor(); -- user-friendly graphical user interface for spatialite ___ 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-gui branch, master, updated. debian/1.6.0-1
The following commit has been merged in the master branch: commit 4d595b56f3f502ab0bedcdb68ccf8848b08435e3 Author: David Paleino Date: Sat Dec 1 21:55:30 2012 +0100 Uploading to experimental diff --git a/debian/changelog b/debian/changelog index c263713..408b84a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -spatialite-gui (1.6.0-1) UNRELEASED; urgency=low +spatialite-gui (1.6.0-1) experimental; urgency=low * New upstream version * Bump requirement on libspatialite to >= 4.0.0 - -- David Paleino Sat, 01 Dec 2012 21:33:58 +0100 + -- David Paleino Sat, 01 Dec 2012 21:55:23 +0100 spatialite-gui (1.5.0-1) experimental; urgency=low -- user-friendly graphical user interface for spatialite ___ 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-gui branch, pristine-tar, updated. f1659b251a3166a4f379c1af5d967463aa68cd6b
The following commit has been merged in the pristine-tar branch: commit f1659b251a3166a4f379c1af5d967463aa68cd6b Author: David Paleino Date: Sat Dec 1 21:28:11 2012 +0100 pristine-tar data for spatialite-gui_1.6.0.orig.tar.gz diff --git a/spatialite-gui_1.6.0.orig.tar.gz.delta b/spatialite-gui_1.6.0.orig.tar.gz.delta new file mode 100644 index 000..7c88acc Binary files /dev/null and b/spatialite-gui_1.6.0.orig.tar.gz.delta differ diff --git a/spatialite-gui_1.6.0.orig.tar.gz.id b/spatialite-gui_1.6.0.orig.tar.gz.id new file mode 100644 index 000..cc383c4 --- /dev/null +++ b/spatialite-gui_1.6.0.orig.tar.gz.id @@ -0,0 +1 @@ +9f8e22a05c4c4972621752134ce6eb815c2bb814 -- user-friendly graphical user interface for spatialite ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Processing of spatialite-gui_1.6.0-1_i386.changes
spatialite-gui_1.6.0-1_i386.changes uploaded successfully to localhost along with the files: spatialite-gui_1.6.0-1.dsc spatialite-gui_1.6.0.orig.tar.gz spatialite-gui_1.6.0-1.debian.tar.gz spatialite-gui_1.6.0-1_i386.deb spatialite-gui-dbg_1.6.0-1_i386.deb Greetings, Your Debian queue daemon (running on host franck.debian.org) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Processed: closing 689256
Processing commands for cont...@bugs.debian.org: > close 689256 Bug #689256 [spatialite-gui] spatialite-gui: Please update the watch file Marked Bug as done > fixed 689256 1.6.0-1 Bug #689256 {Done: David Paleino } [spatialite-gui] spatialite-gui: Please update the watch file There is no source info for the package 'spatialite-gui' at version '1.6.0-1' with architecture '' Unable to make a source version for version '1.6.0-1' Marked as fixed in versions 1.6.0-1. > thanks Stopping processing here. Please contact me if you need assistance. -- 689256: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=689256 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
spatialite-gui_1.6.0-1_i386.changes ACCEPTED into experimental
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Format: 1.8 Date: Sat, 01 Dec 2012 21:55:23 +0100 Source: spatialite-gui Binary: spatialite-gui spatialite-gui-dbg Architecture: source i386 Version: 1.6.0-1 Distribution: experimental Urgency: low Maintainer: Debian GIS Project Changed-By: David Paleino Description: spatialite-gui - user-friendly graphical user interface for SpatiaLite spatialite-gui-dbg - user-friendly graphical user interface for spatialite - debugging Changes: spatialite-gui (1.6.0-1) experimental; urgency=low . * New upstream version * Bump requirement on libspatialite to >= 4.0.0 Checksums-Sha1: 6a0d070997541d7caa63288beb88c3f7caa54dd8 1554 spatialite-gui_1.6.0-1.dsc d06944273b1e19cdd5c17a463582e074f8548ccd 1048707 spatialite-gui_1.6.0.orig.tar.gz d235f0689cebc04bf0c0a2bad35c9198ea56b96f 4483 spatialite-gui_1.6.0-1.debian.tar.gz f3f030d3702fd36baa5afa00b123921fb459bf35 611952 spatialite-gui_1.6.0-1_i386.deb baf61df04d6f0022141f53a405bc453fc9921822 2049348 spatialite-gui-dbg_1.6.0-1_i386.deb Checksums-Sha256: 31a02b0f321254bb139b6e27f00243ec7f8f4e4ec69b53b9c4432769baa3dba5 1554 spatialite-gui_1.6.0-1.dsc 57a566b34f8e7394e1de44d26b0a06496a51cea07692fb26162cd247d066a82c 1048707 spatialite-gui_1.6.0.orig.tar.gz 3022a87eaca9f833e387f595ad1d360c4577276d365ebf682794f7644e5ed40c 4483 spatialite-gui_1.6.0-1.debian.tar.gz 77d6a2fcefd94024d0570cffc9678218f8b8c2d186ed9becc6166325001fc9f7 611952 spatialite-gui_1.6.0-1_i386.deb 67357c53b6ba20c03ff26676f5a36bca9fb1208391b8ce7e91b26268f9bd6b5b 2049348 spatialite-gui-dbg_1.6.0-1_i386.deb Files: 5a7b1e5b30970f268d78ec50071717ac 1554 utils extra spatialite-gui_1.6.0-1.dsc 8d0e3502168f9a1a597d788b6dbfd4ef 1048707 utils extra spatialite-gui_1.6.0.orig.tar.gz fba4f31f09f9f7099803671c795fbe9e 4483 utils extra spatialite-gui_1.6.0-1.debian.tar.gz 2e676f4edc6ac8d18d98220e2e0d36cd 611952 utils extra spatialite-gui_1.6.0-1_i386.deb 9781758e7a3f6609a953d51d9f75dd6e 2049348 debug extra spatialite-gui-dbg_1.6.0-1_i386.deb -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iEYEARECAAYFAlC6cBkACgkQ5qqQFxOSsXQr8ACdEk6JS9DYn71PZuSJb2+SE6qF VuYAoMHuTxZKQu1S/KFUpw1X3aCzZTLm =XdJA -END PGP SIGNATURE- Thank you for your contribution to Debian. ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Processing of spatialite_4.0.0-1_i386.changes
spatialite_4.0.0-1_i386.changes uploaded successfully to localhost along with the files: spatialite_4.0.0-1.dsc spatialite_4.0.0.orig.tar.gz spatialite_4.0.0-1.debian.tar.gz libspatialite5_4.0.0-1_i386.deb libspatialite-dev_4.0.0-1_i386.deb libspatialite5-dbg_4.0.0-1_i386.deb Greetings, Your Debian queue daemon (running on host franck.debian.org) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
spatialite_4.0.0-1_i386.changes is NEW
Your package contains new components which requires manual editing of the override file. It is ok otherwise, so please be patient. New packages are usually added to the override file about once a week. ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel