[spatialite-tools] 01/02: Merge branch 'experimental'

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Tue Jul 14 10:46:35 UTC 2015


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository spatialite-tools.

commit 8ab73fdaa43c188701732d63f2f879a07f849c83
Merge: b15a30c a74103f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Jul 14 12:35:42 2015 +0200

    Merge branch 'experimental'
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/patches/series

 Makefile-static-MinGW                        |   96 +-
 Makefile.am                                  |   32 +-
 Makefile.in                                  |  397 ++-
 aclocal.m4                                   |  510 ++-
 compile                                      |  347 ++
 config.h.in                                  |   15 +
 configure                                    |  444 ++-
 configure.ac                                 |   23 +-
 debian/changelog                             |   71 +
 debian/control                               |    3 +-
 debian/copyright                             |   15 +-
 debian/gbp.conf                              |    2 +-
 debian/man/spatialite_osm_overpass.1.xml     |  160 +
 debian/man/spatialite_xml_collapse.1.xml     |  114 +
 debian/man/spatialite_xml_load.1.xml         |  145 +
 debian/man/spatialite_xml_print.1.xml        |   86 +
 debian/man/spatialite_xml_validator.1.xml    |   57 +
 debian/patches/00-add_automake_foreign.patch |   30 -
 debian/patches/00-systemlibs.patch           |  167 -
 debian/patches/01-fix_local_build.patch      |  162 -
 debian/patches/03-fix_typos.patch            |  125 -
 debian/patches/05-dont_relink.patch          |   31 -
 debian/patches/06-link-sqlite3.patch         |   25 -
 debian/patches/07-succesfully-typo.patch     |   25 -
 debian/patches/08-indifferently-typo.patch   |   36 -
 debian/patches/09-default-typo.patch         |   14 -
 debian/patches/10-no-sqlite-check.patch      |   23 -
 debian/patches/11-spatialite_init.patch      |   85 -
 debian/patches/series                        |    9 -
 debian/rules                                 |    8 +-
 debian/spatialite-bin.manpages               |    5 +
 debian/upstream/metadata                     |    8 +
 debian/watch                                 |    9 +-
 exif_loader.c                                |    1 +
 shell.c                                      |  180 +-
 spatialite_convert.c                         |   87 +-
 spatialite_dxf.c                             |    5 +-
 spatialite_gml.c                             |    3 +-
 spatialite_network.c                         | 1064 +++++-
 spatialite_osm_filter.c                      |    1 +
 spatialite_osm_map.c                         |   37 +-
 spatialite_osm_net.c                         |   13 +-
 spatialite_osm_overpass.c                    | 4591 ++++++++++++++++++++++++++
 spatialite_osm_raw.c                         |    5 +-
 spatialite_tool.c                            |    1 +
 spatialite_xml_collapse.c                    | 2417 ++++++++++++++
 spatialite_xml_load.c                        | 2846 ++++++++++++++++
 spatialite_xml_print.c                       | 1072 ++++++
 spatialite_xml_validator.c                   |  718 ++++
 49 files changed, 15041 insertions(+), 1279 deletions(-)

diff --cc debian/changelog
index 76312a8,d2b9f55..25cd98a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,74 +1,84 @@@
+ spatialite-tools (4.3.0-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Bump minimum required libspatialite-dev version to 4.3.0.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Wed, 01 Jul 2015 22:10:29 +0200
+ 
+ spatialite-tools (4.3.0~rc1-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release candidate.
+   * Bump minimum required libspatialite-dev version to 4.3.0~rc1.
+   * Drop patches applied upstream.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sat, 27 Jun 2015 16:26:13 +0200
+ 
+ spatialite-tools (4.3.0~rc0-1~exp1) experimental; urgency=medium
+ 
+   * Update watch file to use lowercase rc in upstream version mangle.
+   * New upstream release candidate.
+   * Drop patches applied upstream, refresh remaining patches.
+   * Add patch to link sqlite3.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Fri, 19 Jun 2015 22:48:52 +0200
+ 
+ spatialite-tools (4.2.1~rc1-3) experimental; urgency=medium
+ 
+   * Bump minimum required libspatialite-dev to 4.2.1~rc1-1~exp4.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Thu, 14 May 2015 21:22:06 +0200
+ 
+ spatialite-tools (4.2.1~rc1-2) experimental; urgency=medium
+ 
+   * Add upstream metadata.
+   * Update Vcs-Browser URL to use cgit instead of gitweb.
+   * Set the date embedded in man pages to the changelog date for
+     reproducible builds.
+   * Update my email to @debian.org address.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Thu, 14 May 2015 16:19:26 +0200
+ 
+ spatialite-tools (4.2.1~rc1-1) experimental; urgency=medium
+ 
+   * New upstream release candidate.
+   * Set experimental branch in Vcs-Git and gbp.conf.
+   * Add man page for spatialite_osm_overpass & spatialite_xml_validator.
+   * Drop patches applied upstream, refresh remaining patches.
+   * Add build dependency on libxml2.
+   * Bump Standards-Version to 3.9.6, no changes.
+   * Update 07-succesfully-typo.patch, also fix typo in
+     spatialite_osm_overpass.
+ 
+  -- Bas Couwenberg <sebastic at xs4all.nl>  Fri, 28 Nov 2014 19:06:51 +0100
+ 
+ spatialite-tools (4.2.0-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Refresh patches:
+     - 00-add_automake_foreign.patch
+     - 03-fix_typos.patch
+     - 07-succesfully-typo.patch
+     - 08-indifferently-typo.patch
+     - 10-no-sqlite-check.patch
+   * Update copyright file.
+   * Add man page for:
+     - spatialite_xml_collapse
+     - spatialite_xml_load
+     - spatialite_xml_print
+   * Add patch to fix 'OUTPUT' typo.
+ 
+  -- Bas Couwenberg <sebastic at xs4all.nl>  Mon, 04 Aug 2014 03:02:57 +0200
+ 
 +spatialite-tools (4.1.1-5) unstable; urgency=medium
 +
 +  * Add patch to use spatialite_init_ex() instead of spatialite_init(),
 +    the latter segfaults now that libspatialite is built with libproj 4.9.1.
 +    (closes: #785091)
 +  * Update Vcs-Browser URL to use cgit instead of gitweb.
 +  * Bump Standards-Version to 3.9.6, no changes.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Sat, 16 May 2015 17:05:48 +0200
 +
  spatialite-tools (4.1.1-4) unstable; urgency=medium
  
    * Add patch to not require an extact match between the sqlite3 header

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/spatialite-tools.git



More information about the Pkg-grass-devel mailing list