The following commit has been merged in the master branch:
commit 192c1bde88d7fbd40353f1b14bb02ff4170946c4
Author: Markus Wanner mar...@bluegap.ch
Date: Wed Aug 7 15:19:20 2013 +0200
Revert most of 5ad5a075: we do not want libpostgis-java to be an
architecture dependent package. Keeps the 'mvn clean' vs 'rm'
change.
diff --git a/debian/changelog b/debian/changelog
index b176a5a..4500650 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,5 @@
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.
diff --git a/debian/control b/debian/control
index e466dbd..a79bf16 100644
--- a/debian/control
+++ b/debian/control
@@ -10,10 +10,11 @@ Build-Depends: debhelper (= 8), dpkg-dev (= 1.16.1~),
autotools-dev,
imagemagick, libcunit1-dev, dblatex, libxml2-dev (= 2.5.0~),
libgtk2.0-dev, libgdal-dev (= 1.6.0~) | libgdal1-dev (= 1.6.0~),
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, libsurefire-java,
- libmaven-compiler-plugin-java, libmaven-resources-plugin-java
+Build-Depends-Indep: openjdk-7-jdk | openjdk-6-jdk,
+ libpostgresql-jdbc-java, fastjar, libjts-java (= 1.7), maven2,
+ libmaven-clean-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
@@ -49,8 +50,7 @@ Description: Geographic objects support for PostgreSQL --
documentation
This package contains the PostGIS documentation.
Package: libpostgis-java
-Architecture: alpha amd64 armel armhf arm64 i386 ia64 lpia mips mipsel
- powerpc powerpcspe ppc64 s390 s390x sh4 sparc sparc64
+Architecture: all
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 d02d1ce..f98c340 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -10,10 +10,11 @@ Build-Depends: debhelper (= 8), dpkg-dev (= 1.16.1~),
autotools-dev,
imagemagick, libcunit1-dev, dblatex, libxml2-dev (= 2.5.0~),
libgtk2.0-dev, libgdal-dev (= 1.6.0~) | libgdal1-dev (= 1.6.0~),
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, libsurefire-java,
- libmaven-compiler-plugin-java, libmaven-resources-plugin-java
+Build-Depends-Indep: openjdk-7-jdk | openjdk-6-jdk,
+ libpostgresql-jdbc-java, fastjar, libjts-java (= 1.7), maven2,
+ libmaven-clean-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
@@ -49,8 +50,7 @@ Description: Geographic objects support for PostgreSQL --
documentation
This package contains the PostGIS documentation.
Package: libpostgis-java
-Architecture: alpha amd64 armel armhf arm64 i386 ia64 lpia mips mipsel
- powerpc powerpcspe ppc64 s390 s390x sh4 sparc sparc64
+Architecture: all
Section: java
Depends: libpostgresql-jdbc-java, ${misc:Depends}
Suggests: postgresql-NEWEST_PGVERSION-postgis-2.0
diff --git a/debian/rules b/debian/rules
index b383076..8d0a77f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,12 +48,7 @@ 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
+JAVA_HOME=/usr/lib/jvm/default-jdk
# Use maven in offline mode and with the local Debian repo
MVN = mvn --offline -Dmaven.repo.local=/usr/share/maven-repo
@@ -105,9 +100,7 @@ build-arch-stamp: configuration-stamp
build-indep: build-indep-stamp
build-indep-stamp: configuration-stamp
# PostGIS JDBC (with debug support)
- if [ -n $(ARCH_SUPPORTS_JDBC_PKG) ]; then \
- cd $(CURDIR)/java/jdbc $(MVN) package; \
- fi
+ cd $(CURDIR)/java/jdbc $(MVN) package
