[SCM] postgis branch, master, updated. upstream/2.0.1-51-g1870c6d

2013-06-14 Thread Markus Wanner
The following commit has been merged in the master branch:
commit 1870c6db590d8904c5fbafee9eb195154223b74a
Author: Markus Wanner mar...@bluegap.ch
Date:   Fri Jun 14 13:24:48 2013 +0200

Change the libgdal-dev dependency to libgdal1-dev. Should fix
the build on precise.

diff --git a/debian/changelog b/debian/changelog
index 24e39c5..14e6e60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+postgis (2.0.3-2) UNRELEASED; urgency=low
+
+  * Rather than depending on the transitional libgdal-dev package, use
+libgdal1-dev right away.
+
+ -- Markus Wanner mar...@bluegap.ch  Fri, 14 Jun 2013 13:08:58 +0200
+
 postgis (2.0.3-1) unstable; urgency=low
 
   [Markus Wanner]
diff --git a/debian/control b/debian/control
index 293c25d..16efade 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (= 8), dpkg-dev (= 1.16.1~), 
autotools-dev,
  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 (= 2.5.0~), libgtk2.0-dev,
- libgdal-dev (= 1.6.0~), postgresql-server-dev-all
+ libgdal1-dev (= 1.6.0~), postgresql-server-dev-all
 Build-Depends-Indep: libpostgresql-jdbc-java, libsurefire-java,
  libmaven-clean-plugin-java, libmaven-compiler-plugin-java,
  libmaven-jar-plugin-java, libmaven-resources-plugin-java, maven2
@@ -21,7 +21,7 @@ Vcs-Git: git://anonscm.debian.org/pkg-grass/postgis.git
 Package: postgis
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: postgresql-9.1-postgis-2.0
+Suggests: postgresql-9.2-postgis-2.0
 Description: Geographic objects support for PostgreSQL
  PostGIS adds support for geographic objects to the PostgreSQL
  object-relational database. In effect, PostGIS spatially enables
@@ -51,7 +51,7 @@ Package: libpostgis-java
 Architecture: all
 Section: java
 Depends: libpostgresql-jdbc-java, ${misc:Depends}
-Suggests: postgresql-9.1-postgis-2.0
+Suggests: postgresql-9.2-postgis-2.0
 Breaks: libpostgis-jdbc, libpostgisjava, postgresql-postgis-java
 Replaces: libpostgis-jdbc, libpostgisjava, postgresql-postgis-java
 Description: Geographic objects support for PostgreSQL -- JDBC support
diff --git a/debian/control.in b/debian/control.in
index 1cf3c80..5e42f12 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -9,7 +9,7 @@ Build-Depends: debhelper (= 8), dpkg-dev (= 1.16.1~), 
autotools-dev,
  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 (= 2.5.0~), libgtk2.0-dev,
- libgdal-dev (= 1.6.0~), postgresql-server-dev-all
+ libgdal1-dev (= 1.6.0~), postgresql-server-dev-all
 Build-Depends-Indep: libpostgresql-jdbc-java, libsurefire-java,
  libmaven-clean-plugin-java, libmaven-compiler-plugin-java,
  libmaven-jar-plugin-java, libmaven-resources-plugin-java, maven2

-- 
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


Processing of postgis_2.0.3-1_amd64.changes

2013-06-14 Thread Debian FTP Masters
postgis_2.0.3-1_amd64.changes uploaded successfully to localhost
along with the files:
  postgis_2.0.3-1.dsc
  postgis_2.0.3.orig.tar.gz
  postgis_2.0.3-1.debian.tar.gz
  postgis_2.0.3-1_amd64.deb
  liblwgeom-2.0.3_2.0.3-1_amd64.deb
  liblwgeom-dev_2.0.3-1_amd64.deb
  postgresql-9.1-postgis-2.0_2.0.3-1_amd64.deb
  postgis-doc_2.0.3-1_all.deb
  libpostgis-java_2.0.3-1_all.deb
  postgresql-9.1-postgis-2.0-scripts_2.0.3-1_all.deb

