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

[Jérémy Lal]

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

kapouer pushed a commit to branch kapouer
in repository postgis.

commit 338ed45c4eb24faeb28f46f20f57bc2b9510c2e8
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/control    | 6 ++++--
 debian/control.in | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

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