[libpostgresql-jdbc-java] 10/13: No longer build the JDBC 3 jar, default to JDBC 4 (Closes: #820943, #820942)

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository libpostgresql-jdbc-java.

commit 79263c1288ce81dae9c92cee2dc11cac1f0a8986
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jan 9 14:56:06 2017 +0100

    No longer build the JDBC 3 jar, default to JDBC 4 (Closes: #820943, #820942)
---
 debian/changelog                     |  1 +
 debian/control                       |  1 -
 debian/libpostgresql-jdbc-java.links |  2 +-
 debian/rules                         | 15 ++-------------
 4 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f934824..5acdf23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ libpgjava (9.3-1104-1) UNRELEASED; urgency=medium
   * New upstream release
     - Refreshed the patches
     - Disabled remote jar fetching
+  * No longer build the JDBC 3 jar, default to JDBC 4 (Closes: #820943, #820942)
   * Standards-Version updated to 3.9.8
   * Switch to debhelper level 10
   * Use secure Vcs-* URLs
diff --git a/debian/control b/debian/control
index c082f89..7d05661 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@ Uploaders:
 Build-Depends:
  ant,
  debhelper (>= 10),
- java-gcj-compat-dev,
  javahelper (>=0.32~),
  maven-repo-helper (>= 1.7.1)
 Build-Depends-Indep:
diff --git a/debian/libpostgresql-jdbc-java.links b/debian/libpostgresql-jdbc-java.links
index 56f7073..ea2034a 100644
--- a/debian/libpostgresql-jdbc-java.links
+++ b/debian/libpostgresql-jdbc-java.links
@@ -1,4 +1,4 @@
 # This maintains compatibility with the previous version of
 # add a symlink from postgresql.jar to postgresql-jdbc3.jar
 # this package
-/usr/share/java/postgresql-jdbc3.jar /usr/share/java/postgresql.jar
+/usr/share/java/postgresql-jdbc4.jar /usr/share/java/postgresql.jar
diff --git a/debian/rules b/debian/rules
index b69b650..750c199 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,28 +4,17 @@ PACKAGE:=libpostgresql-jdbc-java
 POMFILE:=debian/$(PACKAGE).pom
 
 MAJOR_VERSION:=$(shell dpkg-parsechangelog | sed -n -e 's/^Version: *\([^-]\+\)-.*/\1/p')
-VJDBC3:=$(MAJOR_VERSION).jdbc3
 VJDBC4:=$(MAJOR_VERSION).jdbc4
 
 %:
 	dh $@ --with javahelper
 
 override_dh_auto_build:
-# build JDBC 3 with java-gcj
-	ant clean
-	JAVA_HOME=/usr/lib/jvm/java-gcj ant -Djdbc3=true -Dtarget=1.4 -Dsource=1.4 -Dssl=true jar
-	mv jars/postgresql.jar postgresql-jdbc3.jar
-# build JDBC 4 with default-java
-	ant clean
-	JAVA_HOME=/usr/lib/jvm/default-java ant -Djdbc4=true -Dtarget=1.6 -Dsource=1.6 -Dssl=true jar publicapi
-	mv jars/postgresql.jar postgresql-jdbc4.jar
+	ant -Dtarget=1.6 -Dsource=1.6 -Dssl=true jar publicapi
 
 override_dh_auto_install:
-# install jdbc4 first so that the postgresql.jar symlink points to jdbc3
 	mh_installpom -p$(PACKAGE) -e$(VJDBC4) --no-rules $(POMFILE)
-	mh_installjar -p$(PACKAGE) -e$(VJDBC4) --java-lib --usj-name=postgresql-jdbc4 --usj-version=$(MAJOR_VERSION) $(POMFILE) postgresql-jdbc4.jar
-	mh_installpom -p$(PACKAGE) -e$(VJDBC3) --no-rules $(POMFILE)
-	mh_installjar -p$(PACKAGE) -e$(VJDBC3) --java-lib --usj-name=postgresql-jdbc3 --usj-version=$(MAJOR_VERSION) $(POMFILE) postgresql-jdbc3.jar
+	mh_installjar -p$(PACKAGE) -e$(VJDBC4) --java-lib --usj-name=postgresql-jdbc4 --usj-version=$(MAJOR_VERSION) $(POMFILE) jars/postgresql*.jdbc4*.jar
 
 override_dh_auto_clean:
 	dh_auto_clean

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libpostgresql-jdbc-java.git