Greetings,

Your Debian queue daemon (running on host franck.debian.org)

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


postgis_2.0.3-1_amd64.changes is NEW

2013-06-14 Thread Debian FTP Masters
binary:postgresql-9.1-postgis-2.0 is NEW.
binary:liblwgeom-dev is NEW.
binary:liblwgeom-2.0.3 is NEW.
binary:postgis-doc is NEW.
binary:postgresql-9.1-postgis-2.0-scripts is NEW.

Your package contains new components which requires manual editing of
the override file.  It is ok otherwise, so please be patient.  New
packages are usually added to the override file about once a week.

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


[SCM] postgis branch, master, updated. upstream/2.0.1-52-g467b742

2013-06-14 Thread Markus Wanner
The following commit has been merged in the master branch:
commit 467b742905c66ea7eed5c9bc3626dd5638aaa948
Author: Markus Wanner mar...@bluegap.ch
Date:   Fri Jun 14 14:44:57 2013 +0200

Build-Deps: correct libgeos-dev version requirement, depend on
libpostgresql-jdbc-java instead of (transitional) libpg-java.

diff --git a/debian/changelog b/debian/changelog
index 14e6e60..555f6fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ postgis (2.0.3-2) UNRELEASED; urgency=low
 
   * Rather than depending on the transitional libgdal-dev package, use
 libgdal1-dev right away.
+  * Build-Deps: correct libgeos-dev version requirement, depend on
+libpostgresql-jdbc-java instead of (transitional) libpg-java.
 
  -- Markus Wanner mar...@bluegap.ch  Fri, 14 Jun 2013 13:08:58 +0200
 
diff --git a/debian/control b/debian/control
index 16efade..daf1459 100644
--- a/debian/control
+++ b/debian/control
@@ -5,11 +5,11 @@ Maintainer: Debian GIS Project 
pkg-grass-devel@lists.alioth.debian.org
 Uploaders: Stephen Frost sfr...@debian.org, Francesco Paolo
  Lovergine fran...@debian.org, Markus Wanner mar...@bluegap.ch
 Build-Depends: debhelper (= 8), dpkg-dev (= 1.16.1~), autotools-dev,
- flex, bison, libgeos-dev (= 3.1.1), libjson0-dev (= 0.9~),
+ flex, bison, libgeos-dev (= 3.3.0~), libjson0-dev (= 0.9~),
  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 (= 2.5.0~), libgtk2.0-dev,
- libgdal1-dev (= 1.6.0~), postgresql-server-dev-all
+ default-jdk, libpostgresql-jdbc-java, fastjar, libjts-java (= 1.7),
+ imagemagick, libcunit1-dev, dblatex, libxml2-dev (= 2.5.0~),
+ libgtk2.0-dev, libgdal1-dev (= 1.6.0~), postgresql-server-dev-all
 Build-Depends-Indep: libpostgresql-jdbc-java, libsurefire-java,
  libmaven-clean-plugin-java, libmaven-compiler-plugin-java,
  libmaven-jar-plugin-java, libmaven-resources-plugin-java, maven2
@@ -21,7 +21,7 @@ Vcs-Git: git://anonscm.debian.org/pkg-grass/postgis.git
 Package: postgis
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: postgresql-9.2-postgis-2.0
+Suggests: postgresql-9.1-postgis-2.0
 Description: Geographic objects support for PostgreSQL
  PostGIS adds support for geographic objects to the PostgreSQL
  object-relational database. In effect, PostGIS spatially enables
@@ -51,7 +51,7 @@ Package: libpostgis-java
 Architecture: all
 Section: java
 Depends: libpostgresql-jdbc-java, ${misc:Depends}
