[Git][debian-gis-team/spatialite-tools][experimental] 6 commits: New upstream version 5.0.0
Bas Couwenberg
gitlab at salsa.debian.org
Sun Aug 23 19:38:08 BST 2020
Bas Couwenberg pushed to branch experimental at Debian GIS Project / spatialite-tools
Commits:
182902f2 by Bas Couwenberg at 2020-08-23T20:27:02+02:00
New upstream version 5.0.0
- - - - -
e5512594 by Bas Couwenberg at 2020-08-23T20:27:07+02:00
Update upstream source from tag 'upstream/5.0.0'
Update to upstream version '5.0.0'
with Debian dir 6c6f27376a7093ceb37bfd1177e3bf4f36e3e5b9
- - - - -
edf024c7 by Bas Couwenberg at 2020-08-23T20:27:21+02:00
New upstream release.
- - - - -
f204b750 by Bas Couwenberg at 2020-08-23T20:28:09+02:00
Bump libspatialite-dev version requirement to 5.0.0.
- - - - -
2f6d45b8 by Bas Couwenberg at 2020-08-23T20:29:05+02:00
Drop spelling-errors2.patch, applied upstream.
- - - - -
25c9a8c0 by Bas Couwenberg at 2020-08-23T20:29:52+02:00
Set distribution to experimental.
- - - - -
9 changed files:
- config-msvc.h
- configure
- configure.ac
- debian/changelog
- debian/control
- − debian/patches/series
- − debian/patches/spelling-errors2.patch
- spatialite_dem.c
- spatialite_osm_net.c
Changes:
=====================================
config-msvc.h
=====================================
@@ -180,7 +180,7 @@
#define PACKAGE_NAME "spatialite-tools"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "spatialite-tools 4.0.0-RC2"
+#define PACKAGE_STRING "spatialite-tools 5.0.0"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "spatialite-tools"
@@ -189,7 +189,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "4.0.0-RC2"
+#define PACKAGE_VERSION "5.0.0"
/* must be defined when using libspatialite-amalgamation */
/* #undef SPATIALITE_AMALGAMATION */
@@ -204,7 +204,7 @@
/* #undef TM_IN_SYS_TIME */
/* Version number of package */
-#define VERSION "4.0.0-RC2"
+#define VERSION "5.0.0"
/* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */
=====================================
configure
=====================================
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for spatialite-tools 5.0.0-RC1.
+# Generated by GNU Autoconf 2.69 for spatialite-tools 5.0.0.
#
# Report bugs to <a.furieri at lqt.it>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='spatialite-tools'
PACKAGE_TARNAME='spatialite-tools'
-PACKAGE_VERSION='5.0.0-RC1'
-PACKAGE_STRING='spatialite-tools 5.0.0-RC1'
+PACKAGE_VERSION='5.0.0'
+PACKAGE_STRING='spatialite-tools 5.0.0'
PACKAGE_BUGREPORT='a.furieri at lqt.it'
PACKAGE_URL=''
@@ -1364,7 +1364,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures spatialite-tools 5.0.0-RC1 to adapt to many kinds of systems.
+\`configure' configures spatialite-tools 5.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1435,7 +1435,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of spatialite-tools 5.0.0-RC1:";;
+ short | recursive ) echo "Configuration of spatialite-tools 5.0.0:";;
esac
cat <<\_ACEOF
@@ -1577,7 +1577,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-spatialite-tools configure 5.0.0-RC1
+spatialite-tools configure 5.0.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2167,7 +2167,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by spatialite-tools $as_me 5.0.0-RC1, which was
+It was created by spatialite-tools $as_me 5.0.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3038,7 +3038,7 @@ fi
# Define the identity of the package.
PACKAGE='spatialite-tools'
- VERSION='5.0.0-RC1'
+ VERSION='5.0.0'
cat >>confdefs.h <<_ACEOF
@@ -19218,7 +19218,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by spatialite-tools $as_me 5.0.0-RC1, which was
+This file was extended by spatialite-tools $as_me 5.0.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -19284,7 +19284,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-spatialite-tools config.status 5.0.0-RC1
+spatialite-tools config.status 5.0.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
=====================================
configure.ac
=====================================
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
-AC_INIT(spatialite-tools, 5.0.0-RC1, a.furieri at lqt.it)
+AC_INIT(spatialite-tools, 5.0.0, a.furieri at lqt.it)
AC_LANG(C)
AC_CONFIG_MACRO_DIR([m4])
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+spatialite-tools (5.0.0-1~exp1) experimental; urgency=medium
+
+ * New upstream release.
+ * Bump libspatialite-dev version requirement to 5.0.0.
+ * Drop spelling-errors2.patch, applied upstream.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 23 Aug 2020 20:29:24 +0200
+
spatialite-tools (5.0.0~rc1-1~exp1) experimental; urgency=medium
* New upstream release candidate.
=====================================
debian/control
=====================================
@@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 10~),
libreadline-dev,
libreadosm-dev,
librttopo-dev,
- libspatialite-dev (>= 5.0.0~rc1),
+ libspatialite-dev (>= 5.0.0),
libsqlite3-dev,
libxml2-dev,
pkg-config,
=====================================
debian/patches/series deleted
=====================================
@@ -1 +0,0 @@
-spelling-errors2.patch
=====================================
debian/patches/spelling-errors2.patch deleted
=====================================
@@ -1,58 +0,0 @@
-Description: Fix spelling errors.
- * defaul -> default
- * commited -> committed
- * compleated -> completed
- * durring -> during
- * retured -> returned
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://www.gaia-gis.it/fossil/spatialite-tools/tktview/a36cfe2e66677103f63a489c937ab874ed972a70
-
---- a/spatialite_osm_net.c
-+++ b/spatialite_osm_net.c
-@@ -2218,7 +2218,7 @@ print_template (const char *template_pat
- fprintf (out, "#\n");
- fprintf (out, "# - tokens are delimited by colons ':'\n");
- fprintf (out, "# - the second token represents the Road Class-name\n");
-- fprintf (out, "# [no name, i.e. '::' identifies the defaul value\n");
-+ fprintf (out, "# [no name, i.e. '::' identifies the default value\n");
- fprintf (out, "# to be applied when no specific class match is found]\n");
- fprintf (out, "# - the third token represents the corresponding speed\n");
- fprintf (out, "# [expressed in Km/h]\n");
---- a/spatialite_dem.c
-+++ b/spatialite_dem.c
-@@ -1612,7 +1612,7 @@ retrieve_geometries(sqlite3 *db_handle,
- remainder_calc=procent_diff*100;
- if (transaction_count_loops == 0)
- {// Show only once
-- fprintf(stderr,"-I-> converted geometries commited to Database: \n");
-+ fprintf(stderr,"-I-> converted geometries committed to Database: \n");
- }
- transaction_count_loops++;
- if (dem_config->has_m)
-@@ -2205,7 +2205,7 @@ import_xyz(sqlite3 *db_handle, struct co
- ret=1;
- if (verbose)
- {
-- fprintf(stderr,"\r file%d: inserting compleated [%u]\n",i_file_count, dem_config->dem_rows_count);
-+ fprintf(stderr,"\r file%d: inserting completed [%u]\n",i_file_count, dem_config->dem_rows_count);
- }
- }
- }
-@@ -2519,7 +2519,7 @@ do_help()
- fprintf(stderr, "-I-> the Z value will be copied from the nearest point found\n");
- fprintf(stderr, "-I-> the Srid of the source Geometry and the Dem-POINT can be different\n");
- fprintf(stderr, "-I-> when -fetchz_xy is used in a bash script, -v should not be used\n");
-- fprintf(stderr, "\t the z-value will then be retured as the result\n");
-+ fprintf(stderr, "\t the z-value will then be returned as the result\n");
- fprintf(stderr, "\n -- -- -------------------- Conf file: ------------------- --\n");
- fprintf(stderr, "-I-> if 'SPATIALITE_DEM' is set with the path to a file\n");
- fprintf(stderr, "-I--> 'export SPATIALITE_DEM=/long/path/to/file/berlin_dhh92.conf'\n");
-@@ -2894,7 +2894,7 @@ command_updatez_db(sqlite3 *db_handle, s
- if (verbose)
- {
- fprintf(stderr, "DB '%s'\n", source_config->dem_path);
-- fprintf(stderr, "TABLE[%s] or GEOMETRY-Column[%s] error durring UPDATE\n",source_config->dem_table, source_config->dem_geometry);
-+ fprintf(stderr, "TABLE[%s] or GEOMETRY-Column[%s] error during UPDATE\n",source_config->dem_table, source_config->dem_geometry);
- fprintf(stderr, "*** ERROR: conversion failed\n\n");
- }
- }
=====================================
spatialite_dem.c
=====================================
@@ -1612,7 +1612,7 @@ retrieve_geometries(sqlite3 *db_handle, struct config_dem *source_config, struct
remainder_calc=procent_diff*100;
if (transaction_count_loops == 0)
{// Show only once
- fprintf(stderr,"-I-> converted geometries commited to Database: \n");
+ fprintf(stderr,"-I-> converted geometries committed to Database: \n");
}
transaction_count_loops++;
if (dem_config->has_m)
@@ -2205,7 +2205,7 @@ import_xyz(sqlite3 *db_handle, struct config_dem *dem_config, int count_xyz_file
ret=1;
if (verbose)
{
- fprintf(stderr,"\r file%d: inserting compleated [%u]\n",i_file_count, dem_config->dem_rows_count);
+ fprintf(stderr,"\r file%d: inserting completed [%u]\n",i_file_count, dem_config->dem_rows_count);
}
}
}
@@ -2519,7 +2519,7 @@ do_help()
fprintf(stderr, "-I-> the Z value will be copied from the nearest point found\n");
fprintf(stderr, "-I-> the Srid of the source Geometry and the Dem-POINT can be different\n");
fprintf(stderr, "-I-> when -fetchz_xy is used in a bash script, -v should not be used\n");
- fprintf(stderr, "\t the z-value will then be retured as the result\n");
+ fprintf(stderr, "\t the z-value will then be returned as the result\n");
fprintf(stderr, "\n -- -- -------------------- Conf file: ------------------- --\n");
fprintf(stderr, "-I-> if 'SPATIALITE_DEM' is set with the path to a file\n");
fprintf(stderr, "-I--> 'export SPATIALITE_DEM=/long/path/to/file/berlin_dhh92.conf'\n");
@@ -2894,7 +2894,7 @@ command_updatez_db(sqlite3 *db_handle, struct config_dem*source_config, struct c
if (verbose)
{
fprintf(stderr, "DB '%s'\n", source_config->dem_path);
- fprintf(stderr, "TABLE[%s] or GEOMETRY-Column[%s] error durring UPDATE\n",source_config->dem_table, source_config->dem_geometry);
+ fprintf(stderr, "TABLE[%s] or GEOMETRY-Column[%s] error during UPDATE\n",source_config->dem_table, source_config->dem_geometry);
fprintf(stderr, "*** ERROR: conversion failed\n\n");
}
}
=====================================
spatialite_osm_net.c
=====================================
@@ -2218,7 +2218,7 @@ print_template (const char *template_path, int railways)
fprintf (out, "#\n");
fprintf (out, "# - tokens are delimited by colons ':'\n");
fprintf (out, "# - the second token represents the Road Class-name\n");
- fprintf (out, "# [no name, i.e. '::' identifies the defaul value\n");
+ fprintf (out, "# [no name, i.e. '::' identifies the default value\n");
fprintf (out, "# to be applied when no specific class match is found]\n");
fprintf (out, "# - the third token represents the corresponding speed\n");
fprintf (out, "# [expressed in Km/h]\n");
View it on GitLab: https://salsa.debian.org/debian-gis-team/spatialite-tools/-/compare/e90b98009ee89b5cbb598d61032e9d7163d9e19f...25c9a8c06352cedb9ba348bfd8dad578f3bf6513
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/spatialite-tools/-/compare/e90b98009ee89b5cbb598d61032e9d7163d9e19f...25c9a8c06352cedb9ba348bfd8dad578f3bf6513
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20200823/387ab4f1/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list