[libpostgresql-jdbc-java] 02/09: Refreshed the patches

[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 b455410dfb01218a8e1eed2bc3081edd23e5ca75
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jan 9 10:53:56 2017 +0100

    Refreshed the patches
---
 debian/changelog                  |  8 ++++++++
 debian/patches/jdbc3.patch        | 14 --------------
 debian/patches/link-javadoc.patch |  8 +++-----
 debian/patches/series             |  1 -
 4 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 31c98c4..efc04c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libpgjava (9.2-1004-1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 09 Jan 2017 10:52:12 +0100
+
 libpgjava (9.2-1002-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/jdbc3.patch b/debian/patches/jdbc3.patch
deleted file mode 100644
index 8c659f7..0000000
--- a/debian/patches/jdbc3.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix a double comma which has been fixed upstream so should be in the next release. At
-this point this patch will no longer be required.
-
---- a/org/postgresql/jdbc3/Jdbc3Connection.java
-+++ b/org/postgresql/jdbc3/Jdbc3Connection.java
-@@ -20,7 +20,7 @@
-  */
- public class Jdbc3Connection extends org.postgresql.jdbc3.AbstractJdbc3Connection implements java.sql.Connection
- {
--    public Jdbc3Connection(HostSpec[] hostSpecs,, String user, String database, Properties info, String url) throws SQLException {
-+    public Jdbc3Connection(HostSpec[] hostSpecs, String user, String database, Properties info, String url) throws SQLException {
-         super(hostSpecs, user, database, info, url);
-     }
- 
diff --git a/debian/patches/link-javadoc.patch b/debian/patches/link-javadoc.patch
index e282b4f..407fa13 100644
--- a/debian/patches/link-javadoc.patch
+++ b/debian/patches/link-javadoc.patch
@@ -1,10 +1,8 @@
 Modify the javadoc build process so it links against the JDK
 javadoc.
-Index: libpostgresql-jdbc-java/build.xml
-===================================================================
---- libpostgresql-jdbc-java.orig/build.xml	2012-08-17 21:12:35.493845322 +0100
-+++ libpostgresql-jdbc-java/build.xml	2012-08-17 21:17:24.083845400 +0100
-@@ -451,6 +451,7 @@
+--- a/build.xml
++++ b/build.xml
+@@ -509,6 +509,7 @@
  	<include name="ds/common/BaseDataSource.java" />
  	<include name="xa/PGXADataSource.java" />
        </fileset>
diff --git a/debian/patches/series b/debian/patches/series
index 12cbe31..78d8c9e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 link-javadoc.patch
-jdbc3.patch

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