[postgis] 02/03: Switch build-deps-indep back to default-jdk

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository postgis.

commit 9c11728f480f0634845b786d431145123d3f3866
Author: Jérémy Lal <kapouer at melix.org>
Date:   Mon Aug 11 12:32:25 2014 +0200

    Switch build-deps-indep back to default-jdk
---
 debian/changelog  | 5 +++++
 debian/control    | 6 ++++--
 debian/control.in | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6d16586..cd6179e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,15 @@
 postgis (2.1.3+dfsg-4) UNRELEASED; urgency=medium
 
+  [ Bas Couwenberg ]
   * Add Czech translation by Michal Šimůnek. Closes: 751426.
   * Add Japanese translation by victory. Closes: 756718.
   * Add Danish translation by Joe Dalton. Closes: 757653.
   * Update for PostgreSQL 9.4.
 
+  [ Jérémy Lal ]
+  * Switch Build-Deps back to default-jdk instead of openjdk 7 | 8,
+    as gcj-jdk does work now.
+
  -- Bas Couwenberg <sebastic at xs4all.nl>  Fri, 08 Aug 2014 21:32:50 +0200
 
 postgis (2.1.3+dfsg-3) unstable; urgency=high
diff --git a/debian/control b/debian/control
index b999ba4..042a73b 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 9), po-debconf,
  libgtk2.0-dev, libgdal-dev (>= 1.9.0~) | libgdal1-dev (>= 1.9.0~),
  postgresql-server-dev-all, postgresql-common (>= 148~), postgresql,
  maven-repo-helper
-Build-Depends-Indep: openjdk-8-jdk | openjdk-7-jdk,
+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,
@@ -89,7 +89,9 @@ Description: Geographic objects support for PostgreSQL -- JDBC documentation
 Package: liblwgeom-2.1.3
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}, libjson-c2 | libjson0 (>= 0.9~), ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Breaks: liblwgeom-2.1.2 (<< 2.1.3+dfsg-2)
+Replaces: liblwgeom-2.1.2 (<< 2.1.3+dfsg-2)
 Description: PostGIS "Lightweight Geometry" library
  PostGIS adds support for geographic objects to the PostgreSQL
  object-relational database. In effect, PostGIS "spatially enables"
diff --git a/debian/control.in b/debian/control.in
index 75e259b..2c9cb54 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 9), po-debconf,
  libgtk2.0-dev, libgdal-dev (>= 1.9.0~) | libgdal1-dev (>= 1.9.0~),
  postgresql-server-dev-all, postgresql-common (>= 148~), postgresql,
  maven-repo-helper
-Build-Depends-Indep: openjdk-8-jdk | openjdk-7-jdk,
+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,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/postgis.git