Author: frankie
Date: 2009-09-12 08:51:34 +0000 (Sat, 12 Sep 2009)
New Revision: 2432
Modified:
packages/postgis/trunk/debian/changelog
packages/postgis/trunk/debian/control
packages/postgis/trunk/debian/postgis-generic.postrm.in
packages/postgis/trunk/debian/postgis-postgresql-generic.postinst.in
packages/postgis/trunk/debian/rules
Log:
Supporting 1.4.0 on 8.3/8.4
Modified: packages/postgis/trunk/debian/changelog
===================================================================
--- packages/postgis/trunk/debian/changelog 2009-09-12 08:46:01 UTC (rev
2431)
+++ packages/postgis/trunk/debian/changelog 2009-09-12 08:51:34 UTC (rev
2432)
@@ -1,12 +1,23 @@
-postgis (1.3.5-2) unstable; urgency=low
+postgis (1.4.0-1) unstable; urgency=low
- * NOT RELEASED YET
+ * New upstream release.
+ * Updated configure arguments now obsolete/changed.
+ * Required some new var initialization for installing in debian/ its trees.
+ * The liblwgeom solib is now named postgis, so changed a few things around.
* Updated build-dep: proj -> libproj-dev.
- * Policy bumped to 3.8.1.
+ * Policy bumped to 3.8.3. No changes.
* Debhelper level set to 7.
* Added ${misc:Depends}.
+ * Now postgresql >= 8.3, geos >= 3 and proj >= 4.5 are required. This is
+ reflected in debian/control for safety.
+ * Added PostgreSQL 8.4 support, the 8.3 version will be dropped when
+ required. Now template for postrm is adapted for multiversioning.
+ * Now build-dep on default-jdk which is DFSG-safe.
+ (closes: #529503)
+ * Removed Fabio Tranchitella among Uploaders because retired from DebianGis.
+ * Now build-dep on imagemagick because doc generation requires convert tool.
- -- Francesco Paolo Lovergine <fran...@debian.org> Mon, 30 Mar 2009 12:07:54
+0200
+ -- Francesco Paolo Lovergine <fran...@debian.org> Sat, 12 Sep 2009 10:50:15
+0200
postgis (1.3.5-1) unstable; urgency=low
Modified: packages/postgis/trunk/debian/control
===================================================================
--- packages/postgis/trunk/debian/control 2009-09-12 08:46:01 UTC (rev
2431)
+++ packages/postgis/trunk/debian/control 2009-09-12 08:51:34 UTC (rev
2432)
@@ -2,14 +2,28 @@
Section: misc
Priority: optional
Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
-Uploaders: Stephen Frost <sfr...@debian.org>, Fabio Tranchitella
<kob...@debian.org>, Francesco Paolo Lovergine <fran...@debian.org>
-Build-Depends: debhelper (>= 7), autotools-dev, flex, bison,
postgresql-server-dev-8.3, libgeos-dev, libproj-dev,
- libssl-dev, xsltproc, docbook, docbook-xsl, libpg-java,
jikes-classpath, fastjar, libjts-java (>= 1.7), dpatch
-Standards-Version: 3.8.1
+Uploaders: Stephen Frost <sfr...@debian.org>, Francesco Paolo Lovergine
<fran...@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
+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}
@@ -24,7 +38,7 @@
This package supports PostgreSQL 8.3.
Package: postgis
-Suggests: postgresql-8.3-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
@@ -41,7 +55,7 @@
Architecture: all
Section: science
Depends: libpg-java
-Suggests: postgresql-8.3-postgis, ${misc:Depends}
+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
Modified: packages/postgis/trunk/debian/postgis-generic.postrm.in
===================================================================
--- packages/postgis/trunk/debian/postgis-generic.postrm.in 2009-09-12
08:46:01 UTC (rev 2431)
+++ packages/postgis/trunk/debian/postgis-generic.postrm.in 2009-09-12
08:51:34 UTC (rev 2432)
@@ -4,7 +4,10 @@
# Removes all postgis shared libs links
if [ "$1" = "purge" ]; then
- find /usr/lib/postgresql/@POSTGRES_VERSION@/lib -type f -name
"liblwgeom.so.*" -delete
+ for version in @POSTGRES_VERSIONS@
+ do
+ find /usr/lib/postgresql/$version/lib -type f -name
"postg...@soversion@.so" -delete
+ done
fi
#DEBHELPER#
Modified: packages/postgis/trunk/debian/postgis-postgresql-generic.postinst.in
===================================================================
--- packages/postgis/trunk/debian/postgis-postgresql-generic.postinst.in
2009-09-12 08:46:01 UTC (rev 2431)
+++ packages/postgis/trunk/debian/postgis-postgresql-generic.postinst.in
2009-09-12 08:51:34 UTC (rev 2432)
@@ -4,9 +4,9 @@
# Creates a link for the shared lib in the postgres area
if [ "$1" = "configure" ]; then
- if [ -f
/usr/lib/postgis/@POSTGIS_VERSION@/postgres/@POSTGRES_VERSION@/lib/liblwgeom....@soversion@
]; then
- ln -f
/usr/lib/postgis/@POSTGIS_VERSION@/postgres/@POSTGRES_VERSION@/lib/liblwgeom....@soversion@
\
-
/usr/lib/postgresql/@POSTGRES_VERSION@/lib/liblwgeom....@soversion@
+ if [ -f
/usr/lib/postgis/@POSTGIS_VERSION@/postgres/@POSTGRES_VERSION@/lib/postg...@soversion@.so
]; then
+ ln -f
/usr/lib/postgis/@POSTGIS_VERSION@/postgres/@POSTGRES_VERSION@/lib/postg...@soversion@.so
\
+
/usr/lib/postgresql/@POSTGRES_VERSION@/lib/postg...@soversion@.so
fi
fi
Modified: packages/postgis/trunk/debian/rules
===================================================================
--- packages/postgis/trunk/debian/rules 2009-09-12 08:46:01 UTC (rev 2431)
+++ packages/postgis/trunk/debian/rules 2009-09-12 08:51:34 UTC (rev 2432)
@@ -1,6 +1,5 @@
#!/usr/bin/make -f
# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
#
# This file was originally written by Joey Hess and Craig Small.
# As a special exception, when this file is copied by dh-make into a
@@ -25,10 +24,13 @@
CFLAGS = -Wall -g
-MAJOR_VERSION = $(shell grep REL_MAJOR_VERSION Version.config|cut -d= -f2)
-MINOR_VERSION = $(shell grep REL_MINOR_VERSION Version.config|cut -d= -f2)
-MICRO_VERSION = $(shell grep REL_MICRO_VERSION Version.config|cut -d= -f2)
+MAJOR_VERSION = $(shell grep POSTGIS_MAJOR_VERSION Version.config|cut -d= -f2)
+MINOR_VERSION = $(shell grep POSTGIS_MINOR_VERSION Version.config|cut -d= -f2)
+MICRO_VERSION = $(shell grep POSTGIS_MICRO_VERSION Version.config|cut -d= -f2)
VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION)
+ifeq ($(VERSION),..)
+$(error Cannot detect Postgis version, fix debian/rules)
+endif
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
@@ -52,7 +54,7 @@
dh_testroot
rm -f build-arch-stamp build-indep-stamp
[ -f doc/html/postgis.html.prev ] && mv doc/html/postgis.html.prev
doc/html/postgis.html || true
- [ ! -f Makefile ] || $(MAKE) distclean
+ [ ! -f GNUmakefile ] || $(MAKE) distclean || true
[ ! -f java/jdbc/Makefile ] || $(MAKE) -C java/jdbc clean
rm -f $(CURDIR)/debian/*.postinst $(CURDIR)/debian/*.postrm
dh_clean
@@ -64,13 +66,13 @@
dh_prep -i
dh_installdirs -i
CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure \
- --with-docdir=\$${prefix}/share/doc/postgis \
+ --docdir=\$${prefix}/share/doc/postgis \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info
# PostGIS JDBC (with debug support)
$(MAKE) -C java/jdbc clean
- DEBUGJAR=postgis_debug.fastjar JAR=fastjar JAVAC=jikes-classpath
$(MAKE) -C java/jdbc jar
- DEBUGJAR=postgis_debug.fastjar JAR=fastjar JAVAC=jikes-classpath
$(MAKE) -C java/jdbc install
DESTDIR=$(CURDIR)/debian/libpostgis-java/usr/share/java/$(JAVA_PATH)
+ DEBUGJAR=postgis_debug.fastjar JAR=fastjar JAVAC=java $(MAKE) -C
java/jdbc jar
+ DEBUGJAR=postgis_debug.fastjar JAR=fastjar JAVAC=java $(MAKE) -C
java/jdbc install
DESTDIR=$(CURDIR)/debian/libpostgis-java/usr/share/java/$(JAVA_PATH)
$(MAKE) distclean
dh_install -i
@@ -81,38 +83,76 @@
dh_installdirs -s
# 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.3
CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure \
--host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr \
- --with-docdir=$(CURDIR)/debian/postgis/usr/share/doc \
+ --docdir=$(CURDIR)/debian/postgis/usr/share/doc \
--exec-prefix=\$${prefix}/lib/postgresql/8.3 \
--datadir=\$${prefix}/share/postgresql-8.3-postgis \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
- --with-pgsql=/usr/lib/postgresql/8.3/bin/pg_config \
- --with-geos \
- --with-proj
+ --with-pgconfig=/usr/lib/postgresql/8.3/bin/pg_config
$(MAKE)
$(MAKE) -C doc
- $(MAKE) install prefix=$(CURDIR)/debian/postgresql-8.3-postgis/usr
- $(MAKE) -C doc install prefix=$(CURDIR)/debian/postgis/usr
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/postgresql-8.3-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.3
install -o root -g root -d
$(CURDIR)/debian/postgresql-8.3-postgis/usr/lib/postgis/$(VERSION)/postgres/8.3/lib
- mv
$(CURDIR)/debian/postgresql-8.3-postgis/usr/lib/postgresql/8.3/lib/liblwgeom.so.$(MAJOR_VERSION).$(MINOR_VERSION)
\
-
$(CURDIR)/debian/postgresql-8.3-postgis/usr/lib/postgis/$(VERSION)/postgres/8.3/lib
- mv $(CURDIR)/debian/postgresql-8.3-postgis/usr/lib/postgresql/8.3/bin
$(CURDIR)/debian/postgis/usr
+ mv
$(CURDIR)/debian/postgresql-8.3-postgis/usr/lib/postgresql/8.3/lib/postgis-$(MAJOR_VERSION).$(MINOR_VERSION).so
\
+
$(CURDIR)/debian/postgresql-8.3-postgis/usr/lib/postgis/$(VERSION)/postgres/8.3/lib/.
+ rm -rf
$(CURDIR)/debian/postgresql-8.3-postgis/usr/lib/postgresql/8.3/bin
$(MAKE) distclean
- sed -e 's/@POSTGIS_VERSION@/1.3.5/' \
+
+ # PostGIS for PostgreSQL 8.4
+ CFLAGS="$(CFLAGS) -Wl,-z,defs" ./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
+ $(MAKE)
+ $(MAKE) -C doc
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/postgresql-8.4-postgis
+ ls -lR $(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 -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
+
+ sed -e 's/@POSTGIS_VERSION@/1.4.0/' \
-e 's/@POSTGRES_VERSION@/8.3/' \
- -e 's/@SOVERSION@/1.3/' \
+ -e 's/@SOVERSION@/1.4/' \
$(CURDIR)/debian/postgis-postgresql-generic.postinst.in
>$(CURDIR)/debian/postgresql-8.3-postgis.postinst
- sed -e 's/@POSTGRES_VERSION@/8.3/' \
+
+ sed -e 's/@POSTGIS_VERSION@/1.4.0/' \
+ -e 's/@POSTGRES_VERSION@/8.4/' \
+ -e 's/@SOVERSION@/1.4/' \
+ $(CURDIR)/debian/postgis-postgresql-generic.postinst.in
>$(CURDIR)/debian/postgresql-8.4-postgis.postinst
+
+ sed -e 's/@POSTGRES_VERSIONS@/8.3 8.4/' \
+ -e 's/@SOVERSION@/1.4/' \
$(CURDIR)/debian/postgis-generic.postrm.in
>$(CURDIR)/debian/postgis.postrm
+
dh_install -s
# copy utils
mkdir -p
$(CURDIR)/debian/postgresql-8.3-postgis/usr/share/postgresql-8.3-postgis/utils
cp utils/*.pl utils/README
$(CURDIR)/debian/postgresql-8.3-postgis/usr/share/postgresql-8.3-postgis/utils
+ 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
# Must not depend on anything. This is to be called by
# binary-arch/binary-indep
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