-Suggests: postgresql-9.2-postgis-2.0
+Suggests: postgresql-9.1-postgis-2.0
 Breaks: libpostgis-jdbc, libpostgisjava, postgresql-postgis-java
 Replaces: libpostgis-jdbc, libpostgisjava, postgresql-postgis-java
 Description: Geographic objects support for PostgreSQL -- JDBC support
diff --git a/debian/control.in b/debian/control.in
index 5e42f12..8fcf2e9 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -5,11 +5,11 @@ Maintainer: Debian GIS Project 
pkg-grass-devel@lists.alioth.debian.org
 Uploaders: Stephen Frost sfr...@debian.org, Francesco Paolo
  Lovergine fran...@debian.org, Markus Wanner mar...@bluegap.ch
 Build-Depends: debhelper (= 8), dpkg-dev (= 1.16.1~), autotools-dev,
- flex, bison, libgeos-dev (= 3.1.1), libjson0-dev (= 0.9~),
+ flex, bison, libgeos-dev (= 3.3.0~), libjson0-dev (= 0.9~),
  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 (= 2.5.0~), libgtk2.0-dev,
- libgdal1-dev (= 1.6.0~), postgresql-server-dev-all
+ default-jdk, libpostgresql-jdbc-java, fastjar, libjts-java (= 1.7),
+ imagemagick, libcunit1-dev, dblatex, libxml2-dev (= 2.5.0~),
+ libgtk2.0-dev, libgdal1-dev (= 1.6.0~), postgresql-server-dev-all
 Build-Depends-Indep: libpostgresql-jdbc-java, libsurefire-java,
  libmaven-clean-plugin-java, libmaven-compiler-plugin-java,
  libmaven-jar-plugin-java, libmaven-resources-plugin-java, maven2

-- 
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


[SCM] mapserver branch, master, updated. upstream/6.2.0-42-ga6d3a03

2013-06-14 Thread Alan Boudreault
The following commit has been merged in the master branch:
commit a6d3a033982f6ee6683f1e1c019e7234535b7dc4
Author: Alan Boudreault aboudrea...@mapgears.com
Date:   Fri Jun 14 12:54:04 2013 +

Added patch php_segfault

diff --git a/debian/patches/php_segfault b/debian/patches/php_segfault
new file mode 100644
index 000..53c2b76
--- /dev/null
+++ b/debian/patches/php_segfault
@@ -0,0 +1,11 @@
+--- a/mapscript/php/php_mapscript.c
 b/mapscript/php/php_mapscript.c
+@@ -169,7 +169,7 @@
+   map = mapObj_newFromString(string, path);
+ 
+   if (map == NULL) {
+-mapscript_throw_mapserver_exception(Failed to open map file \%s\, or 
map file error. TSRMLS_CC,  string);
++mapscript_throw_mapserver_exception(Error while loading map file from 
string. TSRMLS_CC);
+ return;
+   }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 8b1a364..73cca95 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 fixmapscriptvars.patch
+php_segfault
+debian-changes-6.2.1-1

-- 
Mapserver

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


[SCM] mapserver branch, master, updated. upstream/6.2.0-43-gb21d02c

2013-06-14 Thread Alan Boudreault
The following commit has been merged in the master branch:
commit b21d02c79f3325308be722dac26d4433ccff4ab0
Author: Alan Boudreault aboudrea...@mapgears.com
Date:   Fri Jun 14 13:24:50 2013 +

Added patch php_segfault

diff --git a/debian/changelog b/debian/changelog
index 93e9090..82836df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mapserver (6.2.1-2) unstable; urgency=low
+
+  * Add patch php_segfault.
+
+ -- Alan Boudreault aboudrea...@mapgears.com  Fri, 14 Jun 2013 13:22:58 +
+
 mapserver (6.2.1-1) unstable; urgency=low
 
   * New Upstream release

-- 
Mapserver

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


[SCM] postgis branch, master, updated. upstream/2.0.1-53-g43bd658

