[SCM] postgis branch, master, updated. upstream/1.5.2-12-g443bced
Francesco Paolo Lovergine
frankie at debian.org
Thu Sep 15 12:05:54 UTC 2011
The following commit has been merged in the master branch:
commit 443bceda6da78c7059de12f54161c42ab37b31c4
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date: Thu Sep 15 13:28:26 2011 +0200
Dropped support for pgsql 8.4.
diff --git a/debian/README.Debian b/debian/README.Debian
index d1cfb02..6019619 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -11,7 +11,7 @@ postgresql-N.M-postgis
SQL script which contains the OpenGIS Spatial References
(spatial_ref_sys.sql).
- DIR=/usr/share/postgresql/*/contrib/postgis*
+ DIR=/usr/share/postgresql/*/contrib/postgis-*
psql -d [yourdatabase] -f $DIR/postgis.sql
psql -d [yourdatabase] -f $DIR/spatial_ref_sys.sql
@@ -73,8 +73,9 @@ Type as root:
createlang plpgsql -d <databasename>
# Finally, load the functions and reference system tables
- psql <databasename> -f /usr/share/postgresql/*/contrib/postgis*/postgis.sql
- psql <databasename> -f /usr/share/postgresql/*/contrib/postgis*/spatial_ref_sys.sql
+ psql <databasename> -f /usr/share/postgresql/*/contrib/postgis-*/postgis.sql
+ psql <databasename> -f /usr/share/postgresql/*/contrib/postgis-*/spatial_ref_sys.sql
+
# login in new database (still as superuser postgres)
psql <databasename>
@@ -118,8 +119,8 @@ geodatabase, type as root:
createlang plpgsql -d template_gis
# Finally, load the functions and reference system tables
- psql template_gis -f /usr/share/postgresql/*/contrib/postgis*/postgis.sql
- psql template_gis -f /usr/share/postgresql/*/contrib/postgis*/spatial_ref_sys.sql
+ psql template_gis -f /usr/share/postgresql/*/contrib/postgis-*/postgis.sql
+ psql template_gis -f /usr/share/postgresql/*/contrib/postgis-*/spatial_ref_sys.sql
# login in new database (still as superuser postgres)
psql template_gis
diff --git a/debian/changelog b/debian/changelog
index 3ff7609..32773f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,9 +13,13 @@ postgis (1.5.2-2) unstable; urgency=low
(closes: #596663)
* Added PostgreSQL 9.1 support. New patch lwgeom_accum added
for supporting 9.1.
- (closes: #633111, #639474)
+ (closes: #633111)
+ * Dropped PostgreSQL 8.4 support, as required for wheezy.
+ (closes: #639474)
+ * Fixed (again) README.Debian for paths.
+ (closes: #575622)
- -- Francesco Paolo Lovergine <frankie at debian.org> Thu, 15 Sep 2011 13:01:50 +0200
+ -- Francesco Paolo Lovergine <frankie at debian.org> Thu, 15 Sep 2011 13:19:40 +0200
postgis (1.5.2-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index ca82bc4..005caab 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ 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 (>= 8), autotools-dev, flex, bison, postgresql-server-dev-8.4, postgresql-server-dev-9.1,
- libgeos-dev (>= 3.1.1), libproj-dev (>= 4.5.0), libssl-dev, xsltproc, docbook, docbook-xsl, libpg-java,
+Build-Depends: debhelper (>= 8), autotools-dev, flex, bison, postgresql-server-dev-9.1,
+ libgeos-dev (>= 3.1.1), libproj-dev (>= 4.5.0), libssl-dev, sltproc, docbook, docbook-xsl, libpg-java,
default-jdk, fastjar, libjts-java (>= 1.7), imagemagick, libcunit1-dev, dblatex, libxml2-dev,
libgtk2.0-dev
Standards-Version: 3.9.2
@@ -12,19 +12,6 @@ Homepage: http://postgis.refractions.net/
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
- 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-9.1-postgis
Architecture: any
Depends: ${shlibs:Depends}, postgis, postgresql-9.1, ${misc:Depends}
@@ -39,7 +26,7 @@ Description: Geographic objects support for PostgreSQL 9.1
This package supports PostgreSQL 9.1.
Package: postgis
-Suggests: postgresql-8.4-postgis | postgresql-9.1-postgis
+Suggests: postgresql-9.1-postgis
Depends: ${shlibs:Depends}, ${misc:Depends}
Architecture: any
Description: Geographic objects support for PostgreSQL -- common files
@@ -56,7 +43,7 @@ Package: libpostgis-java
Architecture: all
Section: java
Depends: libpg-java
-Suggests: postgresql-8.4-postgis | postgresql-9.1-postgis, ${misc:Depends}
+Suggests: postgresql-9.1-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
diff --git a/debian/rules b/debian/rules
index 4bfdc55..1868894 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,7 +66,7 @@ install-indep: build-indep
--docdir=\$${prefix}/share/doc/postgis \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
- --with-pgconfig=/usr/lib/postgresql/8.4/bin/pg_config
+ --with-pgconfig=/usr/lib/postgresql/9.1/bin/pg_config
# PostGIS JDBC (with debug support)
$(MAKE) -C java/jdbc clean
DEBUGJAR=postgis_debug.fastjar JAR=fastjar JAVAC=javac $(MAKE) -C java/jdbc jar
@@ -83,34 +83,6 @@ install-arch: build-arch
# Documentation and common files for PostGIS
[ ! -f doc/html/postgis.html.prev ] && cp doc/html/postgis.html doc/html/postgis.html.prev || true
- # PostGIS for PostgreSQL 8.4
-# CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure
- ./configure \
- --host=$(DEB_HOST_GNU_TYPE) \
- --build=$(DEB_BUILD_GNU_TYPE) \
- --prefix=/usr \
- --with-docdir=$(CURDIR)/debian/postgis/usr/share/doc \
- --exec-prefix=\$${prefix}/lib/postgresql/8.4 \
- --datadir=\$${prefix}/share/postgresql-8.4-postgis \
- --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info \
- --with-pgconfig=/usr/lib/postgresql/8.4/bin/pg_config \
- --with-gui
- $(MAKE)
- $(MAKE) -C doc
- $(MAKE) install DESTDIR=$(CURDIR)/debian/postgresql-8.4-postgis
- $(MAKE) -C doc install \
- PGSQL_DOCDIR=$(CURDIR)/debian/postgis/usr/share/doc/postgis \
- PGSQL_MANDIR=$(CURDIR)/debian/postgis/usr/share/man \
- PGSQL_SHAREDIR=$(CURDIR)/debian/postgis/usr/share/postgresql/8.4
- install -o root -g root doc/postgis_comments.sql \
- $(CURDIR)/debian/postgresql-8.4-postgis/usr/share/postgresql/8.4/contrib/.
- install -o root -g root -d $(CURDIR)/debian/postgresql-8.4-postgis/usr/lib/postgis/$(VERSION)/postgres/8.4/lib
- mv $(CURDIR)/debian/postgresql-8.4-postgis/usr/lib/postgresql/8.4/lib/postgis-$(MAJOR_VERSION).$(MINOR_VERSION).so \
- $(CURDIR)/debian/postgresql-8.4-postgis/usr/lib/postgis/$(VERSION)/postgres/8.4/lib/.
- mv $(CURDIR)/debian/postgresql-8.4-postgis/usr/lib/postgresql/8.4/bin $(CURDIR)/debian/postgis/usr
- $(MAKE) distclean
-
# PostGIS for PostgreSQL 9.1
./configure \
--host=$(DEB_HOST_GNU_TYPE) \
@@ -137,19 +109,8 @@ install-arch: build-arch
$(CURDIR)/debian/postgresql-9.1-postgis/usr/lib/postgis/$(VERSION)/postgres/9.1/lib/.
#mv $(CURDIR)/debian/postgresql-9.0-postgis/usr/lib/postgresql/9.0/bin $(CURDIR)/debian/postgis/usr
- # Create custom maint scripts: 8.4
-
- sed -e 's/@POSTGIS_VERSION@/$(VERSION)/' \
- -e 's/@POSTGRES_VERSION@/8.4/' \
- -e 's/@SOVERSION@/$(MAJOR_VERSION).$(MINOR_VERSION)/' \
- $(CURDIR)/debian/postgis-postgresql-generic.postinst.in >$(CURDIR)/debian/postgresql-8.4-postgis.postinst
-
- sed -e 's/@POSTGRES_VERSIONS@/8.4/' \
- -e 's/@SOVERSION@/$(MAJOR_VERSION).$(MINOR_VERSION)/' \
- $(CURDIR)/debian/postgis-generic.postrm.in >$(CURDIR)/debian/postgresql-8.4-postgis.postrm
-
# Create custom maint scripts: 9.1
- #
+
sed -e 's/@POSTGIS_VERSION@/$(VERSION)/' \
-e 's/@POSTGRES_VERSION@/9.1/' \
-e 's/@SOVERSION@/$(MAJOR_VERSION).$(MINOR_VERSION)/' \
@@ -161,10 +122,6 @@ install-arch: build-arch
dh_install -s
- # copy utils for 8.4
- mkdir -p $(CURDIR)/debian/postgresql-8.4-postgis/usr/share/postgresql-8.4-postgis/utils
- cp utils/*.pl utils/README $(CURDIR)/debian/postgresql-8.4-postgis/usr/share/postgresql-8.4-postgis/utils
-
# copy utils for 9.1
mkdir -p $(CURDIR)/debian/postgresql-9.1-postgis/usr/share/postgresql-9.1-postgis/utils
cp utils/*.pl utils/README $(CURDIR)/debian/postgresql-9.1-postgis/usr/share/postgresql-9.1-postgis/utils
--
PostGIS for PostgreSQL
More information about the Pkg-grass-devel
mailing list