[SCM] postgis branch, master, updated. upstream/2.0.1-70-g5ad5a07
Markus Wanner
markus at bluegap.ch
Wed Aug 7 12:22:28 UTC 2013
The following commit has been merged in the master branch:
commit 5ad5a075fe166ee8d6997bf41b76b2745ceb1b6d
Author: Markus Wanner <markus at bluegap.ch>
Date: Wed Aug 7 14:19:22 2013 +0200
* Switch back to depend on default-jdk. To work around gcj-jdk
incompatibilities, restrict libpostgis-java to the same set of
architectures that support openjdk 6 and newer.
* Adjust rules to build libpostgis-java only on architectures that
support it.
* Use a simple rm rather than invoking maven to clean up. Allows
us to move all java related Build-Depends back to Build-Depends-Indep.
diff --git a/debian/changelog b/debian/changelog
index e84c8ad..b176a5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+postgis (2.0.3-7) UNRELEASED; urgency=low
+
+ * Switch back to depend on default-jdk. To work around gcj-jdk
+ incompatibilities, restrict libpostgis-java to the same set of
+ architectures that support openjdk 6 and newer.
+ * Adjust rules to build libpostgis-java only on architectures that
+ support it.
+ * Use a simple rm rather than invoking maven. Allows us to move all java
+ related Build-Depends back to Build-Depends-Indep.
+
+ -- Markus Wanner <markus at bluegap.ch> Wed, 07 Aug 2013 13:12:25 +0200
+
postgis (2.0.3-6) unstable; urgency=low
* Cleanup check target, reduce duplication.
diff --git a/debian/control b/debian/control
index 4ad4094..e466dbd 100644
--- a/debian/control
+++ b/debian/control
@@ -9,12 +9,11 @@ Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.16.1~), autotools-dev,
libproj-dev (>= 4.5.0), libssl-dev, xsltproc, docbook, docbook-xsl,
imagemagick, libcunit1-dev, dblatex, libxml2-dev (>= 2.5.0~),
libgtk2.0-dev, libgdal-dev (>= 1.6.0~) | libgdal1-dev (>= 1.6.0~),
- openjdk-6-jdk | openjdk-7-jdk, libpostgresql-jdbc-java, fastjar,
+ postgresql-server-dev-all, postgresql-common (>= 146), postgresql
+Build-Depends-Indep: default-jdk, libpostgresql-jdbc-java, fastjar,
libjts-java (>= 1.7), maven2, libmaven-clean-plugin-java,
- libmaven-jar-plugin-java, postgresql-server-dev-all,
- postgresql-common (>= 146), postgresql
-Build-Depends-Indep: libsurefire-java, libmaven-compiler-plugin-java,
- libmaven-resources-plugin-java
+ libmaven-jar-plugin-java, libsurefire-java,
+ libmaven-compiler-plugin-java, libmaven-resources-plugin-java
Standards-Version: 3.9.4
Homepage: http://postgis.refractions.net/
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/postgis.git
@@ -50,7 +49,8 @@ Description: Geographic objects support for PostgreSQL -- documentation
This package contains the PostGIS documentation.
Package: libpostgis-java
-Architecture: all
+Architecture: alpha amd64 armel armhf arm64 i386 ia64 lpia mips mipsel
+ powerpc powerpcspe ppc64 s390 s390x sh4 sparc sparc64
Section: java
Depends: libpostgresql-jdbc-java, ${misc:Depends}
Suggests: postgresql-9.1-postgis-2.0
diff --git a/debian/control.in b/debian/control.in
index 023164a..d02d1ce 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -9,12 +9,11 @@ Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.16.1~), autotools-dev,
libproj-dev (>= 4.5.0), libssl-dev, xsltproc, docbook, docbook-xsl,
imagemagick, libcunit1-dev, dblatex, libxml2-dev (>= 2.5.0~),
libgtk2.0-dev, libgdal-dev (>= 1.6.0~) | libgdal1-dev (>= 1.6.0~),
- openjdk-6-jdk | openjdk-7-jdk, libpostgresql-jdbc-java, fastjar,
+ postgresql-server-dev-all, postgresql-common (>= 146), postgresql
+Build-Depends-Indep: default-jdk, libpostgresql-jdbc-java, fastjar,
libjts-java (>= 1.7), maven2, libmaven-clean-plugin-java,
- libmaven-jar-plugin-java, postgresql-server-dev-all,
- postgresql-common (>= 146), postgresql
-Build-Depends-Indep: libsurefire-java, libmaven-compiler-plugin-java,
- libmaven-resources-plugin-java
+ libmaven-jar-plugin-java, libsurefire-java,
+ libmaven-compiler-plugin-java, libmaven-resources-plugin-java
Standards-Version: 3.9.4
Homepage: http://postgis.refractions.net/
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/postgis.git
@@ -50,7 +49,8 @@ Description: Geographic objects support for PostgreSQL -- documentation
This package contains the PostGIS documentation.
Package: libpostgis-java
-Architecture: all
+Architecture: alpha amd64 armel armhf arm64 i386 ia64 lpia mips mipsel
+ powerpc powerpcspe ppc64 s390 s390x sh4 sparc sparc64
Section: java
Depends: libpostgresql-jdbc-java, ${misc:Depends}
Suggests: postgresql-NEWEST_PGVERSION-postgis-2.0
diff --git a/debian/rules b/debian/rules
index 9218c91..b383076 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,6 +46,14 @@ debian/control: debian/control.in debian/pgversions
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
+# Whether or not to build the JDBC parts the arch supports openjdk 6 or
+# newer.
+ARCH_SUPPORTS_JDBC_PKG=$(shell grep-dctrl -sArchitecture \
+ --pattern=libpostgis-jdbc $(CURDIR)/debian/control.in \
+ | grep "$(DEB_BUILD_ARCH)")
+JAVA_HOME=/usr/lib/jvm/default-java
# Use maven in offline mode and with the local Debian repo
MVN = mvn --offline -Dmaven.repo.local=/usr/share/maven-repo
@@ -97,7 +105,9 @@ build-arch-stamp: configuration-stamp
build-indep: build-indep-stamp
build-indep-stamp: configuration-stamp
# PostGIS JDBC (with debug support)
- cd $(CURDIR)/java/jdbc && $(MVN) package
+ if [ -n "$(ARCH_SUPPORTS_JDBC_PKG)" ]; then \
+ cd $(CURDIR)/java/jdbc && $(MVN) package; \
+ fi
# Let PostGIS create a perl script from postgis_restore.pl.in
$(MAKE) -C utils
@@ -157,9 +167,13 @@ clean: debian/control
done)
[ ! -f GNUmakefile ] || $(MAKE) distclean || true
- cd $(CURDIR)/java/jdbc && $(MVN) clean
[ ! -f GNUmakefile ] || $(MAKE) -C doc images-clean || true
+# We used to invoke 'mvn clean', but plain 'rm' is a lot quicker and
+# simpler, as it doesn't require all of the Java stuff in B-D, but
+# having it in Build-Depneds-Indep is enough.
+ rm -rf $(CURDIR)/java/jdbc/target
+
# Cleanup after the Makefile
rm -f $(CURDIR)/debian/*.postinst $(CURDIR)/debian/*.postrm
rm -f postgis/postgis_upgrade_20_minor.sql.in raster/rt_pg/rtpostgis_drop.sql \
@@ -203,8 +217,10 @@ install-indep: build-indep
# Link the resulting JAR file, so it's available via it's old
# name. (Even if postgis-jdbc.jar might be more appropriate.)
- ln -sf postgis-jdbc-$(POSTGIS_VERSION).jar \
- $(CURDIR)/debian/libpostgis-java/usr/share/java/postgis.jar
+ if [ -n "$(ARCH_SUPPORTS_JDBC_PKG)" ]; then \
+ ln -sf postgis-jdbc-$(POSTGIS_VERSION).jar \
+ $(CURDIR)/debian/libpostgis-java/usr/share/java/postgis.jar; \
+ fi
install-arch: build-arch
dh_testdir
--
PostGIS for PostgreSQL
More information about the Pkg-grass-devel
mailing list