[ha-jdbc] 02/11: Imported Debian patch 2.0.16+rc1-2

[Emmanuel Bourg]

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

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

commit b88eedf8c1426e7ed54334922db68e617d6fde29
Author: Niels Thykier <niels at thykier.net>
Date:   Thu Jun 21 13:26:38 2012 +0200

    Imported Debian patch 2.0.16+rc1-2
---
 debian/changelog                 |  9 ++++++
 debian/control                   |  4 +--
 debian/patches/java7-compat.diff | 60 ++++++++++++++++++++++++++++++++++++++++
 debian/patches/series            |  1 +
 debian/source.lintian-overrides  |  1 -
 5 files changed, 72 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9a88887..b8182bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ha-jdbc (2.0.16+rc1-2) unstable; urgency=low
+
+  * Team upload.
+  * Patch sources to fix FTBFS with Java7.
+  * Remove unused lintian-override.
+  * Bump dehelper compat.
+
+ -- Niels Thykier <niels at thykier.net>  Thu, 21 Jun 2012 13:26:38 +0200
+
 ha-jdbc (2.0.16+rc1-1) unstable; urgency=low
 
   * Initial upload to Debian
diff --git a/debian/control b/debian/control
index bf51410..02c505f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,9 @@ Section: java
 Priority: extra
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Brian Thomason <brian.thomason at eucalyptus.com>
-Build-Depends: debhelper (>= 7.0.50~), libservlet2.5-java, libjibx1.2-java,
+Build-Depends: debhelper (>= 8), libservlet2.5-java, libjibx1.2-java,
                libbcel-java, libquartz-java, libjgroups-java, libslf4j-java,
-               ant | ant1.7, default-jdk
+               ant, default-jdk
 Standards-Version: 3.9.2
 Homepage: http://ha-jdbc.sourceforge.net/
 
diff --git a/debian/patches/java7-compat.diff b/debian/patches/java7-compat.diff
new file mode 100644
index 0000000..b180158
--- /dev/null
+++ b/debian/patches/java7-compat.diff
@@ -0,0 +1,60 @@
+Description: Make sources Java7 compatible
+
+diff --git a/src/net/sf/hajdbc/sql/DataSource.java b/src/net/sf/hajdbc/sql/DataSource.java
+index fea64c4..054afa8 100644
+--- a/src/net/sf/hajdbc/sql/DataSource.java
++++ b/src/net/sf/hajdbc/sql/DataSource.java
+@@ -120,4 +120,9 @@ public class DataSource extends CommonDataSourceProxy<javax.sql.DataSource> impl
+ 	{
+ 		return new DataSourceReference(this.getCluster(), this.getConfig());
+ 	}
++
++        // Java7 Compat
++        public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException {
++            throw new java.sql.SQLFeatureNotSupportedException();
++        }
+ }
+diff --git a/src/net/sf/hajdbc/sql/Driver.java b/src/net/sf/hajdbc/sql/Driver.java
+index cebdf16..a288ccc 100644
+--- a/src/net/sf/hajdbc/sql/Driver.java
++++ b/src/net/sf/hajdbc/sql/Driver.java
+@@ -198,4 +198,10 @@ public final class Driver implements java.sql.Driver
+ 		
+ 		return matcher.group(1);
+ 	}
++
++        // Java7 Compat
++        public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException {
++            throw new java.sql.SQLFeatureNotSupportedException();
++        }
++
+ }
+diff --git a/src/net/sf/hajdbc/sql/pool/ConnectionPoolDataSource.java b/src/net/sf/hajdbc/sql/pool/ConnectionPoolDataSource.java
+index e71c93b..ee55190 100644
+--- a/src/net/sf/hajdbc/sql/pool/ConnectionPoolDataSource.java
++++ b/src/net/sf/hajdbc/sql/pool/ConnectionPoolDataSource.java
+@@ -105,4 +105,9 @@ public class ConnectionPoolDataSource extends CommonDataSourceProxy<javax.sql.Co
+ 	{
+ 		return new ConnectionPoolDataSourceReference(this.getCluster(), this.getConfig());
+ 	}
++
++        // Java7 Compat
++        public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException {
++            throw new java.sql.SQLFeatureNotSupportedException();
++        }
+ }
+diff --git a/src/net/sf/hajdbc/sql/xa/XADataSource.java b/src/net/sf/hajdbc/sql/xa/XADataSource.java
+index 6500c5e..e4a457b 100644
+--- a/src/net/sf/hajdbc/sql/xa/XADataSource.java
++++ b/src/net/sf/hajdbc/sql/xa/XADataSource.java
+@@ -104,4 +104,10 @@ public class XADataSource extends CommonDataSourceProxy<javax.sql.XADataSource>
+ 	{
+ 		return new XADataSourceReference(this.getCluster(), this.getConfig());
+ 	}
++
++        // Java7 Compat
++        public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException {
++            throw new java.sql.SQLFeatureNotSupportedException();
++        }
++
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 1973429..3c56b59 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 modify-build-file.diff
+java7-compat.diff
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
deleted file mode 100644
index 94f89b7..0000000
--- a/debian/source.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-ha-jdbc source: latest-debian-changelog-entry-without-new-version

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