[SCM] postgis branch, master, updated. upstream/1.5.2-5-gf796197
Francesco Paolo Lovergine
frankie at debian.org
Thu Mar 24 17:12:58 UTC 2011
The following commit has been merged in the master branch:
commit d47020f80a4bf2b4490903e2b3e16ce68d451c31
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date: Thu Mar 24 17:37:13 2011 +0100
Main changes after squeeze.
diff --git a/debian/changelog b/debian/changelog
index 869c1bd..cf82cf7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+postgis (1.5.2-2) unstable; urgency=low
+
+ * Repository moved to git and changed Vcs-* fields in debian/control.
+ * Removed obsolete debian/control_lenny.
+ * Policy bumped to 3.9.1. No changes.
+ * Moved to source format 3.0 with quilt support.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org> Thu, 24 Mar 2011 17:30:48 +0100
+
postgis (1.5.2-1) unstable; urgency=low
* New upstream release, with a few bug fixes.
diff --git a/debian/control b/debian/control
index 5e2cc43..b11da3a 100644
--- a/debian/control
+++ b/debian/control
@@ -5,18 +5,18 @@ 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>
Build-Depends: debhelper (>= 7), autotools-dev, flex, bison, postgresql-server-dev-8.4,
libgeos-dev (>= 3.1.1), libproj-dev (>= 4.5.0), libssl-dev, xsltproc, docbook, docbook-xsl, libpg-java,
- default-jdk, fastjar, libjts-java (>= 1.7), dpatch, imagemagick, libcunit1-dev, dblatex, libxml2-dev,
+ default-jdk, fastjar, libjts-java (>= 1.7), imagemagick, libcunit1-dev, dblatex, libxml2-dev,
libgtk2.0-dev
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
Homepage: http://postgis.refractions.net/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-grass/packages/postgis/
-Vcs-Svn: svn://svn.debian.org/pkg-grass/packages/postgis/
+Vcs-Browser: http://git.debian.org/?p=pkg-grass/postgis.git
+Vcs-Git: git://git.debian.org/git/pkg-grass/postgis.git
Package: postgresql-8.4-postgis
Architecture: any
Depends: ${shlibs:Depends}, postgis, postgresql-8.4, ${misc:Depends}
Conflicts: postgis (<< 1.2.1)
-Description: geographic objects support for PostgreSQL 8.4
+Description: Geographic objects support for PostgreSQL 8.4
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
@@ -29,7 +29,7 @@ Package: postgis
Suggests: postgresql-8.4-postgis
Depends: ${shlibs:Depends}, ${misc:Depends}
Architecture: any
-Description: geographic objects support for PostgreSQL -- common files
+Description: Geographic objects support for PostgreSQL -- common 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
@@ -46,7 +46,7 @@ Depends: libpg-java
Suggests: postgresql-8.4-postgis, ${misc:Depends}
Conflicts: libpostgis-jdbc, libpostgisjava, postgresql-postgis-java
Replaces: libpostgis-jdbc, libpostgisjava, postgresql-postgis-java
-Description: geographic objects support for PostgreSQL -- JDBC support
+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
diff --git a/debian/control_lenny b/debian/control_lenny
deleted file mode 100644
index 825dc48..0000000
--- a/debian/control_lenny
+++ /dev/null
@@ -1,68 +0,0 @@
-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>
-Build-Depends: debhelper (>= 7), autotools-dev, flex, bison, postgresql-server-dev-8.3, postgresql-server-dev-8.4,
- libgeos-dev (>= 3.0.0), libproj-dev (>= 4.5.0), libssl-dev, xsltproc, docbook, docbook-xsl, libpg-java,
- default-jdk, fastjar, libjts-java (>= 1.7), dpatch, imagemagick, libcunit1-dev, dblatex
-Standards-Version: 3.8.3
-Homepage: http://postgis.refractions.net/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-grass/packages/postgis/
-Vcs-Svn: svn://svn.debian.org/pkg-grass/packages/postgis/
-
-Package: postgresql-8.4-postgis
-Architecture: any
-Depends: ${shlibs:Depends}, postgis, postgresql-8.4, ${misc:Depends}
-Conflicts: postgis (<< 1.2.1)
-Description: geographic objects support for PostgreSQL 8.4
- 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 8.4.
-
-Package: postgresql-8.3-postgis
-Architecture: any
-Depends: ${shlibs:Depends}, postgis, postgresql-8.3, ${misc:Depends}
-Conflicts: postgis (<< 1.2.1)
-Description: geographic objects support for PostgreSQL 8.3
- 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 8.3.
-
-Package: postgis
-Suggests: postgresql-8.3-postgis | postgresql-8.4-postgis
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Architecture: any
-Description: geographic objects support for PostgreSQL -- common 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 package contains the PostGIS userland binaries, common files and
- documentation.
-
-Package: libpostgis-java
-Architecture: all
-Section: science
-Depends: libpg-java
-Suggests: postgresql-8.3-postgis | postgresql-8.4-postgis, ${misc:Depends}
-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/DPATCH b/debian/patches/DPATCH
deleted file mode 100644
index 7710fef..0000000
--- a/debian/patches/DPATCH
+++ /dev/null
@@ -1,16 +0,0 @@
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
diff --git a/debian/patches/generator b/debian/patches/generator
new file mode 100644
index 0000000..11d19c0
--- /dev/null
+++ b/debian/patches/generator
@@ -0,0 +1,13 @@
+Index: postgis/doc/html/image_src/generator.c
+===================================================================
+--- postgis.orig/doc/html/image_src/generator.c 2011-03-24 17:12:30.000000000 +0100
++++ postgis/doc/html/image_src/generator.c 2011-03-24 17:36:08.000000000 +0100
+@@ -363,7 +363,7 @@
+ while ( fgets ( line, sizeof line, pfile ) != NULL && !isspace(*line) )
+ {
+
+- char output[2048];
++ char output[4096];
+ char *ptr = output;
+ char *styleName;
+ int useDefaultStyle;
diff --git a/debian/patches/generator.dpatch b/debian/patches/generator.dpatch
deleted file mode 100755
index dc1f222..0000000
--- a/debian/patches/generator.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## generator.dpatch by Francesco Paolo Lovergine <frankie at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' postgis-1.5.1~/doc/html/image_src/generator.c postgis-1.5.1/doc/html/image_src/generator.c
---- postgis-1.5.1~/doc/html/image_src/generator.c 2010-02-01 18:35:55.000000000 +0100
-+++ postgis-1.5.1/doc/html/image_src/generator.c 2010-05-17 14:21:04.000000000 +0200
-@@ -363,7 +363,7 @@
- while ( fgets ( line, sizeof line, pfile ) != NULL && !isspace(*line) )
- {
-
-- char output[2048];
-+ char output[4096];
- char *ptr = output;
- char *styleName;
- int useDefaultStyle;
diff --git a/debian/patches/install b/debian/patches/install
new file mode 100644
index 0000000..243e1ab
--- /dev/null
+++ b/debian/patches/install
@@ -0,0 +1,15 @@
+Index: postgis/java/jdbc/Makefile
+===================================================================
+--- postgis.orig/java/jdbc/Makefile 2011-03-24 17:12:30.000000000 +0100
++++ postgis/java/jdbc/Makefile 2011-03-24 17:35:23.000000000 +0100
+@@ -251,8 +251,8 @@
+ install: jar installdirs
+ @echo Testing for successful inclusion of ../Makefile.config
+ test ../Makefile.config
+- $(INSTALL_DATA) postgis.jar $(DESTDIR)
+- $(INSTALL_DATA) postgis_debug.jar $(DESTDIR)
++ install -m 644 postgis.jar $(DESTDIR)
++ install -m 644 postgis_debug.jar $(DESTDIR)
+
+ installdirs:
+ @mkdir -p $(DESTDIR)
diff --git a/debian/patches/install.dpatch b/debian/patches/install.dpatch
deleted file mode 100755
index 584373b..0000000
--- a/debian/patches/install.dpatch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## java.dpatch by Francesco Paolo Lovergine <frankie at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixing missing var
-
- at DPATCH@
-diff -urNad postgis-1.4.0~/java/jdbc/Makefile postgis-1.4.0/java/jdbc/Makefile
---- postgis-1.4.0~/java/jdbc/Makefile 2008-07-03 19:08:49.000000000 +0200
-+++ postgis-1.4.0/java/jdbc/Makefile 2009-09-12 12:28:26.000000000 +0200
-@@ -251,8 +251,8 @@
- install: jar installdirs
- @echo Testing for successful inclusion of ../Makefile.config
- test ../Makefile.config
-- $(INSTALL_DATA) postgis.jar $(DESTDIR)
-- $(INSTALL_DATA) postgis_debug.jar $(DESTDIR)
-+ install -m 644 postgis.jar $(DESTDIR)
-+ install -m 644 postgis_debug.jar $(DESTDIR)
-
- installdirs:
- @mkdir -p $(DESTDIR)
diff --git a/debian/patches/00list b/debian/patches/series
similarity index 100%
rename from debian/patches/00list
rename to debian/patches/series
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
PostGIS for PostgreSQL
More information about the Pkg-grass-devel
mailing list