[SCM] postgis branch, master, updated. upstream/2.0.1-28-g2ec27fa
The following commit has been merged in the master branch: commit 2ec27fa4d78c7f4dd838cd8e0dbd49fbd975b647 Author: Markus Wanner Date: Mon Apr 15 21:30:13 2013 +0200 Split out separate doc and scripts packages from postgis, containing all of the (architecture and PostgreSQL version independent) SQL / Perl scripts for each postgis version and HTML documentation. Let the postinst script of the more specific postgresql-postgis-* package add proper symlinks to the SQL scripts. I consider the perl utils moved, though. Reorganize debian/rules a bit, build in build targets, before installing. Reduce to a single configure run. Represent the fact that lwgeom isn't backward compatible in its SONAME, rename liblwgeom2 to liblwgeom-2.0.3-0 accordingly. Make the java jdbc stuff compile again. Use maven directly, rather than trying to go via make and ant. Add required maven build dependencies.y Downgrade several 'Conflicts' to 'Breaks'. Make liblwgeom2 and liblwgeom-dev break older versions of postgis - files out of postgis into these packages. Add a postgresql- prefix to postgis-generic.postrm.in to match naming with the according ...postinst.in file. Drop an unneeded 'recursive' flag for 'rm'. Tweak package dependencies. Add a spell fix patch. Register documentation with doc-base. Fix java jdbc version identifiers. Policy, copyright and watchfile upgrade. diff --git a/debian/changelog b/debian/changelog index 24c42b6..80a0db3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,17 +1,33 @@ postgis (2.0.3-1) UNRELEASED; urgency=low [Markus Wanner] + * Team upload * New upstream release, 2.0.3 - * Drop Build-Dep on postgresql server binaries - they are not needed. + * Drop Build-Dep on postgresql server binaries. * Downgrade postgresql-9.1-postgis dependency on postgis to a -recommendation. +recommendation. Downgrade several conflicts to breaks. * Upgrade postgresql-9.1-java misc-depends from suggestion to dependency. - * Fix a common spelling error in liblwgeom/lwout_wkt.c. - * Ignore changes to auto-updated files (via source/options). Let + * 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: swap dh_makeshlibs and dh_installdeb. + * rules: 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 and (hopefully) PostgreSQL version +indepentend package: postgis-data2.0.3. Let postinst add symlinks as +appropriate. + * Separate PostGIS documentation into a postgis-doc package, register its +contents with doc-base. + * Represent the fact that lwgeom isn't backward compatible in its SONAME, +rename liblwgeom2 to liblwgeom-2.0.3-0 accordingly. + * Add patch java-version-fix: Corrects java jdbc jar version. + * Policy updated to 3.9.4. No changes. + * 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. @@ -24,7 +40,7 @@ postgis (2.0.3-1) UNRELEASED; urgency=low * Removed old patches (generator, html_doc_resources, install) * Added patch fixmakedoc for doc/Makefile.comments. - -- Markus Wanner Fri, 12 Apr 2013 13:02:33 +0200 + -- Markus Wanner Mon, 15 Apr 2013 22:12:27 +0200 postgis (1.5.3-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 864f08a..679a606 100644 --- a/debian/control +++ b/debian/control @@ -2,87 +2,130 @@ Source: postgis Section: misc Priority: optional Maintainer: Debian GIS Project -Uploaders: Stephen Frost , Francesco Paolo Lovergine -Build-Depends: debhelper (>= 8), autotools-dev, flex, bison, libgeos-dev (>= 3.1.1), +Uploaders: Stephen Frost , Francesco Paolo + Lovergine +Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.16.1~), autotools-dev, + flex, bison, libgeos-dev (>= 3.1.1), libproj-dev (>= 4.5.0), libssl-dev, xsltproc, docbook, docbook-xsl, default-jdk, libpg-java, fastjar, libjts-java (>= 1.7), imagemagick, - libcunit1-dev, dblatex, libxml2-dev, libgtk2.0-dev, - postgresql-server-dev-9.1, ant, libgdal-dev -Standards-Version: 3.9.2 + libcunit1-dev, dblatex, libxml2-dev, libgtk2.0-dev, libgdal-dev, + postgresql-server-dev-9.1 +Build-Depends-Indep: libpostgresql-jdbc-java, libsurefire-java, + libmaven-clean-plugin-java, libmaven-compiler-plugin-java, + libmaven-jar-plugin-java, maven2 +Standards-Version: 3.9.4 Homepage: http://postgis.refractions.net/ Vcs-Browser: http://git.d
[SCM] postgis branch, master, updated. upstream/2.0.1-28-g2ec27fa
The following commit has been merged in the master branch:
commit 398a2253da402d47d9871e6fa97a945a5d3ef08b
Author: Markus Wanner
Date: Thu Apr 11 23:23:35 2013 +0200
Merge in work from Stephen Frost, most notably the separation of
liblwgeom from postgis.
diff --git a/debian/changelog b/debian/changelog
index 936e93b..24c42b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,14 @@ postgis (2.0.3-1) UNRELEASED; urgency=low
debian/rules cleanup some more generated files.
* rules: swap dh_makeshlibs and dh_installdeb.
* 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)
diff --git a/debian/control b/debian/control
index 0128a44..864f08a 100644
--- a/debian/control
+++ b/debian/control
@@ -57,3 +57,32 @@ Description: Geographic objects support for PostgreSQL --
JDBC support
.
This package contains JDBC support for PostGIS.
+Package: liblwgeom2
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${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: ${shlibs:Depends}, ${misc:Depends}, liblwgeom2 (= ${binary:Version})
+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.
diff --git a/debian/liblwgeom-dev.install b/debian/liblwgeom-dev.install
new file mode 100644
index 000..01df5de
--- /dev/null
+++ b/debian/liblwgeom-dev.install
@@ -0,0 +1,3 @@
+usr/include
+usr/lib/liblwgeom.a
+usr/lib/liblwgeom.so
diff --git a/debian/liblwgeom2.install b/debian/liblwgeom2.install
new file mode 100644
index 000..fd61f8a
--- /dev/null
+++ b/debian/liblwgeom2.install
@@ -0,0 +1 @@
+usr/lib/liblwgeom-2.0.3.so
diff --git a/debian/patches/debian-versions b/debian/patches/debian-versions
new file mode 100644
index 000..60619a4
--- /dev/null
+++ b/debian/patches/debian-versions
@@ -0,0 +1,32 @@
+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
+Last-Update: 2012-10-12
+
+--- a/postgis/sqldefines.h
b/postgis/sqldefines.h
+@@ -8,9 +8,9 @@
+ */
+ #define POSTGIS_PGSQL_VERSION 91
+ #define POSTGIS_GEOS_VERSION 33
+-#define POSTGIS_PROJ_VERSION 48
++#define POSTGIS_PROJ_VERSION 47
+ #define POSTGIS_LIB_VERSION 2.0.3
+-#define POSTGIS_LIBXML2_VERSION 2.7.8
++#define POSTGIS_LIBXML2_VERSION 2.8.0
+
+ /*
+ * Define the build date and the version number
+--- a/doc/Makefile.comments
b/doc/Makefile.comments
+@@ -21,7 +21,7 @@
+ DATA_built=postgis_comments.sql raster_comments.sql topology_comments.sql
+
+ # PGXS information
+-PG_CONFIG = /usr/bin/pg_config
++PG_CONFIG = /usr/lib/postgresql/9.1/bin/pg_config
+ PGXS := /usr/lib/postgresql/9.1/lib/pgxs/src/makefiles/pgxs.mk
+ include $(PGXS)
+
diff --git a/debian/patches/link-liblwgeom b/debian/patches/link-liblwgeom
new file mode 100644
index 000..073480d
--- /dev/null
+++ b/debian/patches/link-liblwgeom
@@ -0,0 +1,28 @@
+Description: Dynamically link to liblwgeom
+ Instead of statically pulling liblwgeom into the postgis.so, dynamically
+ link to it.
+Author: Stephen Frost
+Last-Update: 2012-10-13
+
+--- a/postgis/Makefile.in
b/postgis/Makefile.in
+@@ -72,7 +72,7 @@
+ # older version of PostGIS, rather tha
[SCM] postgis branch, master, updated. upstream/2.0.1-28-g2ec27fa
The following commit has been merged in the master branch:
commit 5c35ffd6670aba11021b2139c656ff4386c0e026
Author: Markus Wanner
Date: Thu Apr 11 22:03:54 2013 +0200
Matching changelog:
* Drop Build-Dep on postgresql server binaries - they are not needed.
* Downgrade postgresql-9.1-postgis dependency on postgis to a
recommendation.
* Upgrade postgresql-9.1-java misc-depends from suggestion to dependency.
* Fix a common spelling error in liblwgeom/lwout_wkt.c (thanks, lintian).
* Ignore changes to auto-updated files (via source/options). Let
debian/rules cleanup some more generated files.
* rules: swap dh_makeshlibs and dh_installdeb.
* Update and improve watchfile.
Not matching changelog:
* Revive libpostgis-java: I don't think we can get away without packaging
this. (Especially not w/o an entry in the changelog).
diff --git a/debian/changelog b/debian/changelog
index 88afb7e..936e93b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,22 @@
-postgis (2.0.1-1) unstable; urgency=low
-
- * New upstream release, 2.0.1
- * Removed old patches
- * Added Makefile.comments patch
-
- -- Jerome Villeneuve Larouche Fri, 17 Aug 2012
14:56:22 +
+postgis (2.0.3-1) UNRELEASED; urgency=low
+
+ [Markus Wanner]
+ * New upstream release, 2.0.3
+ * Drop Build-Dep on postgresql server binaries - they are not needed.
+ * Downgrade postgresql-9.1-postgis dependency on postgis to a
+recommendation.
+ * Upgrade postgresql-9.1-java misc-depends from suggestion to dependency.
+ * Fix a common spelling error in liblwgeom/lwout_wkt.c.
+ * Ignore changes to auto-updated files (via source/options). Let
+debian/rules cleanup some more generated files.
+ * rules: swap dh_makeshlibs and dh_installdeb.
+ * Update and improve watchfile.
+
+ [Jerome Villeneuve Larouche]
+ * Removed old patches (generator, html_doc_resources, install)
+ * Added patch fixmakedoc for doc/Makefile.comments.
+
+ -- Markus Wanner Fri, 12 Apr 2013 13:02:33 +0200
postgis (1.5.3-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index f16ed63..0128a44 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,8 @@ Uploaders: Stephen Frost , Francesco Paolo
Lovergine = 8), autotools-dev, flex, bison, libgeos-dev (>=
3.1.1),
libproj-dev (>= 4.5.0), libssl-dev, xsltproc, docbook, docbook-xsl,
default-jdk, libpg-java, fastjar, libjts-java (>= 1.7), imagemagick,
- libcunit1-dev, dblatex, libxml2-dev, libgtk2.0-dev, postgresql-server-dev-9.1,
- ant, libgdal-dev, postgresql-9.1
+ libcunit1-dev, dblatex, libxml2-dev, libgtk2.0-dev,
+ postgresql-server-dev-9.1, ant, libgdal-dev
Standards-Version: 3.9.2
Homepage: http://postgis.refractions.net/
Vcs-Browser: http://git.debian.org/?p=pkg-grass/postgis.git
@@ -15,7 +15,8 @@ Vcs-Git: git://git.debian.org/git/pkg-grass/postgis.git
Package: postgresql-9.1-postgis
Architecture: any
-Depends: ${shlibs:Depends}, postgis, postgresql-9.1, ${misc:Depends}
+Depends: ${shlibs:Depends}, postgresql-9.1, ${misc:Depends}
+Recommends: postgis
Conflicts: postgis (<< 1.2.1)
Description: Geographic objects support for PostgreSQL 9.1
PostGIS adds support for geographic objects to the PostgreSQL
object-relational
@@ -27,8 +28,8 @@ Description: Geographic objects support for PostgreSQL 9.1
This package supports PostgreSQL 9.1.
Package: postgis
-Suggests: postgresql-9.1-postgis
Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: postgresql-9.1-postgis
Architecture: any
Description: Geographic objects support for PostgreSQL -- common files
PostGIS adds support for geographic objects to the PostgreSQL
object-relational
@@ -40,3 +41,19 @@ Description: Geographic objects support for PostgreSQL --
common files
This package contains the PostGIS userland binaries, common files and
documentation.
+Package: libpostgis-java
+Architecture: all
+Section: java
+Depends: libpg-java, ${misc:Depends}
+Suggests: postgresql-9.1-postgis
+Conflicts: 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.
+
diff --git a/debian/patches/fix-spelling.diff b/debian/patches/fix-spelling.diff
new file mode 100644
index 000..ab43b82
--- /dev/null
+++ b/debian/patches/fix-spelling.diff
@@ -0,0 +1,38 @@
+--- a/liblwgeom/lwout_wkt.c
b/liblwgeom/lwout_wkt.c
+@@ -325,7 +325,7 @@
+ }
+ else
+
[SCM] postgis branch, master, updated. upstream/2.0.1-28-g2ec27fa
The following commit has been merged in the master branch: commit 20c607981044662def5a93e0b483772f9891ce1a Merge: 22ccf92f12f7773648cdc5cdfcf068b716cfed89 83ec1be71f04f2646aa8b3285ee777c4b13e2dbd Author: Markus Wanner Date: Thu Apr 11 22:39:58 2013 +0200 Merge branch 'upstream' (i.e. postgis-2.0.3) -- PostGIS for PostgreSQL ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
