[excalibur-logkit] 15/32: Fix FTBFS with OpenJDK7

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository excalibur-logkit.

commit edd5a188d7b1c607620a3f97b6d05f43dda8d375
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Wed Dec 21 04:45:26 2011 +0000

    Fix FTBFS with OpenJDK7
---
 debian/changelog                                   | 13 +++++++++++
 debian/copyright                                   |  6 ++---
 debian/patches/01_implement_abstract_methods.patch | 26 ++++++++++++++++++----
 3 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e61357b..64167a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+excalibur-logkit (2.0-9) UNRELEASED; urgency=low
+
+  [ Miguel Landaeta ]
+  * Team upload.
+
+  [ James Page ]
+  * Fix FTBFS with OpenJDK7 (LP: #888124) (Closes: #652049):
+    - d/patches/01_implement_abstract_methods.patch: add additional 
+      unimplemented abstract methods for Java 7.
+  * d/copyright: tidied up misc lintian warnings.
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Tue, 20 Dec 2011 21:47:08 -0430
+
 excalibur-logkit (2.0-8) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/copyright b/debian/copyright
index 3035455..971a623 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
-Name: excalibur-logkit
-Maintainer: The Apache Software Foundation
+Format: http://dep.debian.net/deps/dep5/
+Upstream-Name: excalibur-logkit
+Upstream-Contact: The Apache Software Foundation
 Source: http://excalibur.apache.org/
 
 Files: *
diff --git a/debian/patches/01_implement_abstract_methods.patch b/debian/patches/01_implement_abstract_methods.patch
index c4fab07..85d6857 100644
--- a/debian/patches/01_implement_abstract_methods.patch
+++ b/debian/patches/01_implement_abstract_methods.patch
@@ -1,9 +1,21 @@
 Description: Add method stubs to build against current APIs.
 Forwarded: not-needed
-Author: Onkar Shinde <onshinde at ubuntu.com>
---- a/src/java/org/apache/log/output/db/DefaultDataSource.java	2011-05-29 14:56:35.000000000 +0530
-+++ b/src/java/org/apache/log/output/db/DefaultDataSource.java	2011-05-29 14:56:59.000000000 +0530
-@@ -111,4 +111,14 @@
+Author: Onkar Shinde <onshinde at ubuntu.com>, James page <james.page at ubuntu.com>
+
+Index: excalibur-logkit/src/java/org/apache/log/output/db/DefaultDataSource.java
+===================================================================
+--- excalibur-logkit.orig/src/java/org/apache/log/output/db/DefaultDataSource.java	2011-11-25 10:55:37.000000000 +0000
++++ excalibur-logkit/src/java/org/apache/log/output/db/DefaultDataSource.java	2011-11-25 10:59:19.640362541 +0000
+@@ -20,6 +20,8 @@
+ import java.sql.Connection;
+ import java.sql.DriverManager;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
++import java.util.logging.Logger;
+ import javax.sql.DataSource;
+ 
+ /**
+@@ -111,4 +113,20 @@
      {
          m_logWriter = logWriter;
      }
@@ -17,4 +29,10 @@ Author: Onkar Shinde <onshinde at ubuntu.com>
 +    {
 +       throw new UnsupportedOperationException();
 +    }
++
++    public Logger getParentLogger() throws SQLFeatureNotSupportedException
++    {
++       throw new SQLFeatureNotSupportedException();
++    }
++
  }

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