The following commit has been merged in the master branch: commit 6c783a5a71f4ba6c705935ee0caddc4f356b89e3 Author: Francesco Paolo Lovergine <fran...@debian.org> Date: Thu Sep 15 12:26:58 2011 +0200
Moved to 9.1 version for PostgreSQL. diff --git a/debian/changelog b/debian/changelog index f58542a..86d859c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +postgis (1.5.2-3) unstable; urgency=low + + * + + -- Francesco Paolo Lovergine <fran...@debian.org> Thu, 15 Sep 2011 12:24:35 +0200 + postgis (1.5.2-2) unstable; urgency=low * Repository moved to git and changed Vcs-* fields in debian/control. @@ -11,8 +17,8 @@ postgis (1.5.2-2) unstable; urgency=low unexpected behavior on purging. Now each purge of postgresql-*-postgis will cause extension removal. (closes: #596663) - * Added PostgreSQL 9.0 support. - (closes: #633111) + * Added PostgreSQL 9.1 support. + (closes: #633111, #639474) -- Francesco Paolo Lovergine <fran...@debian.org> Fri, 08 Jul 2011 17:16:12 +0200 diff --git a/debian/control b/debian/control index cca0c63..ca82bc4 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: misc Priority: optional Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org> Uploaders: Stephen Frost <sfr...@debian.org>, Francesco Paolo Lovergine <fran...@debian.org> -Build-Depends: debhelper (>= 8), autotools-dev, flex, bison, postgresql-server-dev-8.4, postgresql-server-dev-9.0, +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, default-jdk, fastjar, libjts-java (>= 1.7), imagemagick, libcunit1-dev, dblatex, libxml2-dev, libgtk2.0-dev @@ -25,21 +25,21 @@ Description: Geographic objects support for PostgreSQL 8.4 . This package supports PostgreSQL 8.4. -Package: postgresql-9.0-postgis +Package: postgresql-9.1-postgis Architecture: any -Depends: ${shlibs:Depends}, postgis, postgresql-9.0, ${misc:Depends} +Depends: ${shlibs:Depends}, postgis, postgresql-9.1, ${misc:Depends} Conflicts: postgis (<< 1.2.1) -Description: Geographic objects support for PostgreSQL 9.0 +Description: Geographic objects support for PostgreSQL 9.1 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 9.0. + This package supports PostgreSQL 9.1. Package: postgis -Suggests: postgresql-8.4-postgis | postgresql-9.0-postgis +Suggests: postgresql-8.4-postgis | postgresql-9.1-postgis Depends: ${shlibs:Depends}, ${misc:Depends} Architecture: any Description: Geographic objects support for PostgreSQL -- common files @@ -56,7 +56,7 @@ Package: libpostgis-java Architecture: all Section: java Depends: libpg-java -Suggests: postgresql-8.4-postgis | postgresql-9.0-postgis, ${misc:Depends} +Suggests: postgresql-8.4-postgis | 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 0a1ae0c..4bfdc55 100755 --- a/debian/rules +++ b/debian/rules @@ -109,34 +109,33 @@ install-arch: build-arch 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 - rm -rf $(CURDIR)/debian/postgresql-8.4-postgis/usr/lib/postgresql/8.4/bin $(MAKE) distclean - # PostGIS for PostgreSQL 9.0 + # PostGIS for PostgreSQL 9.1 ./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/9.0 \ - --datadir=\$${prefix}/share/postgresql-9.0-postgis \ + --exec-prefix=\$${prefix}/lib/postgresql/9.1 \ + --datadir=\$${prefix}/share/postgresql-9.1-postgis \ --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info \ - --with-pgconfig=/usr/lib/postgresql/9.0/bin/pg_config \ + --with-pgconfig=/usr/lib/postgresql/9.1/bin/pg_config \ --with-gui $(MAKE) $(MAKE) -C doc - $(MAKE) install DESTDIR=$(CURDIR)/debian/postgresql-9.0-postgis + $(MAKE) install DESTDIR=$(CURDIR)/debian/postgresql-9.1-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/9.0 + PGSQL_SHAREDIR=$(CURDIR)/debian/postgis/usr/share/postgresql/9.1 install -o root -g root doc/postgis_comments.sql \ - $(CURDIR)/debian/postgresql-9.0-postgis/usr/share/postgresql/9.0/contrib/. - install -o root -g root -d $(CURDIR)/debian/postgresql-9.0-postgis/usr/lib/postgis/$(VERSION)/postgres/9.0/lib - mv $(CURDIR)/debian/postgresql-9.0-postgis/usr/lib/postgresql/9.0/lib/postgis-$(MAJOR_VERSION).$(MINOR_VERSION).so \ - $(CURDIR)/debian/postgresql-9.0-postgis/usr/lib/postgis/$(VERSION)/postgres/9.0/lib/. - mv $(CURDIR)/debian/postgresql-9.0-postgis/usr/lib/postgresql/9.0/bin $(CURDIR)/debian/postgis/usr + $(CURDIR)/debian/postgresql-9.1-postgis/usr/share/postgresql/9.1/contrib/. + install -o root -g root -d $(CURDIR)/debian/postgresql-9.1-postgis/usr/lib/postgis/$(VERSION)/postgres/9.1/lib + mv $(CURDIR)/debian/postgresql-9.1-postgis/usr/lib/postgresql/9.1/lib/postgis-$(MAJOR_VERSION).$(MINOR_VERSION).so \ + $(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 @@ -149,16 +148,16 @@ install-arch: build-arch -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.0 + # Create custom maint scripts: 9.1 # sed -e 's/@POSTGIS_VERSION@/$(VERSION)/' \ - -e 's/@POSTGRES_VERSION@/9.0/' \ + -e 's/@POSTGRES_VERSION@/9.1/' \ -e 's/@SOVERSION@/$(MAJOR_VERSION).$(MINOR_VERSION)/' \ - $(CURDIR)/debian/postgis-postgresql-generic.postinst.in >$(CURDIR)/debian/postgresql-9.0-postgis.postinst + $(CURDIR)/debian/postgis-postgresql-generic.postinst.in >$(CURDIR)/debian/postgresql-9.1-postgis.postinst - sed -e 's/@POSTGRES_VERSIONS@/9.0/' \ + sed -e 's/@POSTGRES_VERSIONS@/9.1/' \ -e 's/@SOVERSION@/$(MAJOR_VERSION).$(MINOR_VERSION)/' \ - $(CURDIR)/debian/postgis-generic.postrm.in >$(CURDIR)/debian/postgresql-9.0-postgis.postrm + $(CURDIR)/debian/postgis-generic.postrm.in >$(CURDIR)/debian/postgresql-9.1-postgis.postrm dh_install -s @@ -166,9 +165,9 @@ install-arch: build-arch 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.0 - mkdir -p $(CURDIR)/debian/postgresql-9.0-postgis/usr/share/postgresql-9.0-postgis/utils - cp utils/*.pl utils/README $(CURDIR)/debian/postgresql-9.0-postgis/usr/share/postgresql-9.0-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 check: install-arch $(MAKE) check -- 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