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 f507c0257e536efef3033b199ee697f1d019f3b0 Author: Markus Wanner <mar...@bluegap.ch> Date: Sun Mar 30 15:48:52 2014 +0200 Prepare for 2.1.2 release: adjust the first set of patches. Fix expected to fix #728724. --- debian/changelog | 10 ++++++++++ debian/control.in | 2 +- debian/patches/debian-versions | 8 ++++---- debian/patches/honor-build-flags | 2 +- debian/patches/java-version-fix | 9 --------- debian/patches/series | 1 - 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index 209d7f9..38723c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +postgis (2.1.2-1) UNRELEASED; urgency=medium + + * New upstream release, 2.1.1. Closes: #728724. + * Add a suggestion for postgis-doc. Closes: #737497. + * Refresh patches debian-versions, honor-build-flags, and + java-version-fix. + * Drop patch/fix-kfreebsd, got applied upstream. + + -- Markus Wanner <mar...@bluegap.ch> Sun, 30 Mar 2014 15:32:25 +0200 + postgis (2.1.1-6) unstable; urgency=low * Recommend postgresql-contrib-M.N for the fuzzystrmatch diff --git a/debian/control.in b/debian/control.in index f47799a..9b42e73 100644 --- a/debian/control.in +++ b/debian/control.in @@ -23,7 +23,7 @@ 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 +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" diff --git a/debian/patches/debian-versions b/debian/patches/debian-versions index 50f1f46..972b426 100644 --- a/debian/patches/debian-versions +++ b/debian/patches/debian-versions @@ -10,7 +10,7 @@ Last-Update: 2013-07-22 @@ -10,7 +10,7 @@ #define POSTGIS_GEOS_VERSION 34 #define POSTGIS_PROJ_VERSION 48 - #define POSTGIS_LIB_VERSION '2.1.1' + #define POSTGIS_LIB_VERSION '2.1.2' -#define POSTGIS_LIBXML2_VERSION 2.9.0 +#define POSTGIS_LIBXML2_VERSION 2.9.1 @@ -22,9 +22,9 @@ Last-Update: 2013-07-22 DATA_built=postgis_comments.sql raster_comments.sql topology_comments.sql # PGXS information --PG_CONFIG = /usr/local/pgsql/9.2/bin/pg_config --PGXS := /usr/local/pgsql/9.2/lib/pgxs/src/makefiles/pgxs.mk -+PG_CONFIG = /usr/lib/postgresql/9.3/bin/pg_config +-PG_CONFIG = /opt/pgsql/9.2/bin/pg_config +-PGXS := /opt/pgsql/9.2/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) diff --git a/debian/patches/honor-build-flags b/debian/patches/honor-build-flags index 04c3760..5f44f12 100644 --- a/debian/patches/honor-build-flags +++ b/debian/patches/honor-build-flags @@ -56,7 +56,7 @@ Last-Update: 2013-04-23 # Bison 2.5, Flex 2.5.35 --- a/configure +++ b/configure -@@ -19730,7 +19730,7 @@ +@@ -19742,7 +19742,7 @@ _ACEOF diff --git a/debian/patches/java-version-fix b/debian/patches/java-version-fix index 9c409ff..4093bef 100644 --- a/debian/patches/java-version-fix +++ b/debian/patches/java-version-fix @@ -17,12 +17,3 @@ Last-Update: 2014-01-28 </scm> <build> -@@ -176,7 +176,7 @@ - <properties> - <POSTGIS_MAJOR_VERSION>2</POSTGIS_MAJOR_VERSION> - <POSTGIS_MINOR_VERSION>1</POSTGIS_MINOR_VERSION> -- <POSTGIS_MICRO_VERSION>0SVN</POSTGIS_MICRO_VERSION> -+ <POSTGIS_MICRO_VERSION>1</POSTGIS_MICRO_VERSION> - </properties> - - </project> diff --git a/debian/patches/series b/debian/patches/series index f4e41ab..4fdcaf4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,7 +4,6 @@ fix-spelling link-liblwgeom use-debian-maven honor-build-flags -fix-kfreebsd fix-armel fix-big-endian fix-manpage -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/postgis.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel