The following commit has been merged in the master branch:
commit 8d5f68a54b21fce89e0438469e0aeb5c5c25624d
Author: Markus Wanner <mar...@bluegap.ch>
Date: Wed Jun 5 22:48:50 2013 +0200
It turned out the SQL scripts differ between Postgres
versions. So we need a per-postgres-version package of the
scripts (while still architecture independent). This relieves us
from the symlink dance. Rename the script package as appropriate
and adjust the changelog.
Move down the package description of
postgresql-PGVERSION-postgis-2.0 in debian/control.in to match
the generated file.
diff --git a/debian/changelog b/debian/changelog
index c4e1a11..136e66f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,9 +16,7 @@ postgis (2.0.3-1) UNRELEASED; urgency=low
* Compile the postgis jdbc java library again, using maven directly. Add
required Build-Depends-Indeps.
* Separate large SQL scripts and perl utils. Put them in their own
- architecture independent and (hopefully) PostgreSQL version
- indepentend package: postgis-scripts2.0.3. Provide symlinks from the
- extension package.
+ architecture independent indepentend package (..-scripts).
* Separate PostGIS documentation into a postgis-doc package, register its
contents with doc-base.
* Append the PostGIS version to postgresql-9.1-postgis, so multiple
@@ -28,7 +26,8 @@ postgis (2.0.3-1) UNRELEASED; urgency=low
liblwgeom2 to liblwgeom-2.0.3.
* Add patch java-version-fix: Corrects java jdbc jar version.
* Policy updated to 3.9.4. No changes.
- * Add pgversions and allow generation of debian/control based on it.
+ * Add pgversions and allow generation of debian/control and various
+ install files based on it.
* Update debian/copyright a bit.
* Update and improve watchfile.
diff --git a/debian/control b/debian/control
index 4c28137..a4bbb9f 100644
--- a/debian/control
+++ b/debian/control
@@ -47,21 +47,6 @@ Description: Geographic objects support for PostgreSQL --
documentation
.
This package contains the PostGIS documentation.
-Package: postgis-scripts2.0.3
-Architecture: all
-Depends: ${misc:Depends}
-Recommends: postgresql-9.1-postgis-2.0
-Description: Geographic objects support for PostgreSQL -- scripts
- 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 SQL scripts to upgrade from earlier PostGIS
- versions as well as Perl utility scripts.
-
Package: libpostgis-java
Architecture: all
Section: java
@@ -115,8 +100,9 @@ Description: PostGIS "Lightweight Geometry" library -
Development files
the development files.
Package: postgresql-9.1-postgis-2.0
-Depends: ${shlibs:Depends}, postgresql-9.1, postgis-scripts2.0.3,
- liblwgeom-2.0.3, ${misc:Depends}
+Depends: ${shlibs:Depends}, postgresql-9.1,
+ postgresql-9.1-postgis-2.0-scripts, liblwgeom-2.0.3,
+ ${misc:Depends}
Recommends: postgis
Breaks: postgis (<< 1.2.1)
Architecture: any
@@ -130,3 +116,18 @@ Description: Geographic objects support for PostgreSQL 9.1
.
This package supports PostgreSQL 9.1.
+Package: postgresql-9.1-postgis-2.0-scripts
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: postgresql-9.1-postgis-2.0
+Description: Geographic objects support for PostgreSQL -- scripts
+ 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 SQL scripts to upgrade from earlier PostGIS
+ versions for PostgreSQL 9.1 as well as Perl utility scripts.
+
diff --git a/debian/control.in b/debian/control.in
index 8aadf88..4546148 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -18,22 +18,6 @@ Homepage: http://postgis.refractions.net/
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/postgis.git
Vcs-Git: git://anonscm.debian.org/pkg-grass/postgis.git
-Package: postgresql-PGVERSION-postgis-2.0
-Depends: ${shlibs:Depends}, postgresql-PGVERSION, postgis-scripts2.0.3,
- liblwgeom-2.0.3, ${misc:Depends}
-Recommends: postgis
-Breaks: postgis (<< 1.2.1)
-Architecture: any
-Description: Geographic objects support for PostgreSQL PGVERSION
- 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 PGVERSION.
-
Package: postgis
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -63,21 +47,6 @@ Description: Geographic objects support for PostgreSQL --
documentation
.
This package contains the PostGIS documentation.
-Package: postgis-scripts2.0.3
-Architecture: all
-Depends: ${misc:Depends}
-Recommends: postgresql-NEWEST_PGVERSION-postgis-2.0
-Description: Geographic objects support for PostgreSQL -- scripts
- 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 SQL scripts to upgrade from earlier PostGIS
- versions as well as Perl utility scripts.
-
Package: libpostgis-java
Architecture: all
Section: java
@@ -129,3 +98,35 @@ Description: PostGIS "Lightweight Geometry" library -
Development files
geometry objects, constructors, destructors, and a set of spatial
processing functions, are implemented here. This package contains
the development files.
+
+Package: postgresql-PGVERSION-postgis-2.0
+Depends: ${shlibs:Depends}, postgresql-PGVERSION,
+ postgresql-PGVERSION-postgis-2.0-scripts, liblwgeom-2.0.3,
+ ${misc:Depends}
+Recommends: postgis
+Breaks: postgis (<< 1.2.1)
+Architecture: any
+Description: Geographic objects support for PostgreSQL PGVERSION
+ 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 PGVERSION.
+
+Package: postgresql-PGVERSION-postgis-2.0-scripts
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: postgresql-PGVERSION-postgis-2.0
+Description: Geographic objects support for PostgreSQL -- scripts
+ 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 SQL scripts to upgrade from earlier PostGIS
+ versions for PostgreSQL PGVERSION as well as Perl utility scripts.
diff --git a/debian/postgis-scripts2.0.3.install
b/debian/postgis-scripts2.0.3.install
deleted file mode 100644
index c7cc660..0000000
--- a/debian/postgis-scripts2.0.3.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/postgis/2.0.3
-utils/*.pl /usr/share/postgis/2.0.3/utils/
diff --git a/debian/postgresql-generic-postgis-2.0-scripts.install.in
b/debian/postgresql-generic-postgis-2.0-scripts.install.in
new file mode 100644
index 0000000..78b87a2
--- /dev/null
+++ b/debian/postgresql-generic-postgis-2.0-scripts.install.in
@@ -0,0 +1,2 @@
+usr/share/postgresql/@PGVERSION@/extension/
+utils/*.pl /usr/share/postgresql/@PGVERSION@/extension/postgis-utils/
diff --git a/debian/postgresql-generic-postgis-2.0.install.in
b/debian/postgresql-generic-postgis-2.0.install.in
index bf135b6..c259e92 100644
--- a/debian/postgresql-generic-postgis-2.0.install.in
+++ b/debian/postgresql-generic-postgis-2.0.install.in
@@ -1,2 +1 @@
-usr/share/postgresql/@PGVERSION@/extension
usr/lib/postgresql/@PGVERSION@/lib
diff --git a/debian/rules b/debian/rules
index 7d6a58a..6d504a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -122,6 +122,7 @@ clean:
rm -f postgis/postgis_upgrade_20_minor.sql.in
raster/rt_pg/rtpostgis_drop.sql \
raster/rt_pg/rtpostgis_upgrade_cleanup.sql
rm -f $(CURDIR)/debian/postgresql-*-postgis-2.0.install
+ rm -f $(CURDIR)/debian/postgresql-*-postgis-2.0-scripts.install
dh_clean
install: install-indep install-arch
@@ -136,14 +137,6 @@ install-indep: build-indep
DESTDIR=$(CURDIR)/debian/tmp \
PGSQL_DOCDIR=/usr/share/doc
-# Move all SQL files to /usr/share/postgis - the original location's
-# files will get replaced with symlinks.
- mkdir -p $(CURDIR)/debian/tmp/usr/share/postgis/$(POSTGIS_VERSION)/sql
- set -e; \
- for FILE in
$(CURDIR)/debian/tmp/usr/share/postgresql/$(NEWEST_POSTGRES_VERSION)/extension/*.sql;
do \
- mv $$FILE
$(CURDIR)/debian/tmp/usr/share/postgis/$(POSTGIS_VERSION)/sql/; \
- done
-
dh_install -i
# Link the resulting JAR file, so it's available via it's old
@@ -163,18 +156,13 @@ install-arch: build-arch
PGSQL_DOCDIR=/usr/share/doc \
PGSQL_MANDIR=/usr/share/man
-# Link from the default postgresql extension directory back to the
-# share postgis one, where postgis-scripts provides SQL scripts.
- set -e; \
- for FILE in
$(CURDIR)/debian/tmp/usr/share/postgresql/$(NEWEST_POSTGRES_VERSION)/extension/*.sql;
do \
- BASENAME=$$(basename $$FILE); \
- ln -sf
/usr/share/postgis/$(POSTGIS_VERSION)/sql/$$BASENAME $$FILE; \
- done
-
# Auto-create required .install file for the current Postgres version.
cat $(CURDIR)/debian/postgresql-generic-postgis-2.0.install.in \
| sed -e 's/@PGVERSION@/$(NEWEST_POSTGRES_VERSION)/' \
>
$(CURDIR)/debian/postgresql-$(NEWEST_POSTGRES_VERSION)-postgis-2.0.install
+ cat $(CURDIR)/debian/postgresql-generic-postgis-2.0-scripts.install.in \
+ | sed -e 's/@PGVERSION@/$(NEWEST_POSTGRES_VERSION)/' \
+ >
$(CURDIR)/debian/postgresql-$(NEWEST_POSTGRES_VERSION)-postgis-2.0-scripts.install
dh_install -s
--
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
