[postgis] 02/02: Merge in 'upstream', i.e. 2.1.3 and adapt Debian package to it.
Markus Wanner
markus_wanner-guest at moszumanska.debian.org
Mon May 19 12:43:57 UTC 2014
This is an automated email from the git hooks/post-receive script.
markus_wanner-guest pushed a commit to branch master
in repository postgis.
commit cdc3c7a823a968aa15db966c183565cf1241c8be
Merge: 9ebda07 baf79b2
Author: Markus Wanner <markus at bluegap.ch>
Date: Mon May 19 14:42:17 2014 +0200
Merge in 'upstream', i.e. 2.1.3 and adapt Debian package to it.
* New upstream release, 2.1.3: strengthens the code to forbid database
users to trigger opening of arbitrary files or network connections by
the system user running the PostgreSQL server process.
* Add B-D-I libmaven-javadoc-plugin-java to support a new plugin in the
jdbc pom file - supposedly generating java documentation.
* Adjust the following patches to the new release: debian-versions, and
use-debian-maven.
* Refresh line numbers on: honor-build-flags, use-json-c.
* Drop obsolete patch: java-version-fix.
ChangeLog | 46333 ++++++++++---------
NEWS | 17 +-
README.postgis | 4 +-
Version.config | 2 +-
aclocal.m4 | 2 +-
config.guess | 199 +-
config.sub | 136 +-
configure | 92 +-
debian/changelog | 14 +
debian/control.in | 3 +-
debian/liblwgeom-2.1.2.install | 2 +-
debian/liblwgeom-2.1.2.symbols | 2 +-
debian/libpostgis-java.poms | 2 +-
debian/patches/debian-versions | 17 +-
debian/patches/honor-build-flags | 8 +-
debian/patches/java-version-fix | 19 -
debian/patches/series | 1 -
debian/patches/use-debian-maven | 105 +-
debian/patches/use-json-c | 12 +-
doc/Makefile | 20 +-
doc/Makefile.comments | 4 +-
doc/html/image_src/Makefile | 4 +-
doc/installation.xml | 28 +-
doc/postgis.xml | 2 +-
doc/postgis_comments.sql | 2 +-
doc/reference_accessor.xml | 17 +-
doc/release_notes.xml | 107 +-
doc/xsl/postgis_gardentest.sql.xsl | 11 +-
extensions/postgis/postgis.control | 2 +-
.../postgis_tiger_geocoder.control | 2 +-
.../postgis_topology/postgis_topology.control | 2 +-
extensions/upgradeable_versions.mk | 10 +-
install-sh | 14 +-
java/jdbc/Makefile | 2 +-
java/jdbc/README | 3 +-
java/jdbc/jtssrc/pom.xml | 165 -
java/jdbc/pom.xml | 305 +-
java/jdbc/src/org/postgis/overview.html | 15 +
java/jdbc_jtsparser/README | 2 +
java/jdbc_jtsparser/pom.xml | 143 +
.../src/main/java}/examples/JtsTestParser.java | 0
.../src/main/java}/org/postgis/jts/JTSShape.java | 0
.../java}/org/postgis/jts/JtsBinaryParser.java | 0
.../java}/org/postgis/jts/JtsBinaryWriter.java | 0
.../main/java}/org/postgis/jts/JtsGeometry.java | 0
.../main/java}/org/postgis/jts/JtsGisWrapper.java | 0
.../src/main/java}/org/postgis/jts/JtsWrapper.java | 0
.../src/main/java/org/postgis/jts/overview.html | 9 +
liblwgeom/lwin_geojson.c | 62 +-
libtool | 200 +-
loader/pgsql2shp-core.c | 51 +-
ltmain.sh | 35 +-
macros/libtool.m4 | 67 +-
postgis/gserialized_estimate.c | 10 +-
postgis/lwgeom_dumppoints.c | 1 +
postgis/sqldefines.h | 16 +-
postgis_config.h.in | 5 +-
postgis_svn_revision.h | 2 +-
raster/rt_core/rt_api.c | 139 +-
raster/rt_core/rt_api.h | 21 +-
raster/rt_pg/rt_pg.c | 228 +-
raster/test/cunit/cu_gdal.c | 7 +-
raster/test/cunit/cu_misc.c | 35 +
raster/test/regress/Makefile.in | 15 +-
raster/test/regress/permitted_gdal_drivers.sql | 70 +
.../test/regress/permitted_gdal_drivers_expected | 10 +
raster/test/regress/rt_addband.sql | 2 +
raster/test/regress/rt_addband_expected | 10 -
raster/test/regress/rt_bytea.sql | 5 +
raster/test/regress/rt_utility.sql | 2 +
raster/test/regress/rt_utility_expected | 14 -
regress/Makefile.in | 7 +-
regress/dumper/null3d.dmp | 1 +
regress/dumper/null3d_expected.dbf | Bin 0 -> 33 bytes
regress/dumper/null3d_expected.shp | Bin 0 -> 112 bytes
regress/dumper/null3d_expected.shx | Bin 0 -> 108 bytes
regress/dumppoints.sql | 6 +
regress/in_geojson.sql | 6 +-
regress/in_geojson_expected | 2 +
regress/run_test.pl | 2 +-
topology/test/Makefile | 4 +-
81 files changed, 25462 insertions(+), 23412 deletions(-)
diff --cc debian/changelog
index dfd3476,0000000..eb2cd1b
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,807 -1,0 +1,821 @@@
++postgis (2.1.3+dfsg-1) unstable; urgency=high
++
++ * New upstream release, 2.1.3: strengthens the code to forbid database
++ users to trigger opening of arbitrary files or network connections by
++ the system user running the PostgreSQL server process.
++ * Add B-D-I libmaven-javadoc-plugin-java to support a new plugin in the
++ jdbc pom file - supposedly generating java documentation.
++ * Adjust the following patches to the new release: debian-versions, and
++ use-debian-maven.
++ * Refresh line numbers on: honor-build-flags, use-json-c.
++ * Drop obsolete patch: java-version-fix.
++
++ -- Markus Wanner <markus at bluegap.ch> Wed, 14 May 2014 13:55:46 +0200
++
+postgis (2.1.2+dfsg-3) unstable; urgency=low
+
+ * Also use dh-autoreconf to update libtool.m4. Closes: #744648. Move
+ that and dh_autotools-dev above the copying step.
+ * Update B-D on libjson-c-dev. Add patch use-josn-c to not only detect,
+ but actually use the new directory for its include files.
+ Closes: #745010.
+ * Allow translations of the debconf notice for postgis-2.0 deprecation.
+ * Add a German translation.
+ * Add a Russian translation by Yuri Kozlov. Closes: #744268.
+ * Add a French translation by Julien Patriarca. Closes: #744749.
+ * Add a Polish translation by Michał Kułach. Closes: #745068.
+ * Add a Portuguese translation by Américo Monteiro. Closes: #745148.
+ * Add a Spanish translation by Matias A. Bellone. Closes: #745785.
+ * Add a Italian translation by Beatrice Torracca. Closes: #747587.
+
+ -- Markus Wanner <markus at bluegap.ch> Mon, 12 May 2014 18:53:55 +0200
+
+postgis (2.1.2+dfsg-2) unstable; urgency=medium
+
+ * Fix arch-only builds by moving the maven-repo-helper dependency from
+ B-D-I to B-D.
+
+ -- Markus Wanner <markus at bluegap.ch> Mon, 07 Apr 2014 16:36:07 +0200
+
+postgis (2.1.2+dfsg-1) unstable; urgency=medium
+
+ * Add myself to Uploaders.
+ * Update copyright file using copyright-format 1.0.
+ * Repack upstream tarball, remove OGC test cases with unclear license.
+ (closes: #743489)
+ * Add gbp.conf to use pristine-tar by default.
+ * Add man page for raster2pgsql.
+ (closes: #717307)
+ * Bump Debhelper compatibility to 9.
+ * Add partial German translation for documentation.
+ Thanks to Chris Leick for the patch.
+ (closes: #729284)
+
+ -- Bas Couwenberg <sebastic at xs4all.nl> Fri, 04 Apr 2014 20:16:30 +0200
+
+postgis (2.1.2-1) unstable; urgency=low
+
+ * New upstream release, 2.1.1. Closes: #728724.
+ * Adapt liblwgeom package name and dependencies to match the new release
+ version number.
+ * Add a suggestion for postgis-doc. Closes: #737497.
+ * Refresh patches debian-versions, honor-build-flags, and
+ java-version-fix.
+ * Drop patches fix-kfreebsd, fix-big-endian, joinsel-issue2543, and
+ doc-resources - these got applied upstream.
+ * Add upstream issue number to patch fix-armel - that one hasn't been
+ applied upstream, yet.
+
+ -- Markus Wanner <markus at bluegap.ch> Mon, 31 Mar 2014 13:07:07 +0200
+
+postgis (2.1.1-6) unstable; urgency=low
+
+ * Recommend postgresql-contrib-M.N for the fuzzystrmatch
+ extension, which postgis_tiger_decoder depends on.
+ * Update README.Debian, make sure the sql scripts are included in the
+ -scripts package for the newest Postgres version as well.
+ Closes: #724626.
+ * Correct java-version-fix, so the jar-version becomes 2.1.1 rather than
+ some rc. Closes: #721721.
+ * Deduplicate highly redundant .sql files in *-postgis-scripts.
+ * Drop the ored dependency on openjdk-6-jdk.
+ * Add a couple more files to the extend-diff-ignore.
+
+ -- Markus Wanner <markus at bluegap.ch> Wed, 19 Mar 2014 10:16:41 +0100
+
+postgis (2.1.1-5) unstable; urgency=low
+
+ * Use dh-autoreconf for up-to-date config.guess and config.sub.
+ Closes: #727945.
+
+ -- Markus Wanner <markus at bluegap.ch> Mon, 27 Jan 2014 21:10:42 +0100
+
+postgis (2.1.1-4) unstable; urgency=low
+
+ * Drop an unneeded fixmakedoc patch.
+ * Add style.css and images to postgis-doc. Closes: #649352.
+
+ -- Markus Wanner <markus at bluegap.ch> Sun, 19 Jan 2014 15:48:48 +0100
+
+postgis (2.1.1-3) unstable; urgency=low
+
+ * Fix FTBFS on at least powerpc and mips by commenting out a few tests
+ that check against a serialized representation, which is architecture
+ dependent.
+ * Apply (experimental) upstream patch preventing against selectivity
+ estimates bigger than 1.0.
+
+ -- Markus Wanner <markus at bluegap.ch> Tue, 14 Jan 2014 22:18:56 +0100
+
+postgis (2.1.1-2) unstable; urgency=medium
+
+ * Fix FTBFS on armel, maybe others, with yet another patch.
+ * debian/control: bumped Standard-Versions to 3.9.5, no changes needed.
+
+ -- Markus Wanner <markus at bluegap.ch> Thu, 09 Jan 2014 20:00:54 +0100
+
+postgis (2.1.1-1) unstable; urgency=low
+
+ * New upstream release
+ * Drop patches upstream-r11979, upstream-r11983, upstream-r11990, and
+ minor-r11979-correction; these are included in this release.
+ * control, rules, liblwgeom-2.1.*.{install,symbols}: adapt to new liblwgeom
+ version.
+ * Adjust patch debian-versions: in doc/Makefile.comments, refer to
+ Postgres 9.3, as that's now default. Set POSTGIS_LIBXML2_VERSION to
+ 2.9.1, as currently shipped.
+ * Adjust line numbers in patches honor-build-flags and link-liblwgeom
+
+ -- Markus Wanner <markus at bluegap.ch> Thu, 12 Dec 2013 20:38:27 +0100
+
+postgis (2.1.0-4) unstable; urgency=low
+
+ * Rename pg-X.Y-postgis-2.1-scripts package to exclude PostGIS version
+ number.
+ * Add transitional postgis-2.0-scripts packages for all Postgres
+ versions supported by the old *and* new PostGIS version. These
+ effectively remove scripts and the postgis.control file prior to
+ installing a newer *-postgis-scripts package, which Breaks+Replaces
+ the old one. Add appropriate notification messages on upgrade.
+ * Add patches upstream-r11983 and upstream-r11990 to try some more
+ big-endian fixes.
+
+ -- Markus Wanner <markus at bluegap.ch> Sun, 20 Oct 2013 20:34:51 +0200
+
+postgis (2.1.0-3) unstable; urgency=low
+
+ * Update patch upstream-r11934 to cover rev 11979, instead. It seems to
+ be a more thorough fix. Add minor-r11979-correction patch to account
+ for some new WARNINGs, that didn't appear, before.
+
+ -- Markus Wanner <markus at bluegap.ch> Thu, 26 Sep 2013 15:36:22 +0200
+
+postgis (2.1.0-2) unstable; urgency=low
+
+ * Correct generation of debian/control: drop an unnecessary grep in
+ debian/pgversions. I broke it when changing to '9.0+'.
+ * Copy binaries for the common binary package 'postgis' from the newest
+ version, rather than hardcoding 9.1.
+ * Add experimental patch from upstream to increase pass rate on
+ non-Intel architectures (upstream-r11934).
+ * Add a description and some tags to patch fix-manpage.
+
+ -- Markus Wanner <markus at bluegap.ch> Tue, 10 Sep 2013 21:53:57 +0200
+
+postgis (2.1.0-1) unstable; urgency=low
+
+ * New upstream release
+ * Update pgversions, use '9.0+' feature of pg-common >= 148.
+ * Adjust liblwgeom version and symbols for new version.
+ * Update build dependencies according to README.postgis (FIXME: prefer
+ geos-3.4)
+ * Adapt patches debian-versions, java-version-fix, link-liblwgeom,
+ honor-build-flags.
+ * Refresh line numbers on patches: fixmakedoc, fix-spelling.
+ * Drop patches: fix-manpages, fix-test-case-for-i386,
+ fix-tests-on-big-endian: applied upstream.
+ * shp2pgsql-gui.1 is now provided upstream. Drop the debian variant. Add
+ a patch stripping an initial UTF-8 marker from the upstream file.
+
+ -- Markus Wanner <markus at bluegap.ch> Mon, 26 Aug 2013 22:02:22 +0200
+
+postgis (2.0.3-8) unstable; urgency=low
+
+ * Don't err out when setting JAVA_HOME, but only later in
+ build-indep. So arch-only builds that don't have (nor need) the java
+ cruft available can succeed.
+
+ -- Markus Wanner <markus at bluegap.ch> Wed, 07 Aug 2013 22:10:02 +0200
+
+postgis (2.0.3-7) unstable; urgency=low
+
+ * Let rules check for different OpenJDK versions supported and set
+ JAVA_HOME accordingly.
+ * Use a simple rm rather than invoking maven. Allows us to move all java
+ related Build-Depends back to Build-Depends-Indep.
+
+ -- Markus Wanner <markus at bluegap.ch> Wed, 07 Aug 2013 13:12:25 +0200
+
+postgis (2.0.3-6) unstable; urgency=low
+
+ * Cleanup check target, reduce duplication.
+ * Re-add postgis_restore.pl from the utils directory. Closes: #718358.
+ * Add patch fix-tests-on-big-endian to fix unit tests on big
+ endian. Closes: #718749.
+
+ -- Markus Wanner <markus at bluegap.ch> Wed, 06 Aug 2013 20:29:42 +0200
+
+postgis (2.0.3-5) unstable; urgency=low
+
+ * Build-Deps: rather than default-jdk, depend on openjdk 6 or 7, as the
+ gcj-jdk didn't work.
+ * Add patch fix-kfreebsd to get rid of a compilation error on kFreeBSD.
+ * rules: if 'make check' fails, print all the diffs of failing tests on
+ stdout.
+
+ -- Markus Wanner <markus at bluegap.ch> Thu, 25 Jul 2013 21:45:17 +0200
+
+postgis (2.0.3-4) unstable; urgency=low
+
+ * Build-Deps: also make libmaven-clean-plugin-java and
+ libmaven-jar-plugin-java a full build dependency. Fixes another FTBFS.
+
+ -- Markus Wanner <markus at bluegap.ch> Tue, 23 Jul 2013 09:40:35 +0200
+
+postgis (2.0.3-3) unstable; urgency=low
+
+ [Mònica Ramírez Arceda]
+ * Add a manpage for shp2pgsql-gui. Closes: #656012.
+
+ [Markus Wanner]
+ * Add fix-test-case-for-i386 patch, back-ported from upstream's
+ r10642. Fixes tests on i386 (and possibly other non-amd64
+ architectures).
+
+ -- Markus Wanner <markus at bluegap.ch> Fri, 19 Jul 2013 10:59:47 +0200
+
+postgis (2.0.3-2) unstable; urgency=low
+
+ * Correct dependency on libgdal-dev, allowing the old, now transitional
+ libgdal1-dev to satisfy it as well.
+ * Build-Deps: correct libgeos-dev version requirement, depend on
+ libpostgresql-jdbc-java instead of (transitional) libpg-java.
+ * Tweak extend-diff-ignore to save us a copying dance in
+ debian/rules. Cleanup the 'clean' target a bit.
+ * Make maven2 a full build-dep (not just B-D-Indep). Closes: #714712.
+ * Pass an LD_PRELOAD to postgres when running 'make check', so the
+ postgis library being loaded can find liblwgeom (and doesn't try to
+ use a pre-installed one).
+ * Add postgresql-common build dependency, as the above needs a relatively
+ new pg_createcluster feature.
+ * Drop libpostgresql-jdbc-java from B-D-I, it's already in B-D.
+
+ -- Markus Wanner <markus at bluegap.ch> Thu, 18 Jul 2013 20:29:41 +0200
+
+postgis (2.0.3-1) unstable; urgency=low
+
+ [Markus Wanner]
+ * Team upload
+ * New upstream release, 2.0.3
+ * Drop Build-Dep on postgresql server binaries.
+ * Downgrade postgresql-9.1-postgis dependency on postgis to a
+ recommendation. Downgrade several conflicts to breaks.
+ * Upgrade postgresql-9.1-java misc-depends from suggestion to dependency.
+ * Add patch fix-spelling: fixes a common spelling error in
+ liblwgeom/lwout_wkt.c.
+ * Ignore changes of some auto-updated files (via source/options). Let
+ debian/rules cleanup some more generated files.
+ * rules: use a separate build directory per Postgres version, swap
+ dh_makeshlibs and dh_installdeb, build in the appropriate build targets,
+ let install only install pre-built stuff.
+ * Compile the postgis jdbc java library again, using maven directly. Add
+ required Build-Depends-Indeps.
+ * Separate large SQL scripts and perl utils. Put them in their own
+ architecture independent indepentend package (..-scripts).
+ * Separate PostGIS documentation into a postgis-doc package, register its
+ contents with doc-base.
+ * Append the PostGIS version to postgresql-9.1-postgis, so multiple
+ versions of it can be co-installed. Required to keep systems working
+ after an upgrade.
+ * Represent the fact that lwgeom isn't backward compatible by renaming
+ liblwgeom2 to liblwgeom-2.0.3.
+ * Add patch java-version-fix: Corrects java jdbc jar version.
+ * Policy updated to 3.9.4. No changes.
+ * Add pgversions and allow generation of debian/control and various
+ install files based on it.
+ * Update debian/copyright a bit.
+ * Update and improve watchfile.
+
+ [Stephen Frost]
+ * Split out liblwgeom2 and liblwgeom-dev from postgis.
+ * Add patches debian-versions and link-liblwgeom.
+ * Let postgis install under /usr/lib/postgresql rather than under
+ /usr/lib/postgis plus symlink in the former directory.
+ * debian/rules: improve cleanup target.
+ * Simplify and tweak build rules.
+
+ [Jerome Villeneuve Larouche]
+ * Removed old patches (generator, html_doc_resources, install)
+ * Added patch fixmakedoc for doc/Makefile.comments.
+
+ -- Markus Wanner <markus at bluegap.ch> Wed, 05 Jun 2013 23:12:35 +0200
+
+postgis (1.5.3-2) unstable; urgency=low
+
+ * Moved pgsql2shp/shp2pgsql under conventional /usr/bin path.
+ (closes: #648176)
+ * New patch html_doc_resourcesi added: now installing HTML documentation.
+ Thanks Andrew Harvey.
+ (closes: #649352)
+
+ -- Francesco Paolo Lovergine <frankie at debian.org> Mon, 21 Nov 2011 15:43:23 +0100
+
+postgis (1.5.3-1) unstable; urgency=low
+
+ * New upstream minor release, with fix for PostgreSQL 9.1.
+ * Repository moved to git and changed Vcs-* fields in debian/control.
+ * Removed obsolete debian/*_lenny.
+ * Policy bumped to 3.9.2. No changes.
+ * Moved to source format 3.0 with quilt support.
+ * Dehelper compatibility level set to 8.
+ * Updated README to reflect current location of template SQL files.
+ (closes: #575622)
+ * Postrm was assigned to the wrong package (postgis), which caused
+ unexpected behavior on purging. Now each purge of postgresql-*-postgis will
+ cause extension removal.
+ (closes: #596663)
+ * Added PostgreSQL 9.1 support.
+ (closes: #633111)
+ * Dropped PostgreSQL 8.4 support, as required for wheezy.
+ (closes: #639474,#642356)
+ * Fixed (again) README.Debian for paths.
+ (closes: #575622)
+
+ -- Francesco Paolo Lovergine <frankie at debian.org> Thu, 15 Sep 2011 15:14:57 +0200
+
+postgis (1.5.2-1) unstable; urgency=low
+
+ * New upstream release, with a few bug fixes.
+ * Added shp2pgsql-gui binary.
+ * Removed patches, applied upstream: getopt.
+
+ -- Alan Boudreault <aboudreault at mapgears.com> Wed, 29 Sep 2010 09:16:10 -0400
+
+postgis (1.5.1-5) unstable; urgency=high
+
+ * This version requires geos >= 3.1.1, debian/control updated.
+ (closes: #580462)
+ * Moved libpostgis-java to java section.
+ * README.Debian has been fixed for old lwpostgis.sql since ages. Just ack.
+ (closes: #575622)
+
+ -- Francesco Paolo Lovergine <frankie at debian.org> Mon, 24 May 2010 09:40:32 +0200
+
+postgis (1.5.1-4) unstable; urgency=high
+
+ * [PATCH] getopt.dpatch added to avoid var collisions among Postgis getopt
+ and glibc one. That solves a FTBS on mips/mipsel.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org> Sat, 22 May 2010 19:03:39 +0200
+
+postgis (1.5.1-3) unstable; urgency=medium
+
+ * Removed custom CFLAGS which probably caused FTBS on mips/mipsel archs.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org> Sat, 22 May 2010 11:20:44 +0200
+
+postgis (1.5.1-2) unstable; urgency=low
+
+ * Added generator.dpatch to avoid a buffer overflow on alpha due to
+ a too narrow buffer apparently.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org> Mon, 17 May 2010 14:21:37 +0200
+
+postgis (1.5.1-1) unstable; urgency=low
+
+ * New upstream release, with a few bug fixes.
+
+ -- Alan Boudreault <aboudreault at mapgears.com> Sun, 16 May 2010 14:42:21 -0400
+
+postgis (1.5.0-1) unstable; urgency=low
+
+ * New upstream major release, with many enhancements.
+ * Policy bumped to 3.8.4, no changes.
+ * Added libxml2-dev as new build-dep.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org> Wed, 10 Mar 2010 09:32:20 +0100
+
+postgis (1.4.0-2) unstable; urgency=low
+
+ * Upload to unstable.
+ * Better parameterized debian/rules against postgis $(VERSION).
+ * Added dblatex and libcunit1-dev among build-deps.
+ * Added postgis_comments.sql to contrib/ SQL templates.
+ * Dropping 8.3 support, no more supported for squeeze.
+ (closes: #559587)
+ * Do not stop on error in postrm if the target dir does not exist.
+ (closes: #560409)
+
+ -- Francesco Paolo Lovergine <frankie at debian.org> Fri, 11 Dec 2009 13:10:34 +0100
+
+postgis (1.4.0-1) experimental; urgency=low
+
+ * New upstream release.
+ * Updated configure arguments now obsolete/changed.
+ * Required some new var initialization for installing in debian/ its trees.
+ * The liblwgeom solib is now named postgis, so changed a few things around.
+ * Updated build-dep: proj -> libproj-dev.
+ * Policy bumped to 3.8.3. No changes.
+ * Debhelper level set to 7.
+ * Added ${misc:Depends}.
+ * Now postgresql >= 8.3, geos >= 3 and proj >= 4.5 are required. This is
+ reflected in debian/control for safety.
+ * Added PostgreSQL 8.4 support, the 8.3 version will be dropped when
+ required. Now the .in template for postrm changed for multiversioning.
+ * Now build-dep on default-jdk which is DFSG-safe.
+ * Removed Fabio Tranchitella among Uploaders because retired from DebianGis.
+ * Now build-dep on imagemagick because doc generation requires convert tool.
+ * Added patch install.dpatch to manage minor inconsistencies in the java
+ inatallation scripts.
+ * stamp files are now auto-cleaned.
+ * Cleaned debian/rules to be idempotent.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org> Mon, 14 Sep 2009 11:58:45 +0200
+
+postgis (1.3.5-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/control: bumped Standard-Versions to 3.8.0, no changes needed.
+ * debian/rules: copy utils/*.pl to the binary package. (Closes: #491154)
+
+ -- Fabio Tranchitella <kobold at debian.org> Thu, 05 Mar 2009 22:47:15 +0100
+
+postgis (1.3.3-3) unstable; urgency=low
+
+ * Added Vcs-* fields in debian/control.
+ * Fixed download URL in debian/copyright.
+ * Now it installs the shared lib in a private postgis path and makes a
+ hard link in the postgres library path at configure time. That would
+ allow coexistence of different flavors of the library which could be
+ used by different DBs at run-time and allowing soft/hard-upgrade scripts
+ working. (closes: #441794, #441797)
+
+ -- Francesco Paolo Lovergine <frankie at debian.org> Mon, 09 Jun 2008 13:03:04 +0200
+
+postgis (1.3.3-2) unstable; urgency=high
+
+ * Dropped postgresql 8.2 support due to removal in Lenny.
+ (closes: #474287)
+
+ -- Francesco Paolo Lovergine <frankie at debian.org> Fri, 06 Jun 2008 23:57:45 +0200
+
+postgis (1.3.3-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Fabio Tranchitella <kobold at debian.org> Tue, 15 Apr 2008 09:01:58 +0200
+
+postgis (1.3.2-2) unstable; urgency=low
+
+ * Add support for postgresql-8.3. (Closes: #466417, #471689)
+
+ -- Fabio Tranchitella <kobold at debian.org> Wed, 19 Mar 2008 19:23:00 +0100
+
+postgis (1.3.2-1) unstable; urgency=low
+
+ [ Francesco Paolo Lovergine ]
+ * Added Homepage field in debian/control
+ * Fixed lintian warning: debian-rules-ignores-make-clean-error
+
+ [ Fabio Tranchitella ]
+ * New upstream release.
+ * Updated Standard-Version to 3.7.3.
+
+ -- Fabio Tranchitella <kobold at debian.org> Mon, 31 Dec 2007 10:57:12 +0100
+
+postgis (1.3.1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Fabio Tranchitella <kobold at debian.org> Mon, 10 Sep 2007 10:36:30 +0200
+
+postgis (1.2.1-2) unstable; urgency=low
+
+ * Added build-dep from libjts-java 1.7
+ (closes: #425919)
+ * Added me among uploaders.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org> Sat, 16 Jun 2007 01:00:49 +0200
+
+postgis (1.2.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Migrate to PostgreSQL 8.2-only (Closes: #419297)
+ * Remove busted templategis from the build (new in 1.2.1 anyway).
+ (Currently attempts to install files in /etc/default, doesn't
+ respect $DESTDIR and overall looks like a godawful mess)
+
+ -- Stephen Frost <sfrost at debian.org> Fri, 13 Apr 2007 09:19:18 +0200
+
+postgis (1.1.6-2) unstable; urgency=low
+
+ * debian/README.Debian: added documentation for the new users on how to use
+ postgis and how to enable it for new or existent databases.
+
+ -- Fabio Tranchitella <kobold at debian.org> Mon, 18 Dec 2006 17:19:27 +0100
+
+postgis (1.1.6-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Fabio Tranchitella <kobold at debian.org> Tue, 7 Nov 2006 09:47:00 +0100
+
+postgis (1.1.5-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Fabio Tranchitella <kobold at debian.org> Tue, 31 Oct 2006 21:56:32 +0100
+
+postgis (1.1.4-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Fabio Tranchitella <kobold at debian.org> Fri, 6 Oct 2006 10:51:51 +0200
+
+postgis (1.1.3-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Fabio Tranchitella <kobold at debian.org> Sun, 16 Jul 2006 22:19:25 +0200
+
+postgis (1.1.2-1) unstable; urgency=low
+
+ - Fabio Tranchitella <kobold at debian.org>
+ * New upstream release. (Closes: #314854)
+ * Renamed packages to follow the actual naming conventions.
+ (Closes: #312675)
+ * Re-packaging, let's try to have postgis in etch. (Closes: #309528, #310094)
+ * Fixed several FTBFS and uninstallable bugs.
+ (Closes: #316519, #335631, #363946, #323120)
+ * Fixed libpostgis-java package FTBFS. (Closes: #308848)
+ * Move to the new postgresql infrastructure. (Closes: #321913, #312676)
+ * Team maintainership, added myself as uploader.
+
+ - Stephen Frost <sfrost at debian.org>
+ * Added myself as uploader
+ * Removed Alex from uploaders (for now at least)
+ * Cleaned up doc/html/postgis.html handling
+ * Renamed postgis-common -> postgis
+ * Made postgis package Arch: any
+ * Moved PostGIS binaries into base postgis package
+ * Changed postgis package to only suggest server packages (could very
+ reasonably be installed on a non-server machine for the PostGIS
+ binaries)
+ * Dropped extra extraneous linking (previously the server module and
+ the binaries were linking to everything the Postgres server linked
+ to, unnecessary and potentially dangerous)
+ * Dropped support for 7.4, after discussion with Martin Pitt and others
+ it's clear that there isn't any need for a 7.4 version of PostGIS in
+ etch.
+ * New upstream release Closes: #311732
+
+ -- Stephen Frost <sfrost at debian.org> Wed, 31 May 2006 16:33:48 -0400
+
+postgis (1.1.0-7) unstable; urgency=low
+
+ * postgresql-postgis-common should depend on postgresql-common | postgresql,
+ not the other way.
+
+ -- Alex Bodnaru <alexbodn at 012.net.il> Tue, 21 Mar 2006 03:13:04 +0200
+
+postgis (1.1.0-6) unstable; urgency=low
+
+ * Closes: #312675
+ postgresql-postgis-utils is the only utils package, replacing the
+ previous postgresql-pg_version-postgis-utils. a further elimination
+ of older method reminiscence.
+
+ -- Alex Bodnaru <alexbodn at 012.net.il> Sat, 18 Mar 2006 23:13:04 +0200
+
+postgis (1.1.0-5) unstable; urgency=low
+
+ * Closes: #312675
+ postgresql-postgis-utils is the only utils package, replacing the
+ previous postgresql-pg_version-postgis-utils.
+ * Closes: 335631
+ Depends on libgeos which passed c2 ABI transition.
+ * Uses /usr/share/postgresql-common/supported-versions to dynamically
+ detect postgresql supported versions. thanks martin.
+
+ -- Alex Bodnaru <alexbodn at 012.net.il> Thu, 9 Mar 2006 04:26:05 +0200
+
+postgis (1.1.0-4) unstable; urgency=low
+
+ * made invariable control file to match standards. the control file
+ may be made automatically by calling 'debian/rules maintainer-configure'
+ * the supported postgresql versions may be filtered, by filling
+ 'debian/_supported.postgresql'.
+ * the postgis binary packages have been renamed, to obey the postgresql
+ standard for extension packages: now their name allways begins with
+ 'postgresql', eventually followed by the postgresql major and minor
+ version, if a specific one is needed.
+ 'libpostgis' has become 'postgis'.
+
+ -- Alex Bodnaru <alexbodn at 012.net.il> Mon, 27 Feb 2006 03:26:15 +0200
+
+postgis (1.1.0-3) unstable; urgency=low
+
+ * minor bug fixes
+ * recompilation
+
+ -- Alex Bodnaru <alexbodn at 012.net.il> Sun, 26 Feb 2006 05:16:09 +0200
+
+postgis (1.1.0-2) unstable; urgency=low
+
+ * minor bug fixes
+ * the package builds again on systems without multiclustering postgresql.
+
+ -- Alex Bodnaru <alexbodn at 012.net.il> Wed, 28 Dec 2005 07:11:39 +0200
+
+postgis (1.1.0-1) unstable; urgency=low
+
+ * Automatic upstream version tracking.
+
+ -- Alex Bodnaru <alexbodn at 012.net.il> Wed, 21 Dec 2005 05:15:37 +0200
+
+postgis (1.0.4-2) unstable; urgency=low
+
+ * Closes: #321913 Closes: #312676
+ Support of multiple postgis installations on the same postgresql server.
+ Please note:
+ - The template database will be template_gis#SONAME#,
+ - The famous (lw)?postgis.sql file will be postgis#SONAME#.sql,
+ where #SONAME# is roughly the major upstream postgis version.
+ * Closes: #323120
+ The building process is autodetecting the appropriate postgresql-dev.
+ * README.Debian updated to support multiversion postgresql architecture.
+ * Closes: #314854
+ Newer upstream version.
+ * Minor improvements to make the build process more quiet.
+ * Default variables are being kept in configuration files. Thus, the same
+ package diff will serve for postgis-0.9 and 1.0.
+ * Closes: #310100
+ The template database is no longer been installed/removed with every
+ installation/remove/upgrade of postgis. It should have received finer
+ grained parameters, anyway .
+
+ -- Alex Bodnaru <alexbodn at 012.net.il> Sun, 16 Oct 2005 03:31:03 +0200
+
+postgis (0.9.2-1) unstable; urgency=low
+
+ * Basic support for libpostgis0.
+ The only package(s) made are the library and examples one(s), so that
+ postgis-0.9.2 databases can be created and used, while not clashing with
+ files and utilities for postgis-1.0.
+
+ -- Alex Bodnaru <alexbodn at 012.net.il> Sun, 9 Oct 2005 09:49:04 +0200
+
+postgis (1.0.4-1) unstable; urgency=low
+
+ * Automatic upstream version tracking.
+ * Closes: #316519
+ Changed the dependencies in control file to work with multiversion
+ postgresql.
+
+ -- Alex Bodnaru <alexbodn at 012.net.il> Sat, 1 Oct 2005 18:07:37 +0300
+
+postgis (1.0.3-1) unstable; urgency=low
+
+ * Automatic upstream version tracking.
+ * Adapted regress/test_index_concurrency to createdb.postgis method.
+
+ -- Alex Bodnaru <alexbodn at 012.net.il> Thu, 1 Sep 2005 04:27:26 +0300
+
+postgis (1.0.1-1) unstable; urgency=low
+
+ * Automatic upstream version tracking.
+ * Closes: #309528
+ binary-all has been separated from binary-arch
+ * Closes: #311732
+ upstream fix: problem with ' char in field names.
+ * Closes: #310094
+ all warnings have been clarified and/or the issues have been fixed
+ * libpostgis-java-debug has been split from libpostgis-java
+ * bug #308728 has been reassigned to postgresql
+
+ -- Alex Bodnaru <alexbodn at 012.net.il> Fri, 27 May 2005 17:17:06 +0300
+
+postgis (1.0.0-2) unstable; urgency=low
+
+ * Closes: #308848
+ gcj has been specifically set as the required java compiler, although other
+ java compilers would do as well
+ * Closes: #310101
+ createdb.postgis documentation updated
+
+ -- Alex Bodnaru <alexbodn at 012.net.il> Fri, 27 May 2005 05:02:45 +0300
+
+postgis (1.0.0-1) unstable; urgency=low
+
+ * First official release for the Debian archive.
+ * Corrected build-depends.
+
+ -- Alex Bodnaru <alexbodn at 012.net.il> Thu, 5 May 2005 10:02:45 +0200
+
+postgis (1.0.0RELEASE-4) unstable; urgency=low
+
+ * example wkb_reader now compiles generically. tested with i386 and ppc.
+
+ -- Alex Bodnaru <alexbodn at 012.net.il> Thu, 5 May 2005 05:14:02 +0300
+
+postgis (1.0.0RELEASE-3) unstable; urgency=low
+
+ * mktemplate_gis and rmtemplate_gis work on dash.
+
+ -- Alex Bodnaru <alexbodn at 012.net.il> Sat, 30 Apr 2005 17:34:02 +0300
+postgis (1.0.0RELEASE-2) unstable; urgency=low
+
+ * Fixed minor typos in manual pages.
+ * Documented the special debian usage of the ogc_test_suite.
+ * Fixed bug in automatic upstream version tracking.
+
+ -- Alex Bodnaru <alexbodn at 012.net.il> Sat, 30 Apr 2005 16:25:22 +0300
+
+
+postgis (1.0.0RELEASE-1) unstable; urgency=low
+
+ * Automatic upstream version tracking.
+
+ -- Alex Bodnaru <alexbodn at 012.net.il> Sat, 30 Apr 2005 15:33:00 +0300
+
+postgis (1.0.0RELEASE-1) unstable; urgency=low
+
+ * Automatic upstream version tracking.
+ * added libpostgisjava replacement directive.
+ * improved automatic upstream version sensing: adding RELEASE for clean
+ upstream versions.
+
+ -- Alex Bodnaru <alexbodn at 012.net.il> Sun, 24 Apr 2005 20:04:36 +0300
+
+postgis (1.0.0RC6-6) unstable; urgency=low
+
+ * renamed libpostgisjava to libpostgis-java
+ * specified libgeos2 version 2.1.1 and above as a dependency.
+ upstream authors will be warned to document this too.
+
+ -- Alex Bodnaru <alexbodn at 012.net.il> Fri, 22 Apr 2005 18:49:01 +0200
+
+postgis (1.0.0RC6-5) unstable; urgency=low
+
+ * Cleaned up removal of .cvsignore files, so it will not be imposed on upstream.
+ * Added optional usage of postgresql-dev installed at custom location.
+ * NOTICE: Since manpages have been added and constantly updated after 1.0.0rc6
+ was released, please copy them from postgis-cvs to the orig directory, or
+ use orig file uploaded with this package
+ * Improved the dependencies system, following suggestions from
+ Markus Schaber <markus at schabi.de>
+
+ -- Alex Bodnaru <alexbodn at 012.net.il> Fri, 15 Apr 2005 14:49:01 +0200
+
+postgis (1.0.0RC6-4) unstable; urgency=low
+
+ * Adjusted useless i386-linux-gcc to gcc (existent for postgresql 7.4 only), thanks to comments from
+ Giuseppe Sacco <giuseppe at eppesuigoccas.homedns.org>
+
+ -- Alex Bodnaru <alexbodn at 012.net.il> Tue, 12 Apr 2005 04:12:01 +0200
+
+postgis (1.0.0RC6-3) unstable; urgency=low
+
+ * Improved build-depends, thanks to comments from
+ Giuseppe Sacco <giuseppe at eppesuigoccas.homedns.org>
+
+ -- Alex Bodnaru <alexbodn at 012.net.il> Mon, 11 Apr 2005 05:15:01 +0200
+
+postgis (1.0.0RC6-2) unstable; urgency=low
+
+ * Improved mktemplate_gis, and renamed from mktemplate_gis.sh.
+ * Updated man pages.
+ * Using createdb.postgis as the main method of creating gis enambled databases.
+ * Updated upstream testing scripts to use createdb.postgis.
+ * Fixind problem: postgres should be able to call mktemplate_gis.
+
+ -- Alex Bodnaru <alexbodn at 012.net.il> Thu, 31 Mar 2005 05:05:41 +0200
+
+postgis (1.0.0RC6-1) unstable; urgency=low
+
+ * Automatic upstream version tracking.
+
+ -- Alex Bodnaru <alexbodn at 012.net.il> Thu, 31 Mar 2005 05:05:41 +0200
+
+postgis (1.0.0RC4-2) unstable; urgency=low
+
+ * Minor bugfix in debian/rules
+ * Removed need for executable files in ./debian. rules is the only executable.
+ * Improvement for mktemplate_gis: now it may be run to grant full privileges to any user as argument.
+
+ -- Alex Bodnaru <alexbodn at 012.net.il> Tue, 22 Mar 2005 03:51:20 +0200
+
+postgis (1.0.0RC4-1) unstable; urgency=low
+
+ * Automatic upstream version tracking.
+
+ -- Alex Bodnaru <alexbodn at 012.net.il> Sun, 6 Mar 2005 05:06:51 +0200
+
+postgis (1.0.0RC3-1) unstable; urgency=low
+
+ * Automatic upstream version tracking.
+
+ -- Alex Bodnaru <alexbodn at 012.net.il> Thu, 3 Mar 2005 04:30:58 +0200
+
+postgis (1.0.0RC2-1) unstable; urgency=low
+
+ * Automatic upstream version tracking.
+
+ -- Alex Bodnaru <alexbodn at 012.net.il> Sun, 30 Jan 2005 05:18:50 +0200
+
+postgis (0.9.0-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Alex Bodnaru <alexbodn at 012.net.il> Sun, 7 Nov 2004 23:39:53 +0200
+
diff --cc debian/control.in
index 904d5ef,0000000..7c6f83b
mode 100644,000000..100644
--- a/debian/control.in
+++ b/debian/control.in
@@@ -1,153 -1,0 +1,154 @@@
+Source: postgis
+Section: misc
+Priority: optional
+Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
+Uploaders: Stephen Frost <sfrost at debian.org>, Francesco Paolo
+ Lovergine <frankie at debian.org>, Markus Wanner <markus at bluegap.ch>,
+ Bas Couwenberg <sebastic at xs4all.nl>
+Build-Depends: debhelper (>= 9), po-debconf,
+ dpkg-dev (>= 1.16.1~), autotools-dev, dh-autoreconf, autoconf2.13,
+ flex, bison, rdfind, libgeos-dev (>= 3.3),
+ libjson-c-dev | libjson0-dev (>= 0.9~),
+ libproj-dev (>= 4.6.0), libssl-dev, xsltproc, docbook, docbook-xsl,
+ imagemagick, libcunit1-dev, dblatex, libxml2-dev (>= 2.5.0~),
+ libgtk2.0-dev, libgdal-dev (>= 1.9.0~) | libgdal1-dev (>= 1.9.0~),
+ postgresql-server-dev-all, postgresql-common (>= 148~), postgresql,
+ maven-repo-helper
+Build-Depends-Indep: openjdk-8-jdk | openjdk-7-jdk,
+ libpostgresql-jdbc-java, fastjar, libjts-java (>= 1.7), maven2,
+ libmaven-clean-plugin-java, libmaven-jar-plugin-java,
+ libsurefire-java, libmaven-compiler-plugin-java,
- libmaven-resources-plugin-java
++ libmaven-resources-plugin-java,
++ libmaven-javadoc-plugin-java
+Standards-Version: 3.9.5
+Homepage: http://postgis.refractions.net/
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/postgis.git
+Vcs-Git: git://anonscm.debian.org/pkg-grass/postgis.git
+
+Package: postgis
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: postgresql-NEWEST_PGVERSION-postgis-2.1, postgis-doc
+Description: Geographic objects support for PostgreSQL
+ PostGIS adds support for geographic objects to the PostgreSQL
+ object-relational database. In effect, PostGIS "spatially enables"
+ the PostgreSQL server, allowing it to be used as a backend spatial
+ database for geographic information systems (GIS), much like ESRI's
+ SDE or Oracle's Spatial extension. PostGIS follows the OpenGIS
+ "Simple Features Specification for SQL".
+ .
+ This package contains the PostGIS userland binaries, common files.
+
+Package: postgis-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: postgis
+Description: Geographic objects support for PostgreSQL -- documentation
+ PostGIS adds support for geographic objects to the PostgreSQL
+ object-relational database. In effect, PostGIS "spatially enables"
+ the PostgreSQL server, allowing it to be used as a backend spatial
+ database for geographic information systems (GIS), much like ESRI's
+ SDE or Oracle's Spatial extension. PostGIS follows the OpenGIS
+ "Simple Features Specification for SQL".
+ .
+ This package contains the PostGIS documentation.
+
+Package: libpostgis-java
+Architecture: all
+Section: java
+Depends: libpostgresql-jdbc-java, ${misc:Depends}
+Suggests: postgresql-NEWEST_PGVERSION-postgis-2.1
+Breaks: libpostgis-jdbc, libpostgisjava, postgresql-postgis-java
+Replaces: libpostgis-jdbc, libpostgisjava, postgresql-postgis-java
+Description: Geographic objects support for PostgreSQL -- JDBC support
+ PostGIS adds support for geographic objects to the PostgreSQL
+ object-relational database. In effect, PostGIS "spatially enables"
+ the PostgreSQL server, allowing it to be used as a backend spatial
+ database for geographic information systems (GIS), much like ESRI's
+ SDE or Oracle's Spatial extension. PostGIS follows the OpenGIS
+ "Simple Features Specification for SQL".
+ .
+ This package contains JDBC support for PostGIS.
+
+Package: liblwgeom-2.1.2
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, libjson0 (>= 0.9~), ${misc:Depends}
+Description: PostGIS "Lightweight Geometry" library
+ PostGIS adds support for geographic objects to the PostgreSQL
+ object-relational database. In effect, PostGIS "spatially enables"
+ the PostgreSQL server, allowing it to be used as a backend spatial
+ database for geographic information systems (GIS), much like ESRI's
+ SDE or Oracle's Spatial extension. PostGIS follows the OpenGIS
+ "Simple Features Specification for SQL".
+ .
+ This library is the generic geometry handling section of PostGIS. The
+ geometry objects, constructors, destructors, and a set of spatial
+ processing functions, are implemented here.
+
+Package: liblwgeom-dev
+Architecture: any
+Section: libdevel
+Depends: ${misc:Depends},
+ liblwgeom-2.1.2 (= ${binary:Version})
+Breaks: postgis (<< 2.0.0)
+Description: PostGIS "Lightweight Geometry" library - Development files
+ PostGIS adds support for geographic objects to the PostgreSQL
+ object-relational database. In effect, PostGIS "spatially enables"
+ the PostgreSQL server, allowing it to be used as a backend spatial
+ database for geographic information systems (GIS), much like ESRI's
+ SDE or Oracle's Spatial extension. PostGIS follows the OpenGIS
+ "Simple Features Specification for SQL".
+ .
+ This library is the generic geometry handling section of PostGIS. The
+ geometry objects, constructors, destructors, and a set of spatial
+ processing functions, are implemented here. This package contains
+ the development files.
+
+Package: postgresql-PGVERSION-postgis-2.1
+Depends: ${shlibs:Depends}, postgresql-PGVERSION,
+ postgresql-PGVERSION-postgis-scripts, liblwgeom-2.1.2,
+ ${misc:Depends}
+Recommends: postgis, postgresql-contrib-PGVERSION
+Breaks: postgis (<< 1.2.1)
+Architecture: any
+Description: Geographic objects support for PostgreSQL PGVERSION
+ PostGIS adds support for geographic objects to the PostgreSQL
+ object-relational database. In effect, PostGIS "spatially enables"
+ the PostgreSQL server, allowing it to be used as a backend spatial
+ database for geographic information systems (GIS), much like ESRI's
+ SDE or Oracle's Spatial extension. PostGIS follows the OpenGIS
+ "Simple Features Specification for SQL".
+ .
+ This package supports PostgreSQL PGVERSION.
+
+Package: postgresql-PGVERSION-postgis-scripts
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: postgresql-PGVERSION-postgis-2.1
+Replaces: postgresql-PGVERSION-postgis-2.0-scripts (<< 2.1.0~),
+ postgresql-PGVERSION-postgis-2.1-scripts (<< 2.1.0-4~)
+Breaks: postgresql-PGVERSION-postgis-2.0-scripts (<< 2.1.0~),
+ postgresql-PGVERSION-postgis-2.1-scripts (<< 2.1.0-4~)
+Description: Geographic objects support for PostgreSQL PGVERSION -- scripts
+ PostGIS adds support for geographic objects to the PostgreSQL
+ object-relational database. In effect, PostGIS "spatially enables"
+ the PostgreSQL server, allowing it to be used as a backend spatial
+ database for geographic information systems (GIS), much like ESRI's
+ SDE or Oracle's Spatial extension. PostGIS follows the OpenGIS
+ "Simple Features Specification for SQL".
+ .
+ This package contains SQL scripts to upgrade from earlier PostGIS
+ versions for PostgreSQL PGVERSION as well as Perl utility scripts.
+
+Package: postgresql-PGVERSION-postgis-2.1-scripts
+Architecture: all
+Depends: ${misc:Depends}
+Description: PostGIS for PostgreSQL PGVERSION -- scripts -- dummy package
+ This package contained SQL scripts to upgrade from earlier PostGIS
+ versions for PostgreSQL PGVERSION as well as Perl utility scripts.
+ It got renamed to postgresql-PGVERSION-postgis-scripts.
+ .
+ This is a transitional dummy package. It can safely be removed.
+
diff --cc debian/liblwgeom-2.1.2.install
index 7b04344,0000000..810fab4
mode 100644,000000..100644
--- a/debian/liblwgeom-2.1.2.install
+++ b/debian/liblwgeom-2.1.2.install
@@@ -1,1 -1,0 +1,1 @@@
- usr/lib/liblwgeom-2.1.2.so
++usr/lib/liblwgeom-2.1.3.so
diff --cc debian/liblwgeom-2.1.2.symbols
index 458ecbf,0000000..ae9f73f
mode 100644,000000..100644
--- a/debian/liblwgeom-2.1.2.symbols
+++ b/debian/liblwgeom-2.1.2.symbols
@@@ -1,697 -1,0 +1,697 @@@
- liblwgeom-2.1.2.so liblwgeom-2.1.2 #MINVER#
++liblwgeom-2.1.3.so liblwgeom-2.1.3 #MINVER#
+ GEOS2LWGEOM at Base 2.0.0
+ LWGEOM2GEOS at Base 2.0.0
+ LWGEOM_GEOS_buildArea at Base 2.0.0
+ LWGEOM_GEOS_getPointN at Base 2.0.0
+ azimuth_pt_pt at Base 2.0.0
+ box2d_clone at Base 2.0.0
+ box3d_from_gbox at Base 2.0.0
+ box3d_to_gbox at Base 2.0.0
+ bytes_from_hexbytes at Base 2.0.0
+ cart2geog at Base 2.0.0
+ circ_tree_contains_point at Base 2.1.0
+ circ_tree_distance_tree at Base 2.1.0
+ circ_tree_free at Base 2.1.0
+ circ_tree_get_point at Base 2.1.2
+ circ_tree_new at Base 2.1.0
+ circ_tree_print at Base 2.1.0
+ clairaut_cartesian at Base 2.0.0
+ clairaut_geographic at Base 2.0.0
+ clamp_srid at Base 2.0.0
+ closest_point_on_segment at Base 2.0.0
+ crosses_dateline at Base 2.0.0
+ decode_geohash_bbox at Base 2.1.0
+ define_plane at Base 2.0.0
+ deparse_hex at Base 2.0.0
+ distance2d_pt_pt at Base 2.0.0
+ distance2d_pt_seg at Base 2.0.0
+ dumb_upper_map at Base 2.0.2
+ edge_calculate_gbox at Base 2.0.0
+ edge_calculate_gbox_slow at Base 2.0.0
+ edge_contains_coplanar_point at Base 2.0.0
+ edge_contains_point at Base 2.0.0
+ edge_distance_to_edge at Base 2.0.0
+ edge_distance_to_point at Base 2.0.0
+ edge_intersection at Base 2.0.0
+ edge_intersects at Base 2.1.0
+ edge_point_in_cone at Base 2.0.0
+ edge_point_on_plane at Base 2.0.0
+ error_if_srid_mismatch at Base 2.0.0
+ gbox_angular_height at Base 2.1.0
+ gbox_angular_width at Base 2.1.0
+ gbox_centroid at Base 2.1.0
+ gbox_clone at Base 2.0.2
+ gbox_contains_point3d at Base 2.0.0
+ gbox_copy at Base 2.0.0
+ gbox_duplicate at Base 2.0.0
+ gbox_expand at Base 2.0.0
+ gbox_float_round at Base 2.0.0
+ gbox_from_string at Base 2.0.0
+ gbox_geocentric_slow at Base 2.0.0
+ gbox_init at Base 2.0.0
+ gbox_init_point3d at Base 2.1.0
+ gbox_is_valid at Base 2.1.0
+ gbox_merge at Base 2.0.0
+ gbox_merge_point3d at Base 2.0.0
+ gbox_new at Base 2.0.0
+ gbox_overlaps at Base 2.0.0
+ gbox_overlaps_2d at Base 2.0.0
+ gbox_pt_outside at Base 2.0.0
+ gbox_same at Base 2.0.0
+ gbox_serialized_size at Base 2.0.0
+ gbox_to_string at Base 2.0.0
+ gbox_union at Base 2.0.0
+ geog2cart at Base 2.0.0
+ geographic_point_equals at Base 2.0.0
+ geographic_point_init at Base 2.0.0
+ geohash_point at Base 2.0.0
+ geohash_point_as_int at Base 2.1.0
+ geometry_type_from_string at Base 2.0.0
+ geomtype_struct_array at Base 2.0.0
+ getMachineEndian at Base 2.0.0
+ getPoint2d at Base 2.0.0
+ getPoint2d_cp at Base 2.1.0
+ getPoint2d_p at Base 2.0.0
+ getPoint2d_p_ro at Base 2.0.0
+ getPoint3dm at Base 2.0.0
+ getPoint3dm_p at Base 2.0.0
+ getPoint3dz at Base 2.0.0
+ getPoint3dz_p at Base 2.0.0
+ getPoint4d at Base 2.0.0
+ getPoint4d_p at Base 2.0.0
+ getPoint_internal at Base 2.0.0
+ get_3dcross_product at Base 2.0.0
+ get_3dvector_from_points at Base 2.0.0
+ gflags at Base 2.0.0
+ global_parser_result at Base 2.0.0
+ gserialized_copy at Base 2.0.0
+ gserialized_from_lwgeom at Base 2.0.0
+ gserialized_from_lwgeom_size at Base 2.0.0
+ gserialized_get_gbox_p at Base 2.0.0
+ gserialized_get_srid at Base 2.0.0
+ gserialized_get_type at Base 2.0.0
+ gserialized_get_zm at Base 2.0.0
+ gserialized_has_bbox at Base 2.0.0
+ gserialized_has_m at Base 2.0.0
+ gserialized_has_z at Base 2.0.0
+ gserialized_is_empty at Base 2.0.0
+ gserialized_ndims at Base 2.0.0
+ gserialized_read_gbox_p at Base 2.0.0
+ gserialized_set_srid at Base 2.0.0
+ gserialized_to_string at Base 2.0.0
+ hexbytes_from_bytes at Base 2.0.0
+ interpolate_point4d at Base 2.0.0
+ latitude_degrees_normalize at Base 2.0.0
+ latitude_radians_normalize at Base 2.0.0
+ ll2cart at Base 2.1.0
+ longitude_degrees_normalize at Base 2.0.0
+ longitude_radians_normalize at Base 2.0.0
+ lw_arc_calculate_gbox_cartesian_2d at Base 2.1.0
+ lw_arc_center at Base 2.1.0
+ lw_arc_is_pt at Base 2.1.0
+ lw_arc_length at Base 2.1.0
+ lw_arc_side at Base 2.1.0
+ lw_asprintf at Base 2.0.0
+ lw_dist2d_arc_arc at Base 2.1.0
+ lw_dist2d_check_overlap at Base 2.0.0
+ lw_dist2d_circstring_circstring at Base 2.1.0
+ lw_dist2d_circstring_curvepoly at Base 2.1.0
+ lw_dist2d_circstring_poly at Base 2.1.0
+ lw_dist2d_comp at Base 2.0.0
+ lw_dist2d_curvepoly_curvepoly at Base 2.1.0
+ lw_dist2d_distanceline at Base 2.0.0
+ lw_dist2d_distancepoint at Base 2.0.0
+ lw_dist2d_distpts_init at Base 2.1.0
+ lw_dist2d_distribute_bruteforce at Base 2.0.0
+ lw_dist2d_distribute_fast at Base 2.0.0
+ lw_dist2d_fast_ptarray_ptarray at Base 2.0.0
+ lw_dist2d_line_circstring at Base 2.1.0
+ lw_dist2d_line_curvepoly at Base 2.1.0
+ lw_dist2d_line_line at Base 2.0.0
+ lw_dist2d_line_poly at Base 2.0.0
+ lw_dist2d_point_circstring at Base 2.1.0
+ lw_dist2d_point_curvepoly at Base 2.1.0
+ lw_dist2d_point_line at Base 2.0.0
+ lw_dist2d_point_point at Base 2.0.0
+ lw_dist2d_point_poly at Base 2.0.0
+ lw_dist2d_poly_curvepoly at Base 2.1.0
+ lw_dist2d_poly_poly at Base 2.0.0
+ lw_dist2d_pre_seg_seg at Base 2.0.0
+ lw_dist2d_pt_arc at Base 2.1.0
+ lw_dist2d_pt_pt at Base 2.0.0
+ lw_dist2d_pt_ptarray at Base 2.0.0
+ lw_dist2d_pt_ptarrayarc at Base 2.1.0
+ lw_dist2d_pt_seg at Base 2.0.0
+ lw_dist2d_ptarray_ptarray at Base 2.0.0
+ lw_dist2d_ptarray_ptarrayarc at Base 2.1.0
+ lw_dist2d_ptarrayarc_ptarrayarc at Base 2.1.0
+ lw_dist2d_recursive at Base 2.0.0
+ lw_dist2d_seg_arc at Base 2.1.0
+ lw_dist2d_seg_seg at Base 2.0.0
+ lw_dist2d_selected_seg_seg at Base 2.0.0
+ lw_dist3d_distanceline at Base 2.0.0
+ lw_dist3d_distancepoint at Base 2.0.0
+ lw_dist3d_distribute_bruteforce at Base 2.0.0
+ lw_dist3d_line_line at Base 2.0.0
+ lw_dist3d_line_poly at Base 2.0.0
+ lw_dist3d_point_line at Base 2.0.0
+ lw_dist3d_point_point at Base 2.0.0
+ lw_dist3d_point_poly at Base 2.0.0
+ lw_dist3d_poly_poly at Base 2.0.0
+ lw_dist3d_pt_poly at Base 2.0.0
+ lw_dist3d_pt_pt at Base 2.0.0
+ lw_dist3d_pt_ptarray at Base 2.0.0
+ lw_dist3d_pt_seg at Base 2.0.0
+ lw_dist3d_ptarray_poly at Base 2.0.0
+ lw_dist3d_ptarray_ptarray at Base 2.0.0
+ lw_dist3d_recursive at Base 2.0.0
+ lw_dist3d_seg_seg at Base 2.0.0
+ lw_get_int32_t at Base 2.0.0
+ lw_get_uint32_t at Base 2.0.0
+ lw_pt_in_arc at Base 2.1.0
+ lw_pt_in_seg at Base 2.1.0
+ lw_seg_length at Base 2.1.0
+ lw_segment_intersects at Base 2.0.0
+ lw_segment_side at Base 2.0.0
+ lw_vasprintf at Base 2.0.0
+ lwalloc at Base 2.0.0
+ lwalloc_var at Base 2.0.0
+ lwcircstring_addpoint at Base 2.0.0
+ lwcircstring_as_lwgeom at Base 2.0.0
+ lwcircstring_clone at Base 2.0.0
+ lwcircstring_construct at Base 2.0.0
+ lwcircstring_construct_empty at Base 2.0.0
+ lwcircstring_free at Base 2.0.0
+ lwcircstring_from_lwmpoint at Base 2.0.0
+ lwcircstring_from_lwpointarray at Base 2.0.0
+ lwcircstring_get_lwpoint at Base 2.1.0
+ lwcircstring_is_closed at Base 2.0.0
+ lwcircstring_is_empty at Base 2.0.0
+ lwcircstring_length at Base 2.0.0
+ lwcircstring_length_2d at Base 2.0.0
+ lwcircstring_release at Base 2.0.0
+ lwcircstring_removepoint at Base 2.0.0
+ lwcircstring_reverse at Base 2.0.0
+ lwcircstring_same at Base 2.0.0
+ lwcircstring_segmentize at Base 2.0.0
+ lwcircstring_setPoint4d at Base 2.0.0
+ lwcollection_add_lwgeom at Base 2.0.0
+ lwcollection_allows_subtype at Base 2.0.0
+ lwcollection_as_lwgeom at Base 2.0.0
+ lwcollection_clone at Base 2.0.0
+ lwcollection_clone_deep at Base 2.0.0
+ lwcollection_construct at Base 2.0.0
+ lwcollection_construct_empty at Base 2.0.0
+ lwcollection_count_vertices at Base 2.0.0
+ lwcollection_extract at Base 2.0.0
+ lwcollection_force_dims at Base 2.0.0
+ lwcollection_free at Base 2.0.0
+ lwcollection_getsubgeom at Base 2.0.0
+ lwcollection_is_empty at Base 2.0.0
+ lwcollection_make_geos_friendly at Base 2.0.0
+ lwcollection_ngeoms at Base 2.0.0
+ lwcollection_release at Base 2.0.0
+ lwcollection_remove_repeated_points at Base 2.0.0
+ lwcollection_reserve at Base 2.0.0
+ lwcollection_same at Base 2.0.0
+ lwcollection_segmentize2d at Base 2.0.0
+ lwcollection_segmentize at Base 2.0.0
+ lwcollection_simplify at Base 2.0.0
+ lwcollection_startpoint at Base 2.1.0
+ lwcompound_add_lwgeom at Base 2.0.0
+ lwcompound_as_lwgeom at Base 2.0.0
+ lwcompound_construct_empty at Base 2.0.0
+ lwcompound_contains_point at Base 2.1.0
+ lwcompound_is_closed at Base 2.0.0
+ lwcompound_length at Base 2.0.0
+ lwcompound_length_2d at Base 2.0.0
+ lwcompound_segmentize at Base 2.0.0
+ lwcurvepoly_add_ring at Base 2.0.0
+ lwcurvepoly_area at Base 2.0.0
+ lwcurvepoly_as_lwgeom at Base 2.0.0
+ lwcurvepoly_construct_empty at Base 2.0.0
+ lwcurvepoly_construct_from_lwpoly at Base 2.1.0
+ lwcurvepoly_perimeter at Base 2.0.0
+ lwcurvepoly_perimeter_2d at Base 2.0.0
+ lwcurvepoly_segmentize at Base 2.0.0
+ lwerror at Base 2.0.0
+ lwerror_var at Base 2.0.0
+ lwfree at Base 2.0.0
+ lwfree_var at Base 2.0.0
+ lwgeom_add_bbox at Base 2.0.0
+ lwgeom_add_bbox_deep at Base 2.0.2
+ lwgeom_affine at Base 2.0.0
+ lwgeom_area at Base 2.0.0
+ lwgeom_area_sphere at Base 2.0.0
+ lwgeom_area_spheroid at Base 2.0.0
+ lwgeom_as_lwcircstring at Base 2.0.0
+ lwgeom_as_lwcollection at Base 2.0.0
+ lwgeom_as_lwcompound at Base 2.0.0
+ lwgeom_as_lwcurvepoly at Base 2.0.0
+ lwgeom_as_lwline at Base 2.0.0
+ lwgeom_as_lwmline at Base 2.0.0
+ lwgeom_as_lwmpoint at Base 2.0.0
+ lwgeom_as_lwmpoly at Base 2.0.0
+ lwgeom_as_lwpoint at Base 2.0.0
+ lwgeom_as_lwpoly at Base 2.0.0
+ lwgeom_as_lwpsurface at Base 2.0.0
+ lwgeom_as_lwtin at Base 2.0.0
+ lwgeom_as_lwtriangle at Base 2.0.0
+ lwgeom_as_multi at Base 2.0.0
+ lwgeom_azumith_spheroid at Base 2.0.0
+ lwgeom_buildarea at Base 2.0.0
+ lwgeom_calculate_circ_tree at Base 2.1.0
+ lwgeom_calculate_gbox at Base 2.0.0
+ lwgeom_calculate_gbox_cartesian at Base 2.0.0
+ lwgeom_calculate_gbox_geodetic at Base 2.0.0
+ lwgeom_check_geodetic at Base 2.0.0
+ lwgeom_clip_to_ordinate_range at Base 2.0.0
+ lwgeom_clone at Base 2.0.0
+ lwgeom_clone_deep at Base 2.0.0
+ lwgeom_construct_empty at Base 2.0.0
+ lwgeom_contains_point at Base 2.1.0
+ lwgeom_count_rings at Base 2.0.0
+ lwgeom_count_vertices at Base 2.0.0
+ lwgeom_covers_lwgeom_sphere at Base 2.0.0
+ lwgeom_delaunay_triangulation at Base 2.1.0
+ lwgeom_desegmentize at Base 2.0.0
+ lwgeom_difference at Base 2.0.0
+ lwgeom_dimension at Base 2.0.0
+ lwgeom_dimensionality at Base 2.0.0
+ lwgeom_distance_spheroid at Base 2.0.0
+ lwgeom_drop_bbox at Base 2.0.0
+ lwgeom_drop_srid at Base 2.0.0
+ lwgeom_extent_to_gml2 at Base 2.0.0
+ lwgeom_extent_to_gml3 at Base 2.0.0
+ lwgeom_flip_coordinates at Base 2.0.0
+ lwgeom_force_2d at Base 2.0.0
+ lwgeom_force_3dm at Base 2.0.0
+ lwgeom_force_3dz at Base 2.0.0
+ lwgeom_force_4d at Base 2.0.0
+ lwgeom_force_clockwise at Base 2.0.0
+ lwgeom_force_dims at Base 2.0.0
+ lwgeom_force_geodetic at Base 2.1.0
+ lwgeom_force_sfs at Base 2.1.0
+ lwgeom_free at Base 2.0.0
+ lwgeom_from_geojson at Base 2.1.0
+ lwgeom_from_gserialized at Base 2.0.0
+ lwgeom_from_hexwkb at Base 2.0.0
+ lwgeom_from_wkb at Base 2.0.0
+ lwgeom_from_wkb_state at Base 2.0.0
+ lwgeom_from_wkt at Base 2.0.0
+ lwgeom_geohash at Base 2.0.0
+ lwgeom_geohash_precision at Base 2.0.0
+ lwgeom_geos_errmsg at Base 2.0.0
+ lwgeom_geos_error at Base 2.0.0
+ lwgeom_geos_noop at Base 2.0.0
+ lwgeom_geos_version at Base 2.0.0
+ lwgeom_get_bbox at Base 2.0.0
+ lwgeom_get_srid at Base 2.0.0
+ lwgeom_get_type at Base 2.1.0
+ lwgeom_has_arc at Base 2.0.0
+ lwgeom_has_m at Base 2.0.0
+ lwgeom_has_srid at Base 2.0.0
+ lwgeom_has_z at Base 2.0.0
+ lwgeom_homogenize at Base 2.0.0
+ lwgeom_interpolate_point at Base 2.0.0
+ lwgeom_intersection at Base 2.0.0
+ lwgeom_is_closed at Base 2.0.0
+ lwgeom_is_collection at Base 2.0.0
+ lwgeom_is_empty at Base 2.0.0
+ lwgeom_length at Base 2.0.0
+ lwgeom_length_2d at Base 2.0.0
+ lwgeom_length_spheroid at Base 2.0.0
+ lwgeom_locate_along at Base 2.0.0
+ lwgeom_locate_between at Base 2.0.0
+ lwgeom_longitude_shift at Base 2.0.0
+ lwgeom_make_valid at Base 2.0.0
+ lwgeom_maxdistance2d at Base 2.0.0
+ lwgeom_maxdistance2d_tolerance at Base 2.0.0
+ lwgeom_maxdistance3d at Base 2.0.0
+ lwgeom_maxdistance3d_tolerance at Base 2.0.0
+ lwgeom_mindistance2d at Base 2.0.0
+ lwgeom_mindistance2d_tolerance at Base 2.0.0
+ lwgeom_mindistance3d at Base 2.0.0
+ lwgeom_mindistance3d_tolerance at Base 2.0.0
+ lwgeom_ndims at Base 2.0.0
+ lwgeom_needs_bbox at Base 2.0.0
+ lwgeom_node at Base 2.0.0
+ lwgeom_normalize at Base 2.0.1
+ lwgeom_nudge_geodetic at Base 2.0.0
+ lwgeom_offsetcurve at Base 2.0.0
+ lwgeom_parse_wkt at Base 2.0.0
+ lwgeom_parser_result_free at Base 2.0.0
+ lwgeom_parser_result_init at Base 2.0.0
+ lwgeom_perimeter at Base 2.0.0
+ lwgeom_perimeter_2d at Base 2.0.0
+ lwgeom_project_spheroid at Base 2.0.0
+ lwgeom_release at Base 2.0.0
+ lwgeom_remove_repeated_points at Base 2.0.0
+ lwgeom_reverse at Base 2.0.0
+ lwgeom_same at Base 2.0.0
+ lwgeom_segmentize2d at Base 2.0.0
+ lwgeom_segmentize at Base 2.0.0
+ lwgeom_segmentize_sphere at Base 2.1.0
+ lwgeom_set_geodetic at Base 2.0.0
+ lwgeom_set_handlers at Base 2.1.0
+ lwgeom_set_srid at Base 2.0.0
+ lwgeom_sharedpaths at Base 2.0.0
+ lwgeom_simplify at Base 2.0.0
+ lwgeom_snap at Base 2.0.0
+ lwgeom_split at Base 2.0.0
+ lwgeom_startpoint at Base 2.1.0
+ lwgeom_summary at Base 2.0.0
+ lwgeom_symdifference at Base 2.0.0
+ lwgeom_to_ewkt at Base 2.0.0
+ lwgeom_to_geojson at Base 2.0.0
+ lwgeom_to_gml2 at Base 2.0.0
+ lwgeom_to_gml3 at Base 2.0.0
+ lwgeom_to_hexwkb at Base 2.0.0
+ lwgeom_to_kml2 at Base 2.0.0
+ lwgeom_to_svg at Base 2.0.0
+ lwgeom_to_wkb at Base 2.0.0
+ lwgeom_to_wkt at Base 2.0.0
+ lwgeom_to_x3d3 at Base 2.0.0
+ lwgeom_transform at Base 2.0.0
+ lwgeom_union at Base 2.0.0
+ lwline_add_lwpoint at Base 2.0.0
+ lwline_as_lwgeom at Base 2.0.0
+ lwline_clip_to_ordinate_range at Base 2.0.0
+ lwline_clone at Base 2.0.0
+ lwline_clone_deep at Base 2.0.0
+ lwline_construct at Base 2.0.0
+ lwline_construct_empty at Base 2.0.0
+ lwline_count_vertices at Base 2.0.0
+ lwline_crossing_direction at Base 2.0.0
+ lwline_desegmentize at Base 2.0.0
+ lwline_force_dims at Base 2.0.0
+ lwline_free at Base 2.0.0
+ lwline_from_lwgeom_array at Base 2.0.0
+ lwline_from_lwmpoint at Base 2.0.0
+ lwline_from_ptarray at Base 2.0.0
+ lwline_get_lwpoint at Base 2.0.0
+ lwline_is_closed at Base 2.0.0
+ lwline_is_empty at Base 2.0.0
+ lwline_length at Base 2.0.0
+ lwline_length_2d at Base 2.0.0
+ lwline_make_geos_friendly at Base 2.0.0
+ lwline_measured_from_lwline at Base 2.0.0
+ lwline_release at Base 2.0.0
+ lwline_remove_repeated_points at Base 2.0.0
+ lwline_removepoint at Base 2.0.0
+ lwline_reverse at Base 2.0.0
+ lwline_same at Base 2.0.0
+ lwline_segmentize2d at Base 2.0.0
+ lwline_setPoint4d at Base 2.0.0
+ lwline_simplify at Base 2.0.0
+ lwline_split_by_point_to at Base 2.0.0
+ lwmcurve_segmentize at Base 2.0.0
+ lwmessage_truncate at Base 2.0.0
+ lwmline_add_lwline at Base 2.0.0
+ lwmline_as_lwgeom at Base 2.0.0
+ lwmline_clip_to_ordinate_range at Base 2.0.0
+ lwmline_construct_empty at Base 2.0.0
+ lwmline_desegmentize at Base 2.0.0
+ lwmline_free at Base 2.0.0
+ lwmline_measured_from_lwmline at Base 2.0.0
+ lwmline_release at Base 2.0.0
+ lwmpoint_add_lwpoint at Base 2.0.0
+ lwmpoint_as_lwgeom at Base 2.0.0
+ lwmpoint_clip_to_ordinate_range at Base 2.0.0
+ lwmpoint_construct at Base 2.0.0
+ lwmpoint_construct_empty at Base 2.0.0
+ lwmpoint_free at Base 2.0.0
+ lwmpoint_release at Base 2.0.0
+ lwmpoint_remove_repeated_points at Base 2.0.0
+ lwmpoly_add_lwpoly at Base 2.0.0
+ lwmpoly_as_lwgeom at Base 2.0.0
+ lwmpoly_construct_empty at Base 2.0.0
+ lwmpoly_free at Base 2.0.0
+ lwmpoly_release at Base 2.0.0
+ lwmpolygon_desegmentize at Base 2.0.0
+ lwmsurface_segmentize at Base 2.0.0
+ lwnotice at Base 2.0.0
+ lwnotice_var at Base 2.0.0
+ lwpoint_as_lwgeom at Base 2.0.0
+ lwpoint_clip_to_ordinate_range at Base 2.0.0
+ lwpoint_clone at Base 2.0.0
+ lwpoint_construct at Base 2.0.0
+ lwpoint_construct_empty at Base 2.0.0
+ lwpoint_force_dims at Base 2.0.0
+ lwpoint_free at Base 2.0.0
+ lwpoint_getPoint2d_p at Base 2.0.0
+ lwpoint_getPoint3dm_p at Base 2.0.0
+ lwpoint_getPoint3dz_p at Base 2.0.0
+ lwpoint_getPoint4d_p at Base 2.0.0
+ lwpoint_get_m at Base 2.0.0
+ lwpoint_get_ordinate at Base 2.0.0
+ lwpoint_get_x at Base 2.0.0
+ lwpoint_get_y at Base 2.0.0
+ lwpoint_get_z at Base 2.0.0
+ lwpoint_inside_circle at Base 2.1.0
+ lwpoint_is_empty at Base 2.0.0
+ lwpoint_make2d at Base 2.0.0
+ lwpoint_make3dm at Base 2.0.0
+ lwpoint_make3dz at Base 2.0.0
+ lwpoint_make4d at Base 2.0.0
+ lwpoint_make at Base 2.0.0
+ lwpoint_release at Base 2.0.0
+ lwpoint_same at Base 2.0.0
+ lwpoint_set_ordinate at Base 2.0.0
+ lwpoint_to_latlon at Base 2.0.0
+ lwpoly_add_ring at Base 2.0.0
+ lwpoly_area at Base 2.0.0
+ lwpoly_as_lwgeom at Base 2.0.0
+ lwpoly_clone at Base 2.0.0
+ lwpoly_clone_deep at Base 2.0.0
+ lwpoly_construct at Base 2.0.0
+ lwpoly_construct_empty at Base 2.0.0
+ lwpoly_count_vertices at Base 2.0.0
+ lwpoly_covers_point2d at Base 2.0.0
+ lwpoly_force_clockwise at Base 2.0.0
+ lwpoly_force_dims at Base 2.0.0
+ lwpoly_free at Base 2.0.0
+ lwpoly_from_lwlines at Base 2.0.0
+ lwpoly_is_closed at Base 2.0.1
+ lwpoly_is_empty at Base 2.0.0
+ lwpoly_make_geos_friendly at Base 2.0.0
+ lwpoly_perimeter at Base 2.0.0
+ lwpoly_perimeter_2d at Base 2.0.0
+ lwpoly_pt_outside at Base 2.1.2
+ lwpoly_release at Base 2.0.0
+ lwpoly_remove_repeated_points at Base 2.0.0
+ lwpoly_reverse at Base 2.0.0
+ lwpoly_same at Base 2.0.0
+ lwpoly_segmentize2d at Base 2.0.0
+ lwpoly_simplify at Base 2.0.0
+ lwpoly_startpoint at Base 2.1.0
+ lwpolygon_desegmentize at Base 2.0.0
+ lwproj_from_string at Base 2.0.0
+ lwpsurface_add_lwpoly at Base 2.0.0
+ lwpsurface_as_lwgeom at Base 2.0.0
+ lwpsurface_free at Base 2.0.0
+ lwpsurface_is_closed at Base 2.0.0
+ lwrealloc at Base 2.0.0
+ lwrealloc_var at Base 2.0.0
+ lwtin_add_lwtriangle at Base 2.0.0
+ lwtin_as_lwgeom at Base 2.0.0
+ lwtin_free at Base 2.0.0
+ lwtin_from_geos at Base 2.1.0
+ lwtin_is_closed at Base 2.0.0
+ lwtriangle_area at Base 2.0.0
+ lwtriangle_as_lwgeom at Base 2.0.0
+ lwtriangle_clone at Base 2.0.0
+ lwtriangle_construct at Base 2.0.0
+ lwtriangle_construct_empty at Base 2.0.0
+ lwtriangle_force_clockwise at Base 2.0.0
+ lwtriangle_free at Base 2.0.0
+ lwtriangle_from_lwline at Base 2.0.0
+ lwtriangle_is_empty at Base 2.0.0
+ lwtriangle_is_repeated_points at Base 2.0.0
+ lwtriangle_perimeter at Base 2.0.0
+ lwtriangle_perimeter_2d at Base 2.0.0
+ lwtriangle_release at Base 2.0.0
+ lwtriangle_reverse at Base 2.0.0
+ lwtriangle_same at Base 2.0.0
+ lwtype_get_collectiontype at Base 2.0.0
+ lwtype_is_collection at Base 2.0.0
+ lwtype_name at Base 2.0.0
+ next_double_down at Base 2.0.0
+ next_double_up at Base 2.0.0
+ next_float_down at Base 2.0.0
+ next_float_up at Base 2.0.0
+ normalize at Base 2.1.0
+ p2d_same at Base 2.0.0
+ p3d_same at Base 2.1.0
+ p4d_same at Base 2.0.0
+ parse_hex at Base 2.0.0
+ parser_error_messages at Base 2.0.0
+ point4d_transform at Base 2.0.0
+ point_interpolate at Base 2.0.0
+ point_shift at Base 2.0.0
+ printBOX3D at Base 2.0.0
+ printLWCIRCSTRING at Base 2.0.0
+ printLWLINE at Base 2.0.0
+ printLWPOINT at Base 2.0.0
+ printLWPOLY at Base 2.0.0
+ printLWPSURFACE at Base 2.0.0
+ printLWTIN at Base 2.0.0
+ printLWTRIANGLE at Base 2.0.0
+ printPA at Base 2.0.0
+ project_point_on_plane at Base 2.0.0
+ pt_in_ring_2d at Base 2.0.0
+ pt_in_ring_3d at Base 2.0.0
+ pta_desegmentize at Base 2.0.0
+ ptarray_addPoint at Base 2.0.0
+ ptarray_affine at Base 2.0.0
+ ptarray_append_point at Base 2.0.0
+ ptarray_append_ptarray at Base 2.0.0
+ ptarray_arc_length_2d at Base 2.1.1
+ ptarray_area_sphere at Base 2.0.0
+ ptarray_calculate_gbox_cartesian at Base 2.0.0
+ ptarray_calculate_gbox_geodetic at Base 2.0.0
+ ptarray_clone at Base 2.0.0
+ ptarray_clone_deep at Base 2.0.0
+ ptarray_close2d at Base 2.0.0
+ ptarray_construct at Base 2.0.0
+ ptarray_construct_copy_data at Base 2.0.0
+ ptarray_construct_empty at Base 2.0.0
+ ptarray_construct_reference_data at Base 2.0.0
+ ptarray_contains_point at Base 2.0.2
+ ptarray_contains_point_partial at Base 2.1.0
+ ptarray_contains_point_sphere at Base 2.1.0
+ ptarray_flip_coordinates at Base 2.0.0
+ ptarray_force_dims at Base 2.0.0
+ ptarray_free at Base 2.0.0
+ ptarray_from_GEOSCoordSeq at Base 2.0.0
+ ptarray_has_m at Base 2.0.0
+ ptarray_has_z at Base 2.0.0
+ ptarray_insert_point at Base 2.0.0
+ ptarray_is_closed at Base 2.1.0
+ ptarray_is_closed_2d at Base 2.1.0
+ ptarray_is_closed_3d at Base 2.1.0
+ ptarray_is_closed_z at Base 2.1.0
+ ptarray_isccw at Base 2.0.0
+ ptarray_length at Base 2.0.0
+ ptarray_length_2d at Base 2.0.0
+ ptarray_length_spheroid at Base 2.0.0
+ ptarray_locate_point at Base 2.0.0
+ ptarray_longitude_shift at Base 2.0.0
+ ptarray_merge at Base 2.0.0
+ ptarray_point_size at Base 2.0.0
+ ptarray_removePoint at Base 2.0.0
+ ptarray_remove_point at Base 2.0.0
+ ptarray_remove_repeated_points at Base 2.0.0
+ ptarray_reverse at Base 2.0.0
+ ptarray_same at Base 2.0.0
+ ptarray_segmentize2d at Base 2.0.0
+ ptarray_set_point4d at Base 2.0.0
+ ptarray_signed_area at Base 2.1.0
+ ptarray_simplify at Base 2.0.0
+ ptarray_startpoint at Base 2.1.0
+ ptarray_substring at Base 2.0.0
+ ptarray_to_GEOSCoordSeq at Base 2.0.0
+ ptarray_transform at Base 2.0.0
+ ptarrayarc_contains_point at Base 2.1.0
+ ptarrayarc_contains_point_partial at Base 2.1.0
+ rect_node_internal_new at Base 2.0.0
+ rect_node_leaf_new at Base 2.0.0
+ rect_tree_contains_point at Base 2.0.0
+ rect_tree_free at Base 2.0.0
+ rect_tree_intersects_tree at Base 2.0.0
+ rect_tree_new at Base 2.0.0
+ ring_make_geos_friendly at Base 2.0.0
+ robust_cross_product at Base 2.0.0
+ signum at Base 2.0.0
+ sphere_direction at Base 2.1.0
+ sphere_distance at Base 2.0.0
+ sphere_distance_cartesian at Base 2.0.0
+ sphere_project at Base 2.0.0
+ spheroid_direction at Base 2.0.0
+ spheroid_distance at Base 2.0.0
+ spheroid_init at Base 2.0.0
+ spheroid_project at Base 2.0.0
+ stringbuffer_append at Base 2.0.0
+ stringbuffer_aprintf at Base 2.0.0
+ stringbuffer_clear at Base 2.0.0
+ stringbuffer_copy at Base 2.0.0
+ stringbuffer_create at Base 2.0.0
+ stringbuffer_create_with_size at Base 2.0.0
+ stringbuffer_destroy at Base 2.0.0
+ stringbuffer_getlength at Base 2.0.0
+ stringbuffer_getstring at Base 2.0.0
+ stringbuffer_getstringcopy at Base 2.0.0
+ stringbuffer_lastchar at Base 2.0.0
+ stringbuffer_set at Base 2.0.0
+ stringbuffer_trim_trailing_white at Base 2.0.0
+ stringbuffer_trim_trailing_zeroes at Base 2.0.0
+ struct_cmp_by_measure at Base 2.0.0
+ trim_trailing_zeros at Base 2.0.0
+ unit_normal at Base 2.1.0
+ vector_angle at Base 2.1.0
+ vector_rotate at Base 2.1.0
+ vector_sum at Base 2.1.0
+ wkt_lexer_close at Base 2.0.0
+ wkt_lexer_init at Base 2.0.0
+ wkt_lexer_read_srid at Base 2.0.0
+ wkt_parser_circularstring_new at Base 2.0.0
+ wkt_parser_collection_add_geom at Base 2.0.0
+ wkt_parser_collection_finalize at Base 2.0.0
+ wkt_parser_collection_new at Base 2.0.0
+ wkt_parser_compound_add_geom at Base 2.0.0
+ wkt_parser_coord_2 at Base 2.0.0
+ wkt_parser_coord_3 at Base 2.0.0
+ wkt_parser_coord_4 at Base 2.0.0
+ wkt_parser_curvepolygon_add_ring at Base 2.0.0
+ wkt_parser_curvepolygon_finalize at Base 2.0.0
+ wkt_parser_curvepolygon_new at Base 2.0.0
+ wkt_parser_geometry_new at Base 2.0.0
+ wkt_parser_linestring_new at Base 2.0.0
+ wkt_parser_point_new at Base 2.0.0
+ wkt_parser_polygon_add_ring at Base 2.0.0
+ wkt_parser_polygon_finalize at Base 2.0.0
+ wkt_parser_polygon_new at Base 2.0.0
+ wkt_parser_ptarray_add_coord at Base 2.0.0
+ wkt_parser_ptarray_new at Base 2.0.0
+ wkt_parser_triangle_new at Base 2.0.0
+ wkt_yy_create_buffer at Base 2.0.0
+ wkt_yy_delete_buffer at Base 2.0.0
+ wkt_yy_flex_debug at Base 2.0.0
+ wkt_yy_flush_buffer at Base 2.0.0
+ wkt_yy_scan_buffer at Base 2.0.0
+ wkt_yy_scan_bytes at Base 2.0.0
+ wkt_yy_scan_string at Base 2.0.0
+ wkt_yy_switch_to_buffer at Base 2.0.0
+ wkt_yyalloc at Base 2.0.0
+ wkt_yychar at Base 2.0.0
+ wkt_yydebug at Base 2.0.0
+ wkt_yyerror at Base 2.0.0
+ wkt_yyfree at Base 2.0.0
+ wkt_yyget_debug at Base 2.0.0
+ wkt_yyget_in at Base 2.0.0
+ wkt_yyget_leng at Base 2.0.0
+ wkt_yyget_lineno at Base 2.0.0
+ wkt_yyget_out at Base 2.0.0
+ wkt_yyget_text at Base 2.0.0
+ wkt_yyin at Base 2.0.0
+ wkt_yyleng at Base 2.0.0
+ wkt_yylex at Base 2.0.0
+ wkt_yylex_destroy at Base 2.0.0
+ wkt_yylineno at Base 2.0.0
+ wkt_yylloc at Base 2.0.0
+ wkt_yylval at Base 2.0.0
+ wkt_yynerrs at Base 2.0.0
+ wkt_yyout at Base 2.0.0
+ wkt_yyparse at Base 2.0.0
+ wkt_yypop_buffer_state at Base 2.0.0
+ wkt_yypush_buffer_state at Base 2.0.0
+ wkt_yyrealloc at Base 2.0.0
+ wkt_yyrestart at Base 2.0.0
+ wkt_yyset_debug at Base 2.0.0
+ wkt_yyset_in at Base 2.0.0
+ wkt_yyset_lineno at Base 2.0.0
+ wkt_yyset_out at Base 2.0.0
+ wkt_yytext at Base 2.0.0
+ x_to_z at Base 2.0.0
+ y_to_z at Base 2.0.0
+ z_to_latitude at Base 2.0.0
diff --cc debian/libpostgis-java.poms
index f9016f2,0000000..28b8cd4
mode 100644,000000..100644
--- a/debian/libpostgis-java.poms
+++ b/debian/libpostgis-java.poms
@@@ -1,2 -1,0 +1,2 @@@
+java/jdbc/pom.xml
- java/jdbc/jtssrc/pom.xml
++java/jdbc_jtsparser/pom.xml
diff --cc debian/patches/debian-versions
index 1433a7f,0000000..e48798b
mode 100644,000000..100644
--- a/debian/patches/debian-versions
+++ b/debian/patches/debian-versions
@@@ -1,31 -1,0 +1,20 @@@
+Description: Update various files to Debian versions
+ There are a number of #defines and similar which change based on the
+ specific versions of software being compiled against. Update these to
+ match the current Debian build environment.
+Author: Stephen Frost <sfrost at snowman.net>
+Last-Update: 2013-07-22
+
- --- a/postgis/sqldefines.h
- +++ b/postgis/sqldefines.h
- @@ -10,7 +10,7 @@
- #define POSTGIS_GEOS_VERSION 34
- #define POSTGIS_PROJ_VERSION 48
- #define POSTGIS_LIB_VERSION '2.1.2'
- -#define POSTGIS_LIBXML2_VERSION 2.9.0
- +#define POSTGIS_LIBXML2_VERSION 2.9.1
-
- /*
- * Define the build date and the version number
+--- a/doc/Makefile.comments
++++ b/doc/Makefile.comments
- @@ -21,8 +21,8 @@ MODULEDIR=contrib/$(MODULE_doc)
++@@ -21,8 +21,8 @@
+ DATA_built=postgis_comments.sql raster_comments.sql topology_comments.sql
+
+ # PGXS information
- -PG_CONFIG = /opt/pgsql/9.2/bin/pg_config
- -PGXS := /opt/pgsql/9.2/lib/pgxs/src/makefiles/pgxs.mk
++-PG_CONFIG = /home/postgresql-9.3/bin/pg_config
++-PGXS := /home/postgresql-9.3.1/lib/pgxs/src/makefiles/pgxs.mk
++PG_CONFIG = /usr/lib/postgresql/9.3/bin/pg_config
++PGXS := /usr/lib/postgresql/9.3/lib/pgxs/src/makefiles/pgxs.mk
+ include $(PGXS)
+
+ # PGXS override feature. The ability to allow PostGIS to install itself
diff --cc debian/patches/honor-build-flags
index ce2d7fe,0000000..b5d12a5
mode 100644,000000..100644
--- a/debian/patches/honor-build-flags
+++ b/debian/patches/honor-build-flags
@@@ -1,67 -1,0 +1,67 @@@
+Description: Better honor build flags during the build process.
+ Upstream PostGIS 'configure' overrides CPPFLAGS. Various Makefile.in
+ files don't honor LDFLAGS. This patch fixes that. Note that we are
+ patching configure directly, so as to save a call to autoconf. A real
+ patch for upstream would have to patch configure.in, instead.
+Author: Markus Wanner <markus at bluegap.ch>
+Last-Update: 2013-04-23
+
+--- a/loader/Makefile.in
++++ b/loader/Makefile.in
- @@ -97,11 +97,11 @@ pgsql2shp-cli.o: pgsql2shp-cli.c pgsql2s
++@@ -97,11 +97,11 @@
+
+ $(PGSQL2SHP-CLI): $(SHPLIB_OBJS) pgsql2shp-core.o pgsql2shp-cli.o $(LIBLWGEOM)
+ $(LIBTOOL) --mode=link \
+- $(CC) $(CFLAGS) $^ $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS) -o $@
++ $(CC) $(CFLAGS) $^ $(LDFLAGS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS) -o $@
+
+ $(SHP2PGSQL-CLI): $(SHPLIB_OBJS) shp2pgsql-core.o shp2pgsql-cli.o $(LIBLWGEOM)
+ $(LIBTOOL) --mode=link \
+- $(CC) $(CFLAGS) $^ -o $@ $(GETTEXT_LDFLAGS) $(ICONV_LDFLAGS)
++ $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(GETTEXT_LDFLAGS) $(ICONV_LDFLAGS)
+
+ shp2pgsql-gui.o: shp2pgsql-gui.c shp2pgsql-core.h shpcommon.h
+ $(CC) $(CFLAGS) $(GTK_CFLAGS) $(PGSQL_FE_CPPFLAGS) -o $@ -c shp2pgsql-gui.c
- @@ -109,7 +109,7 @@ shp2pgsql-gui.o: shp2pgsql-gui.c shp2pgs
++@@ -109,7 +109,7 @@
+ $(SHP2PGSQL-GUI): $(SHPLIB_OBJS) shp2pgsql-core.o shp2pgsql-gui.o pgsql2shp-core.o $(LIBLWGEOM) $(GTK_WIN32_RES)
+ $(LIBTOOL) --mode=link \
+ $(CC) $(CFLAGS) $(GTK_WIN32_FLAGS) $^ -o $@ \
+- $(GTK_LIBS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS)
++ $(GTK_LIBS) $(LDFLAGS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS)
+
+ installdir:
+ @mkdir -p $(DESTDIR)$(bindir)
+--- a/liblwgeom/Makefile.in
++++ b/liblwgeom/Makefile.in
+@@ -11,6 +11,7 @@
+ # **********************************************************************
+
+ CC = @CC@
++CPPFLAGS = @CPPFLAGS@
+ CFLAGS = @CFLAGS@ @PICFLAGS@ @WARNFLAGS@ @GEOS_CPPFLAGS@ @PROJ_CPPFLAGS@ @JSON_CPPFLAGS@
+ LDFLAGS = @LDFLAGS@ @GEOS_LDFLAGS@ -lgeos_c @PROJ_LDFLAGS@ -lproj @JSON_LDFLAGS@
+ NUMERICFLAGS = @NUMERICFLAGS@
- @@ -153,10 +154,10 @@ check: liblwgeom.la
++@@ -153,10 +154,10 @@
+
+ # Command to build each of the .lo files
+ $(LT_SA_OBJS): %.lo: %.c
+- $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
++ $(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+
+ $(LT_NM_OBJS): %.lo: %.c
+- $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(NUMERICFLAGS) -c -o $@ $<
++ $(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(NUMERICFLAGS) -c -o $@ $<
+
+ # Manually generate WKT parser from Flex/Bison inputs
+ # Bison 2.5, Flex 2.5.35
+--- a/configure
++++ b/configure
- @@ -19742,7 +19742,7 @@ cat >>confdefs.h <<_ACEOF
++@@ -19752,7 +19752,7 @@
+ _ACEOF
+
+
+-CPPFLAGS="$PGSQL_CPPFLAGS $GEOS_CPPFLAGS $PROJ_CPPFLAGS $XML2_CPPFLAGS $SFCGAL_CPPFLAGS $CPPFLAGS"
++CPPFLAGS="$CPPFLAGS $PGSQL_CPPFLAGS $GEOS_CPPFLAGS $PROJ_CPPFLAGS $XML2_CPPFLAGS $SFCGAL_CPPFLAGS $CPPFLAGS"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: CPPFLAGS: $CPPFLAGS" >&5
+ $as_echo "CPPFLAGS: $CPPFLAGS" >&6; }
+
diff --cc debian/patches/series
index 1a918b6,0000000..fd8f9f6
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,10 -1,0 +1,9 @@@
+debian-versions
- java-version-fix
+fix-spelling
+link-liblwgeom
+use-debian-maven
+honor-build-flags
+fix-armel
+fix-manpage
+de-translation
+use-json-c
diff --cc debian/patches/use-debian-maven
index e81b2b7,0000000..917dba5
mode 100644,000000..100644
--- a/debian/patches/use-debian-maven
+++ b/debian/patches/use-debian-maven
@@@ -1,62 -1,0 +1,93 @@@
+Description: Adjust maven pom file to integrate with Debian
+Author: Markus Wanner <markus at bluegap.ch>
+Last-Update: 2013-04-14
+
+--- a/java/jdbc/build.xml
++++ b/java/jdbc/build.xml
+@@ -53,13 +53,8 @@
+ <pathelement location="postgis_${postgis_version}.jar"/>
+ </path>
+
+-
+ <!-- Loading Maven dependencies -->
+- <mkdir dir="lib"/>
+- <get src="http://www.apache.org/dist/maven/ant-tasks/2.1.3/binaries/maven-ant-tasks-2.1.3.jar"
+- dest="lib/maven-ant-tasks-2.1.3.jar"/>
+-
+- <path id="maven-ant-tasks.classpath" path="lib/maven-ant-tasks-2.1.3.jar" />
++ <path id="maven-ant-tasks.classpath" path="/usr/share/java/maven-ant-tasks.jar" />
+ <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
+ uri="antlib:org.apache.maven.artifact.ant"
+ classpathref="maven-ant-tasks.classpath" />
+--- a/java/jdbc/pom.xml
++++ b/java/jdbc/pom.xml
- @@ -82,10 +82,27 @@
- </resource>
- </resources>
++@@ -3,12 +3,6 @@
+
- - <plugins><!--
++ <modelVersion>4.0.0</modelVersion>
++
++- <parent>
++- <groupId>org.sonatype.oss</groupId>
++- <artifactId>oss-parent</artifactId>
++- <version>7</version>
++- </parent>
+-
- + <plugins>
- + <plugin>
- + <groupId>org.apache.maven.plugins</groupId>
- + <artifactId>maven-clean-plugin</artifactId>
- + </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- + <artifactId>maven-jar-plugin</artifactId>
- + <configuration>
- + <archive>
- + <manifest>
- + <addClasspath>true</addClasspath>
- + </manifest>
- + <manifestEntries>
- + <Class-Path>/usr/share/java/postgresql-jdbc3.jar</Class-Path>
- + </manifestEntries>
- + </archive>
- + </configuration>
- + </plugin>
- + <!--<plugin>
- + <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- @@ -120,6 +137,8 @@
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>9.1-901.jdbc3</version>
- + <scope>system</scope>
- + <systemPath>/usr/share/java/postgresql-jdbc3.jar</systemPath>
- </dependency>
- </dependencies>
- <reporting>
++ <groupId>org.postgis</groupId>
++ <artifactId>postgis-jdbc</artifactId>
++ <version>2.1.3</version>
++@@ -96,19 +90,25 @@
++ </resources>
++
++ <plugins>
++- <plugin>
+++ <plugin>
++ <groupId>org.apache.maven.plugins</groupId>
++- <artifactId>maven-source-plugin</artifactId>
++- <version>2.2.1</version>
++- <executions>
++- <execution>
++- <id>attach-sources</id>
++- <goals>
++- <goal>jar</goal>
++- </goals>
++- </execution>
++- </executions>
+++ <artifactId>maven-clean-plugin</artifactId>
+++ </plugin>
+++ <plugin>
+++ <groupId>org.apache.maven.plugins</groupId>
+++ <artifactId>maven-jar-plugin</artifactId>
+++ <configuration>
+++ <archive>
+++ <manifest>
+++ <addClasspath>true</addClasspath>
+++ </manifest>
+++ <manifestEntries>
+++ <Class-Path>/usr/share/java/postgresql-jdbc3.jar</Class-Path>
+++ </manifestEntries>
+++ </archive>
+++ </configuration>
++ </plugin>
+++
++ <plugin>
++ <groupId>org.apache.maven.plugins</groupId>
++ <artifactId>maven-javadoc-plugin</artifactId>
++@@ -132,16 +132,10 @@
++ <dependency>
++ <groupId>postgresql</groupId>
++ <artifactId>postgresql</artifactId>
++- <version>9.1-901.jdbc4</version>
+++ <version>9.1-901.jdbc3</version>
+++ <scope>system</scope>
+++ <systemPath>/usr/share/java/postgresql-jdbc3.jar</systemPath>
++ </dependency>
++ </dependencies>
++
++- <distributionManagement>
++- <repository>
++- <id>sonatype-postgis-releases</id>
++- <name>Sonatype Postgis Releases Repo</name>
++- <url>http://oss.sonatype.org/content/repositories/postgis-releases</url>
++- </repository>
++- </distributionManagement>
++-
++ </project>
diff --cc debian/patches/use-json-c
index 9b0d213,0000000..6598f45
mode 100644,000000..100644
--- a/debian/patches/use-json-c
+++ b/debian/patches/use-json-c
@@@ -1,138 -1,0 +1,138 @@@
+Description: Adjust to the rename of json to json-c
+ Tweak configure to not only detect json-c, but set different
+ variables in case the new variant is found. Adjust other files to
+ conditionally use the new variant.
+Forwarded: yes
+Bug-Upstream: http://trac.osgeo.org/postgis/ticket/2723
+Author: Markus Wanner <markus at bluegap.ch>
+Last-Update: 2013-05-12
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -113,9 +113,9 @@
+ dnl Check for platform-specific functions
+ dnl
+ AC_CHECK_FUNC(vasprintf, [HAVE_VASPRINTF=1], [HAVE_VASPRINTF=0])
+-AC_DEFINE([HAVE_VASPRINTF])
++AC_DEFINE_UNQUOTED([HAVE_VASPRINTF], [$HAVE_VASPRINTF], [vasprintf function])
+ AC_CHECK_FUNC(asprintf, [HAVE_ASPRINTF=1], [HAVE_ASPRINTF=0])
+-AC_DEFINE([HAVE_ASPRINTF])
++AC_DEFINE_UNQUOTED([HAVE_ASPRINTF], [$HAVE_ASPRINTF], [asprintf function])
+ AC_FUNC_FSEEKO()
+
+ dnl
+@@ -751,6 +751,7 @@
+
+ CHECK_JSON=yes
+ HAVE_JSON=no
++HAVE_JSON_C=no
+
+ AC_ARG_WITH([json],
+ [AS_HELP_STRING([--without-json], [build without json-c support])],
+@@ -788,14 +789,14 @@
+ dnl Check that we can find the json/json.h header file
+ CPPFLAGS_SAVE="$CPPFLAGS"
+ CPPFLAGS="$JSON_CPPFLAGS"
+-AC_CHECK_HEADER([json-c/json.h], [HAVE_JSON=yes], [
++AC_CHECK_HEADER([json-c/json.h], [HAVE_JSON_C=yes], [
+ AC_CHECK_HEADER([json/json.h], [HAVE_JSON=yes], [])])
+ CPPFLAGS="$CPPFLAGS_SAVE"
+
+ dnl Ensure we can link against libjson
+ LIBS_SAVE="$LIBS"
+ LIBS="$JSON_LDFLAGS"
+-AC_CHECK_LIB([json-c], [json_object_get], [HAVE_JSON=yes; JSON_LDFLAGS="${JSON_LDFLAGS} -ljson-c"], [
++AC_CHECK_LIB([json-c], [json_object_get], [HAVE_JSON_C=yes; JSON_LDFLAGS="${JSON_LDFLAGS} -ljson-c"], [
+ AC_CHECK_LIB([json], [json_object_get], [HAVE_JSON=yes; JSON_LDFLAGS="${JSON_LDFLAGS} -ljson"], [], [])
+ ], [])
+ LIBS="$LIBS_SAVE"
+@@ -804,9 +805,14 @@
+ AC_DEFINE([HAVE_LIBJSON], 1, [Define to 1 if libjson is present])
+ fi
+
++if test "$HAVE_JSON_C" = "yes"; then
++ AC_DEFINE([HAVE_LIBJSON_C], 1, [Define to 1 if libjson-c is present])
++fi
++
+ AC_SUBST([JSON_CPPFLAGS])
+ AC_SUBST([JSON_LDFLAGS])
+ AC_SUBST([HAVE_JSON])
++AC_SUBST([HAVE_JSON_C])
+
+ fi dnl }
+
+--- a/liblwgeom/lwin_geojson.c
++++ b/liblwgeom/lwin_geojson.c
+@@ -15,10 +15,15 @@
+ #include "lwgeom_log.h"
+ #include "../postgis_config.h"
+
+-#ifdef HAVE_LIBJSON
++#if defined(HAVE_LIBJSON_C) || defined(HAVE_LIBJSON)
+
++#if defined(HAVE_LIBJSON_C)
++#include <json-c/json.h>
++#include <json-c/json_object_private.h>
++#else
+ #include <json/json.h>
+ #include <json/json_object_private.h>
++#endif
+ #include <string.h>
+
+ static void geojson_lwerror(char *msg, int error_code)
- @@ -491,11 +496,11 @@
++@@ -489,11 +494,11 @@
+ LWGEOM*
+ lwgeom_from_geojson(const char *geojson, char **srs)
+ {
+-#ifndef HAVE_LIBJSON
++#if !defined(HAVE_LIBJSON_C) && !defined(HAVE_LIBJSON)
+ *srs = NULL;
+ lwerror("You need JSON-C for lwgeom_from_geojson");
+ return NULL;
+-#else /* HAVE_LIBJSON */
++#else /* HAVE_LIBJSON_C || HAVE_LIBJSON */
+
+ /* size_t geojson_size = strlen(geojson); */
+
- @@ -549,7 +554,7 @@
++@@ -547,7 +552,7 @@
+ }
+
+ return lwgeom;
+-#endif /* HAVE_LIBJSON */
++#endif /* HAVE_LIBJSON_C || HAVE_LIBJSON */
+ }
+
+
+--- a/liblwgeom/cunit/cu_tester.c
++++ b/liblwgeom/cunit/cu_tester.c
+@@ -87,7 +87,7 @@
+ surface_suite,
+ homogenize_suite,
+ force_sfs_suite,
+-#if HAVE_JSON
++#if defined(HAVE_JSON_C) || defined(HAVE_JSON)
+ in_geojson_suite,
+ #endif
+ out_gml_suite,
+--- a/regress/Makefile.in
++++ b/regress/Makefile.in
- @@ -19,6 +19,7 @@
- POSTGIS_GEOS_VERSION=@POSTGIS_GEOS_VERSION@
- POSTGIS_PROJ_VERSION=@POSTGIS_PROJ_VERSION@
++@@ -21,6 +21,7 @@
++ POSTGIS_MAJOR_VERSION=@POSTGIS_MAJOR_VERSION@
++ POSTGIS_MINOR_VERSION=@POSTGIS_MINOR_VERSION@
+ HAVE_JSON=@HAVE_JSON@
++HAVE_JSON_C=@HAVE_JSON_C@
+ HAVE_SFCGAL=@HAVE_SFCGAL@
+ MINGWBUILD=@MINGWBUILD@
+
+--- a/postgis_config.h.in
++++ b/postgis_config.h.in
- @@ -53,6 +53,9 @@
++@@ -54,6 +54,9 @@
+ /* Define to 1 if libjson is present */
+ #undef HAVE_LIBJSON
+
++/* Define to 1 if libjson-c is present */
++#undef HAVE_LIBJSON_C
++
+ /* Define to 1 if you have the `pq' library (-lpq). */
+ #undef HAVE_LIBPQ
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/postgis.git
More information about the Pkg-grass-devel
mailing list