2013-06-14 Thread Markus Wanner
The following commit has been merged in the master branch:
commit 43bd658f8abbcafb7f9c20c61080b799d72173b4
Author: Markus Wanner mar...@bluegap.ch
Date:   Fri Jun 14 17:03:40 2013 +0200

Lower dependency on libgeos-dev to 3.2.2 and instead dynamically
disable topology support, if GEOS is not new enough - for
backportability.

diff --git a/debian/changelog b/debian/changelog
index 555f6fd..d5611cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ postgis (2.0.3-2) UNRELEASED; urgency=low
 libgdal1-dev right away.
   * Build-Deps: correct libgeos-dev version requirement, depend on
 libpostgresql-jdbc-java instead of (transitional) libpg-java.
+  * Lower dependency on libgeos-dev to 3.2.2 and instead dynamically
+disable topology support, if GEOS is not new enough - for
+backportability.
 
  -- Markus Wanner mar...@bluegap.ch  Fri, 14 Jun 2013 13:08:58 +0200
 
diff --git a/debian/control b/debian/control
index daf1459..eb7b948 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian GIS Project 
pkg-grass-devel@lists.alioth.debian.org
 Uploaders: Stephen Frost sfr...@debian.org, Francesco Paolo
  Lovergine fran...@debian.org, Markus Wanner mar...@bluegap.ch
 Build-Depends: debhelper (= 8), dpkg-dev (= 1.16.1~), autotools-dev,
- flex, bison, libgeos-dev (= 3.3.0~), libjson0-dev (= 0.9~),
+ flex, bison, libgeos-dev (= 3.2.2~), libjson0-dev (= 0.9~),
  libproj-dev (= 4.5.0), libssl-dev, xsltproc, docbook, docbook-xsl,
  default-jdk, libpostgresql-jdbc-java, fastjar, libjts-java (= 1.7),
  imagemagick, libcunit1-dev, dblatex, libxml2-dev (= 2.5.0~),
diff --git a/debian/control.in b/debian/control.in
index 8fcf2e9..811d872 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -5,7 +5,7 @@ Maintainer: Debian GIS Project 
pkg-grass-devel@lists.alioth.debian.org
 Uploaders: Stephen Frost sfr...@debian.org, Francesco Paolo
  Lovergine fran...@debian.org, Markus Wanner mar...@bluegap.ch
 Build-Depends: debhelper (= 8), dpkg-dev (= 1.16.1~), autotools-dev,
- flex, bison, libgeos-dev (= 3.3.0~), libjson0-dev (= 0.9~),
+ flex, bison, libgeos-dev (= 3.2.2~), libjson0-dev (= 0.9~),
  libproj-dev (= 4.5.0), libssl-dev, xsltproc, docbook, docbook-xsl,
  default-jdk, libpostgresql-jdbc-java, fastjar, libjts-java (= 1.7),
  imagemagick, libcunit1-dev, dblatex, libxml2-dev (= 2.5.0~),
diff --git a/debian/rules b/debian/rules
index 65d39c0..8ef0ca3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -73,6 +73,19 @@ COMMON_CONFIGURE_ARGS = --host=$(DEB_HOST_GNU_TYPE) \
--infodir=\$${prefix}/share/info \
--with-gui
 
+# Retrieve the version of the GEOS library installed.
+GEOS_VERSION = $(shell geos-config --version)
+
+# Depending on that, we either request or disable topology support.
+ENABLE_TOPOLOGY = $(shell dpkg --compare-versions \
+   $(GEOS_VERSION) ge 3.3.2  echo yes)
+
+ifeq ($(ENABLE_TOPOLOGY),yes)
+   COMMON_CONFIGURE_ARGS += --with-topology
+else
+   COMMON_CONFIGURE_ARGS += --without-topology
+endif
+
 build: build-arch build-indep
 
 build-arch: build-arch-stamp

-- 
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