The following commit has been merged in the master branch: commit c659529b4e54b4ed3807760c11923c488ae5cac6 Author: Francesco Paolo Lovergine <fran...@debian.org> Date: Wed Feb 22 11:17:30 2012 +0100
Patchset updated for 3.0.1 diff --git a/debian/changelog b/debian/changelog index c166c84..bb4bf99 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,10 @@ spatialite (3.0.1-1) unstable; urgency=low * 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. - -- Francesco Paolo Lovergine <fran...@debian.org> Fri, 17 Feb 2012 12:40:24 +0100 + -- Francesco Paolo Lovergine <fran...@debian.org> Wed, 22 Feb 2012 11:11:10 +0100 spatialite (3.0.0~beta20110817-3) unstable; urgency=low diff --git a/debian/patches/00-add_automake_foreign.patch b/debian/patches/00-add_automake_foreign.patch index 7c0aa76..ef098d1 100644 --- a/debian/patches/00-add_automake_foreign.patch +++ b/debian/patches/00-add_automake_foreign.patch @@ -10,39 +10,47 @@ Forwarded: no spatialite-tools/Makefile.in | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) ---- spatialite.orig/libspatialite/Makefile.am -+++ spatialite/libspatialite/Makefile.am +Index: spatialite/libspatialite/Makefile.am +=================================================================== +--- spatialite.orig/libspatialite/Makefile.am 2012-02-17 16:53:35.000000000 +0100 ++++ spatialite/libspatialite/Makefile.am 2012-02-17 17:02:17.000000000 +0100 @@ -1,6 +1,6 @@ ACLOCAL_AMFLAGS = -I m4 -AUTOMAKE_OPTIONS = dist-zip +AUTOMAKE_OPTIONS = dist-zip foreign - EXTRA_DIST = makefile.vc nmake.opt libspatialite.def + EXTRA_DIST = makefile.vc nmake.opt mainpage.doxy README.coverage ---- spatialite.orig/spatialite-tools/Makefile.am -+++ spatialite/spatialite-tools/Makefile.am -@@ -40,5 +40,5 @@ EXTRA_DIST = makefile.vc nmake.opt \ +Index: spatialite/spatialite-tools/Makefile.am +=================================================================== +--- spatialite.orig/spatialite-tools/Makefile.am 2012-02-17 16:53:36.000000000 +0100 ++++ spatialite/spatialite-tools/Makefile.am 2012-02-17 17:02:17.000000000 +0100 +@@ -48,5 +48,5 @@ Makefile-static-Linux \ Makefile-static-MacOsX -AUTOMAKE_OPTIONS = dist-zip +AUTOMAKE_OPTIONS = dist-zip foreign ---- spatialite.orig/libspatialite/Makefile.in -+++ spatialite/libspatialite/Makefile.in -@@ -252,7 +252,7 @@ top_build_prefix = @top_build_prefix@ +Index: spatialite/libspatialite/Makefile.in +=================================================================== +--- spatialite.orig/libspatialite/Makefile.in 2012-02-17 16:53:35.000000000 +0100 ++++ spatialite/libspatialite/Makefile.in 2012-02-17 17:03:14.000000000 +0100 +@@ -254,7 +254,7 @@ 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 libspatialite.def - SUBDIRS = src + EXTRA_DIST = makefile.vc nmake.opt mainpage.doxy README.coverage + SUBDIRS = src test examples pkgconfigdir = $(libdir)/pkgconfig ---- spatialite.orig/spatialite-tools/Makefile.in -+++ spatialite/spatialite-tools/Makefile.in -@@ -282,7 +282,7 @@ EXTRA_DIST = makefile.vc nmake.opt \ +Index: spatialite/spatialite-tools/Makefile.in +=================================================================== +--- spatialite.orig/spatialite-tools/Makefile.in 2012-02-17 16:53:36.000000000 +0100 ++++ spatialite/spatialite-tools/Makefile.in 2012-02-17 17:02:17.000000000 +0100 +@@ -294,7 +294,7 @@ Makefile-static-Linux \ Makefile-static-MacOsX diff --git a/debian/patches/01-fix_local_build.patch b/debian/patches/01-fix_local_build.patch index 30593cc..8d8c92e 100644 --- a/debian/patches/01-fix_local_build.patch +++ b/debian/patches/01-fix_local_build.patch @@ -10,55 +10,79 @@ Forwarded: not-needed spatialite-tools/configure.ac | 3 + 4 files changed, 14 insertions(+), 74 deletions(-) ---- spatialite.orig/spatialite-tools/Makefile.am -+++ spatialite/spatialite-tools/Makefile.am -@@ -1,7 +1,9 @@ - ACLOCAL_AMFLAGS = -I m4 +Index: spatialite/spatialite-tools/Makefile.am +=================================================================== +--- spatialite.orig/spatialite-tools/Makefile.am 2012-02-22 11:15:13.000000000 +0100 ++++ spatialite/spatialite-tools/Makefile.am 2012-02-22 11:15:13.000000000 +0100 +@@ -2,7 +2,10 @@ AM_CFLAGS = -D_LARGE_FILE=1 -D_FILE_OFFSET_BITS=64 \ -- -D_LARGEFILE_SOURCE=1 @LIBSPATIALITE_CFLAGS@ -+ -D_LARGEFILE_SOURCE=1 @LIBSPATIALITE_CFLAGS@ \ + -D_LARGEFILE_SOURCE=1 @LIBSPATIALITE_CFLAGS@ \ +- @LIBFREEXL_CFLAGS@ ++ @LIBFREEXL_CFLAGS@ \ + -L../libspatialite/src/.libs/ \ + -I../libspatialite/src/headers/ ++ bin_PROGRAMS = spatialite \ spatialite_tool \ -@@ -32,7 +34,8 @@ spatialite_osm_raw_LDADD = @LIBSPATIALIT - spatialite_gml_LDADD = @LIBSPATIALITE_LIBS@ \ +@@ -39,7 +42,8 @@ -lexpat spatialite_LDADD = @LIBSPATIALITE_LIBS@ \ + @LIBFREEXL_LIBS@ \ - @READLINE_LIBS@ + @READLINE_LIBS@ \ + -lfreexl - LDADD = @LIBSPATIALITE_LIBS@ + LDADD = @LIBSPATIALITE_LIBS@ \ + @LIBFREEXL_LIBS@ - EXTRA_DIST = makefile.vc nmake.opt \ ---- spatialite.orig/spatialite-tools/Makefile.in -+++ spatialite/spatialite-tools/Makefile.in -@@ -252,7 +252,9 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ +Index: spatialite/spatialite-tools/Makefile.in +=================================================================== +--- spatialite.orig/spatialite-tools/Makefile.in 2012-02-22 11:15:13.000000000 +0100 ++++ spatialite/spatialite-tools/Makefile.in 2012-02-22 11:15:13.000000000 +0100 +@@ -257,7 +257,9 @@ ACLOCAL_AMFLAGS = -I m4 AM_CFLAGS = -D_LARGE_FILE=1 -D_FILE_OFFSET_BITS=64 \ -- -D_LARGEFILE_SOURCE=1 @LIBSPATIALITE_CFLAGS@ -+ -D_LARGEFILE_SOURCE=1 @LIBSPATIALITE_CFLAGS@ \ + -D_LARGEFILE_SOURCE=1 @LIBSPATIALITE_CFLAGS@ \ +- @LIBFREEXL_CFLAGS@ ++ @LIBFREEXL_CFLAGS@ \ + -L../libspatialite/src/.libs/ \ + -I../libspatialite/src/headers/ INCLUDES = @CFLAGS@ - spatialite_SOURCES = shell.c shapefiles.c -@@ -274,7 +276,8 @@ spatialite_gml_LDADD = @LIBSPATIALITE_LI - -lexpat + spatialite_SOURCES = shell.c +@@ -287,7 +289,8 @@ + @READLINE_LIBS@ - spatialite_LDADD = @LIBSPATIALITE_LIBS@ \ -- @READLINE_LIBS@ -+ @READLINE_LIBS@ \ + LDADD = @LIBSPATIALITE_LIBS@ \ +- @LIBFREEXL_LIBS@ ++ @LIBFREEXL_LIBS@ \ + -lfreexl - LDADD = @LIBSPATIALITE_LIBS@ EXTRA_DIST = makefile.vc nmake.opt \ ---- spatialite.orig/spatialite-tools/configure -+++ spatialite/spatialite-tools/configure -@@ -16710,75 +16710,6 @@ $as_echo "no" >&6; } + Makefile-static-MinGW \ +Index: spatialite/spatialite-tools/configure.ac +=================================================================== +--- spatialite.orig/spatialite-tools/configure.ac 2012-02-22 11:10:56.000000000 +0100 ++++ spatialite/spatialite-tools/configure.ac 2012-02-22 11:15:13.000000000 +0100 +@@ -74,9 +74,11 @@ + 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) + +-PKG_CHECK_MODULES([LIBSPATIALITE], [spatialite], , AC_MSG_ERROR(['libspatialite' is required but it doesn't seem to be installed on this system.])) ++LIBSPATIALITE_CFLAGS= ++LIBSPATIALITE_LIBS="-lspatialite -lsqlite3" + AC_SUBST(LIBSPATIALITE_CFLAGS) + AC_SUBST(LIBSPATIALITE_LIBS) ++ + 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) +Index: spatialite/spatialite-tools/configure +=================================================================== +--- spatialite.orig/spatialite-tools/configure 2012-02-22 11:14:40.000000000 +0100 ++++ spatialite/spatialite-tools/configure 2012-02-22 11:17:05.000000000 +0100 +@@ -17316,77 +17316,6 @@ fi pkg_failed=no @@ -117,11 +141,11 @@ Forwarded: not-needed - # Put the nasty error message in config.log where it belongs - echo "$LIBSPATIALITE_PKG_ERRORS" >&5 - -- as_fn_error $? "'libspatialite' is required but it doesn't seems to be installed on this system." "$LINENO" 5 +- as_fn_error $? "'libspatialite' is required but it doesn't seem to be installed on this system." "$LINENO" 5 -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -- as_fn_error $? "'libspatialite' is required but it doesn't seems to be installed on this system." "$LINENO" 5 +- as_fn_error $? "'libspatialite' is required but it doesn't seem to be installed on this system." "$LINENO" 5 -else - LIBSPATIALITE_CFLAGS=$pkg_cv_LIBSPATIALITE_CFLAGS - LIBSPATIALITE_LIBS=$pkg_cv_LIBSPATIALITE_LIBS @@ -130,29 +154,9 @@ Forwarded: not-needed - -fi - +- +- -pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBFREEXL" >&5 $as_echo_n "checking for LIBFREEXL... " >&6; } -@@ -16846,6 +16777,8 @@ else - $as_echo "yes" >&6; } - - fi -+LIBSPATIALITE_CFLAGS= -+LIBSPATIALITE_LIBS="-lspatialite -lsqlite3" - - - ---- spatialite.orig/spatialite-tools/configure.ac -+++ spatialite/spatialite-tools/configure.ac -@@ -74,8 +74,9 @@ AC_CHECK_LIB(expat,XML_ParserCreate,,AC_ - AC_CHECK_LIB(proj,pj_init_plus,,AC_MSG_ERROR(['libproj' is required but it doesn't seems to be installed on this system.]),-lm) - AC_CHECK_LIB(geos_c,GEOSTopologyPreserveSimplify,,AC_MSG_ERROR(['libgeos_c' is required but it doesn't seems to be installed on this system.]),-lm -lgeos) - --PKG_CHECK_MODULES([LIBSPATIALITE], [spatialite], , AC_MSG_ERROR(['libspatialite' is required but it doesn't seems to be installed on this system.])) - PKG_CHECK_MODULES([LIBFREEXL], [freexl], , AC_MSG_ERROR(['libfreexl' is required but it doesn't seems to be installed on this system.])) -+LIBSPATIALITE_CFLAGS= -+LIBSPATIALITE_LIBS="-lspatialite -lsqlite3" - AC_SUBST(LIBSPATIALITE_CFLAGS) - AC_SUBST(LIBSPATIALITE_LIBS) - diff --git a/debian/patches/02-fix_version-info.patch b/debian/patches/02-fix_version-info.patch deleted file mode 100644 index cd94ba7..0000000 --- a/debian/patches/02-fix_version-info.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: David Paleino <da...@debian.org> -Subject: previous SONAME was 2, new library breaks backwards compatibility -Origin: vendor -Forwarded: no - ---- - libspatialite/src/Makefile.am | 4 ++-- - libspatialite/src/Makefile.in | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - ---- spatialite.orig/libspatialite/src/Makefile.am -+++ spatialite/libspatialite/src/Makefile.am -@@ -23,9 +23,9 @@ libspatialite_la_LIBADD = ./gaiaaux/libg - - - if MINGW --libspatialite_la_LDFLAGS = -version-info 4:0:0 -no-undefined -+libspatialite_la_LDFLAGS = -version-info 3:0:0 -no-undefined - else --libspatialite_la_LDFLAGS = -version-info 4:0:0 -+libspatialite_la_LDFLAGS = -version-info 3:0:0 - libspatialite_la_LIBADD += -lpthread -ldl - endif - ---- spatialite.orig/libspatialite/src/Makefile.in -+++ spatialite/libspatialite/src/Makefile.in -@@ -275,8 +275,8 @@ libspatialite_la_LIBADD = ./gaiaaux/libg - ./gaiaexif/libgaiaexif.la ./gaiageo/libgaiageo.la \ - ./spatialite/libsplite.la ./srsinit/libsrsinit.la \ - ./virtualtext/libvirtualtext.la $(am__append_1) --@MINGW_FALSE@libspatialite_la_LDFLAGS = -version-info 4:0:0 --@MINGW_TRUE@libspatialite_la_LDFLAGS = -version-info 4:0:0 -no-undefined -+@MINGW_FALSE@libspatialite_la_LDFLAGS = -version-info 3:0:0 -+@MINGW_TRUE@libspatialite_la_LDFLAGS = -version-info 3:0:0 -no-undefined - all: all-recursive - - .SUFFIXES: diff --git a/debian/patches/03-fix_typos.patch b/debian/patches/03-fix_typos.patch index 643bfc2..b95de5c 100644 --- a/debian/patches/03-fix_typos.patch +++ b/debian/patches/03-fix_typos.patch @@ -13,150 +13,11 @@ Forwarded: no spatialite-tools/spatialite_osm_raw.c | 2 +- 7 files changed, 21 insertions(+), 21 deletions(-) ---- spatialite.orig/libspatialite/src/spatialite/spatialite.c -+++ spatialite/libspatialite/src/spatialite/spatialite.c -@@ -1141,7 +1141,7 @@ fnct_InitSpatialMetaData (sqlite3_contex - if (ret != SQLITE_OK) - goto error; - updateSpatiaLiteHistory (sqlite, "spatial_ref_sys", NULL, -- "table succesfully created"); -+ "table successfully created"); - /* creating the GEOMETRY_COLUMN table */ - strcpy (sql, "CREATE TABLE geometry_columns (\n"); - strcat (sql, "f_table_name TEXT NOT NULL,\n"); -@@ -1158,7 +1158,7 @@ fnct_InitSpatialMetaData (sqlite3_contex - if (ret != SQLITE_OK) - goto error; - updateSpatiaLiteHistory (sqlite, "geometry_columns", NULL, -- "table succesfully created"); -+ "table successfully created"); - /* creating an INDEX corresponding to the SRID FK */ - strcpy (sql, "CREATE INDEX idx_srid_geocols ON geometry_columns\n"); - strcat (sql, "(srid) "); -@@ -1185,7 +1185,7 @@ fnct_InitSpatialMetaData (sqlite3_contex - goto error; - if (spatial_ref_sys_init (sqlite, 0)) - updateSpatiaLiteHistory (sqlite, "spatial_ref_sys", NULL, -- "table succesfully populated"); -+ "table successfully populated"); - sqlite3_result_int (context, 1); - return; - error: -@@ -2058,7 +2058,7 @@ fnct_AddGeometryColumn (sqlite3_context - }; - sprintf (sqlcolumn, ",SRID=%d", (srid <= 0) ? -1 : srid); - strcat (sql, sqlcolumn); -- strcat (sql, "] succesfully created"); -+ strcat (sql, "] successfully created"); - updateSpatiaLiteHistory (sqlite, (const char *) table, - (const char *) column, sql); - return; -@@ -2493,7 +2493,7 @@ fnct_RecoverGeometryColumn (sqlite3_cont - }; - sprintf (sqlcolumn, ",SRID=%d", (srid <= 0) ? -1 : srid); - strcat (sql, sqlcolumn); -- strcat (sql, "] succesfully recovered"); -+ strcat (sql, "] successfully recovered"); - updateSpatiaLiteHistory (sqlite, (const char *) table, - (const char *) column, sql); - return; -@@ -2629,7 +2629,7 @@ fnct_DiscardGeometryColumn (sqlite3_cont - /* end deletion old versions [v2.0, v2.2] triggers[if any] */ - - sqlite3_result_int (context, 1); -- strcpy (sql, "Geometry succesfully discarded"); -+ strcpy (sql, "Geometry successfully discarded"); - updateSpatiaLiteHistory (sqlite, (const char *) table, - (const char *) column, sql); - return; -@@ -3722,7 +3722,7 @@ recover_spatial_index (sqlite3 * sqlite, - goto error; - /* populating the R*Tree table from scratch */ - buildSpatialIndex (sqlite, table, (const char *) geom); -- strcpy (sql, "SpatialIndex: succesfully recovered"); -+ strcpy (sql, "SpatialIndex: successfully recovered"); - updateSpatiaLiteHistory (sqlite, (const char *) table, - (const char *) geom, sql); - return 1; -@@ -3970,7 +3970,7 @@ fnct_CreateSpatialIndex (sqlite3_context - } - updateGeometryTriggers (sqlite, table, column); - sqlite3_result_int (context, 1); -- strcpy (sql, "R*Tree Spatial Index succesfully created"); -+ strcpy (sql, "R*Tree Spatial Index successfully created"); - updateSpatiaLiteHistory (sqlite, (const char *) table, - (const char *) column, sql); - return; -@@ -4039,7 +4039,7 @@ fnct_CreateMbrCache (sqlite3_context * c - } - updateGeometryTriggers (sqlite, table, column); - sqlite3_result_int (context, 1); -- strcpy (sql, "MbrCache succesfully created"); -+ strcpy (sql, "MbrCache successfully created"); - updateSpatiaLiteHistory (sqlite, (const char *) table, - (const char *) column, sql); - return; -@@ -4109,7 +4109,7 @@ fnct_DisableSpatialIndex (sqlite3_contex - } - updateGeometryTriggers (sqlite, table, column); - sqlite3_result_int (context, 1); -- strcpy (sql, "SpatialIndex succesfully disabled"); -+ strcpy (sql, "SpatialIndex successfully disabled"); - updateSpatiaLiteHistory (sqlite, (const char *) table, - (const char *) column, sql); - return; -@@ -4183,7 +4183,7 @@ fnct_RebuildGeometryTriggers (sqlite3_co - } - updateGeometryTriggers (sqlite, table, column); - sqlite3_result_int (context, 1); -- strcpy (sql, "Geometry Triggers succesfully rebuilt"); -+ strcpy (sql, "Geometry Triggers successfully rebuilt"); - updateSpatiaLiteHistory (sqlite, (const char *) table, - (const char *) column, sql); - return; -@@ -5279,7 +5279,7 @@ fnct_CreateTopologyTables (sqlite3_conte - view_surfaces_resolved, srid, dims)) - goto error; - updateSpatiaLiteHistory (sqlite, "*** TOPOLOGY ***", NULL, -- "Topology tables succesfully created"); -+ "Topology tables successfully created"); - sqlite3_result_int (context, 1); - return; - ---- spatialite.orig/libspatialite/src/srsinit/srs_init.c -+++ spatialite/libspatialite/src/srsinit/srs_init.c -@@ -110726,7 +110726,7 @@ spatial_ref_sys_init (sqlite3 * handle, - { - if (verbose) - fprintf (stderr, -- "OK: the SPATIAL_REF_SYS table was succesfully populated\n"); -+ "OK: the SPATIAL_REF_SYS table was successfully populated\n"); - return 1; - } - return 0; ---- spatialite.orig/spatialite-tools/exif_loader.c -+++ spatialite/spatialite-tools/exif_loader.c -@@ -970,7 +970,7 @@ load_file (sqlite3 * handle, const char - printf ("SQL error(s): file '%s' was not loaded\n", file_path); - } - else -- printf ("file '%s' succesfully loaded\n", file_path); -+ printf ("file '%s' successfully loaded\n", file_path); - if (blob) - free (blob); - if (tag_list) -@@ -1607,7 +1607,7 @@ main (int argc, char *argv[]) - sqlite3_errmsg (handle)); - if (cnt) - fprintf (stderr, -- "\n\n*** %d EXIF photo%s succesfully inserted into the DB\n", -+ "\n\n*** %d EXIF photo%s successfully inserted into the DB\n", - cnt, (cnt > 1) ? "s where" : " was"); - return 0; - } ---- spatialite.orig/spatialite-tools/spatialite_gml.c -+++ spatialite/spatialite-tools/spatialite_gml.c -@@ -1924,7 +1924,7 @@ main (int argc, char *argv[]) +Index: spatialite/spatialite-tools/spatialite_gml.c +=================================================================== +--- spatialite.orig/spatialite-tools/spatialite_gml.c 2012-02-17 16:53:36.000000000 +0100 ++++ spatialite/spatialite-tools/spatialite_gml.c 2012-02-22 11:09:03.000000000 +0100 +@@ -1919,7 +1919,7 @@ ret = sqlite3_backup_finish (backup); sqlite3_close (handle); handle = disk_db_handle; @@ -165,9 +26,11 @@ Forwarded: no } sqlite3_close (handle); ---- spatialite.orig/spatialite-tools/spatialite_osm_map.c -+++ spatialite/spatialite-tools/spatialite_osm_map.c -@@ -1966,7 +1966,7 @@ db_vacuum (sqlite3 * db_handle) +Index: spatialite/spatialite-tools/spatialite_osm_map.c +=================================================================== +--- spatialite.orig/spatialite-tools/spatialite_osm_map.c 2012-02-17 16:53:36.000000000 +0100 ++++ spatialite/spatialite-tools/spatialite_osm_map.c 2012-02-22 11:09:03.000000000 +0100 +@@ -2038,7 +2038,7 @@ sqlite3_free (sql_err); return; } @@ -176,7 +39,7 @@ Forwarded: no } static void -@@ -2788,7 +2788,7 @@ main (int argc, char *argv[]) +@@ -2870,7 +2870,7 @@ ret = sqlite3_backup_finish (backup); sqlite3_close (handle); handle = disk_db_handle; @@ -185,9 +48,11 @@ Forwarded: no } /* VACUUMing */ ---- spatialite.orig/spatialite-tools/spatialite_osm_net.c -+++ spatialite/spatialite-tools/spatialite_osm_net.c -@@ -2030,7 +2030,7 @@ db_vacuum (sqlite3 * handle) +Index: spatialite/spatialite-tools/spatialite_osm_net.c +=================================================================== +--- spatialite.orig/spatialite-tools/spatialite_osm_net.c 2011-10-27 12:17:39.000000000 +0200 ++++ spatialite/spatialite-tools/spatialite_osm_net.c 2012-02-22 11:09:03.000000000 +0100 +@@ -2030,7 +2030,7 @@ sqlite3_free (sql_err); return; } @@ -196,7 +61,7 @@ Forwarded: no } static void -@@ -2644,7 +2644,7 @@ main (int argc, char *argv[]) +@@ -2644,7 +2644,7 @@ ret = sqlite3_backup_finish (backup); sqlite3_close (handle); handle = disk_handle; @@ -205,9 +70,11 @@ Forwarded: no } /* VACUUMing */ db_vacuum (handle); ---- spatialite.orig/spatialite-tools/spatialite_osm_raw.c -+++ spatialite/spatialite-tools/spatialite_osm_raw.c -@@ -1836,7 +1836,7 @@ main (int argc, char *argv[]) +Index: spatialite/spatialite-tools/spatialite_osm_raw.c +=================================================================== +--- spatialite.orig/spatialite-tools/spatialite_osm_raw.c 2012-02-17 16:53:36.000000000 +0100 ++++ spatialite/spatialite-tools/spatialite_osm_raw.c 2012-02-22 11:09:03.000000000 +0100 +@@ -1649,7 +1649,7 @@ ret = sqlite3_backup_finish (backup); sqlite3_close (handle); handle = disk_db_handle; diff --git a/debian/patches/04-fix_missing_define.patch b/debian/patches/04-fix_missing_define.patch index f7ed1c6..00ba7a2 100644 --- a/debian/patches/04-fix_missing_define.patch +++ b/debian/patches/04-fix_missing_define.patch @@ -1,12 +1,12 @@ Index: spatialite/libspatialite/src/headers/spatialite/gaiaexif.h =================================================================== ---- spatialite.orig/libspatialite/src/headers/spatialite/gaiaexif.h 2011-10-27 12:05:47.000000000 +0200 -+++ spatialite/libspatialite/src/headers/spatialite/gaiaexif.h 2011-10-27 12:09:30.000000000 +0200 -@@ -67,6 +67,7 @@ - #define GAIA_PDF_BLOB 7 +--- spatialite.orig/libspatialite/src/headers/spatialite/gaiaexif.h 2012-02-17 16:53:35.000000000 +0100 ++++ spatialite/libspatialite/src/headers/spatialite/gaiaexif.h 2012-02-22 11:10:40.000000000 +0100 +@@ -87,6 +87,7 @@ #define GAIA_GEOMETRY_BLOB 8 + /** this BLOB does actually contain a TIFF image */ #define GAIA_TIFF_BLOB 9 +#define GAIA_WAVELET_BLOB 10 /* constants used for EXIF value types */ - #define GAIA_EXIF_NONE 0 + /** unrecognized EXIF value */ diff --git a/debian/patches/series b/debian/patches/series index 95d71db..7d5d2df 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ -#00-add_automake_foreign.patch +00-add_automake_foreign.patch 01-fix_local_build.patch -02-fix_version-info.patch 03-fix_typos.patch 04-fix_missing_define.patch diff --git a/debian/rules b/debian/rules index 64ecf64..7b0a5a5 100755 --- a/debian/rules +++ b/debian/rules @@ -17,6 +17,10 @@ BASE_URL := http://www.gaia-gis.it/gaia-sins %: dh $@ +versions: + @echo "Spatialite full version: $(FULL_VERSION)" + @echo "Spatialite version: $(LC_VERSION)" + get-orig-source: mkdir -p $(CURDIR)/tmp || true for archive in $(ARCHIVES); \ -- 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