[libpostgresql-jdbc-java] 13/13: Use the upstream POM (org.postgresql:postgresql)

[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 4a9b2fd9f26a8db934df95d1736f96304a933b9c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jan 9 16:14:43 2017 +0100

    Use the upstream POM (org.postgresql:postgresql)
---
 debian/changelog                     |  1 +
 debian/libpostgresql-jdbc-java.links |  5 +++--
 debian/libpostgresql-jdbc-java.pom   | 36 ------------------------------------
 debian/libpostgresql-jdbc-java.poms  |  1 +
 debian/rules                         | 18 ++----------------
 5 files changed, 7 insertions(+), 54 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3bb216c..9246084 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libpgjava (9.3-1104-1) UNRELEASED; urgency=medium
     - Refreshed the patches
     - Disabled remote jar fetching
   * No longer build the JDBC 3 jar, default to JDBC 4 (Closes: #820943, #820942)
+  * Use the upstream POM (org.postgresql:postgresql)
   * Removed the dummy libpg-java package
   * Standards-Version updated to 3.9.8
   * Switch to debhelper level 10
diff --git a/debian/libpostgresql-jdbc-java.links b/debian/libpostgresql-jdbc-java.links
index ea2034a..1db25ba 100644
--- a/debian/libpostgresql-jdbc-java.links
+++ b/debian/libpostgresql-jdbc-java.links
@@ -1,4 +1,5 @@
 # This maintains compatibility with the previous version of
-# add a symlink from postgresql.jar to postgresql-jdbc3.jar
+# add a symlink from postgresql-jdbc{3,4}.jar to postgresql.jar
 # this package
-/usr/share/java/postgresql-jdbc4.jar /usr/share/java/postgresql.jar
+/usr/share/java/postgresql.jar /usr/share/java/postgresql-jdbc4.jar
+/usr/share/java/postgresql.jar /usr/share/java/postgresql-jdbc3.jar
diff --git a/debian/libpostgresql-jdbc-java.pom b/debian/libpostgresql-jdbc-java.pom
deleted file mode 100644
index b4abd66..0000000
--- a/debian/libpostgresql-jdbc-java.pom
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>postgresql</groupId>
-  <artifactId>postgresql</artifactId>
-  <packaging>jar</packaging>
-  <name>PostgreSQL JDBC Driver</name>
-  <version>BADVERSION</version>
-  <description>The PostgreSQL Driver JDBC4</description>
-  <url>http://jdbc.postgresql.org</url>
-  <developers>
-    <developer>
-      <id>davecramer</id>
-      <name>Dave Cramer</name>
-    </developer>
-    <developer>
-      <id>jurka</id>
-      <name>Kris Jurka</name>
-    </developer>
-    <developer>
-      <id>oliver</id>
-      <name>Oliver Jowett</name>
-    </developer>
-  </developers>
-  <licenses>
-    <license>
-      <name>BSD License</name>
-      <url>http://jdbc.postgresql.org/license.html</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <scm>
-    <connection>scm:cvs:pserver:anonymous at cvs.pgfoundry.org:/cvsroot/jdbc:pgjdbc</connection>
-    <url>http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/jdbc/pgjdbc/</url>
-  </scm>
-</project>
diff --git a/debian/libpostgresql-jdbc-java.poms b/debian/libpostgresql-jdbc-java.poms
new file mode 100644
index 0000000..f5a352d
--- /dev/null
+++ b/debian/libpostgresql-jdbc-java.poms
@@ -0,0 +1 @@
+build/pom/pom.xml --has-package-version --java-lib --artifact=jars/postgresql*.jdbc4*.jar --relocate=postgresql:postgresql
diff --git a/debian/rules b/debian/rules
index 750c199..7aaa575 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,21 +1,7 @@
 #!/usr/bin/make -f
 
-PACKAGE:=libpostgresql-jdbc-java
-POMFILE:=debian/$(PACKAGE).pom
-
-MAJOR_VERSION:=$(shell dpkg-parsechangelog | sed -n -e 's/^Version: *\([^-]\+\)-.*/\1/p')
-VJDBC4:=$(MAJOR_VERSION).jdbc4
-
 %:
-	dh $@ --with javahelper
+	dh $@ --with javahelper --with maven-repo-helper
 
 override_dh_auto_build:
-	ant -Dtarget=1.6 -Dsource=1.6 -Dssl=true jar publicapi
-
-override_dh_auto_install:
-	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) jars/postgresql*.jdbc4*.jar
-
-override_dh_auto_clean:
-	dh_auto_clean
-	mh_clean
+	dh_auto_build -- -Dtarget=1.6 -Dsource=1.6 -Dssl=true jar publicapi release-version prepare-pom

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