Author: nomadium-guest Date: 2011-12-21 04:45:26 +0000 (Wed, 21 Dec 2011) New Revision: 15568
Modified: trunk/excalibur-logkit/debian/changelog trunk/excalibur-logkit/debian/copyright trunk/excalibur-logkit/debian/patches/01_implement_abstract_methods.patch Log: Fix FTBFS with OpenJDK7 Modified: trunk/excalibur-logkit/debian/changelog =================================================================== --- trunk/excalibur-logkit/debian/changelog 2011-12-20 03:44:34 UTC (rev 15567) +++ trunk/excalibur-logkit/debian/changelog 2011-12-21 04:45:26 UTC (rev 15568) @@ -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 <mig...@miguel.cc> Tue, 20 Dec 2011 21:47:08 -0430 + excalibur-logkit (2.0-8) unstable; urgency=low * Team upload. Modified: trunk/excalibur-logkit/debian/copyright =================================================================== --- trunk/excalibur-logkit/debian/copyright 2011-12-20 03:44:34 UTC (rev 15567) +++ trunk/excalibur-logkit/debian/copyright 2011-12-21 04:45:26 UTC (rev 15568) @@ -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: * Modified: trunk/excalibur-logkit/debian/patches/01_implement_abstract_methods.patch =================================================================== --- trunk/excalibur-logkit/debian/patches/01_implement_abstract_methods.patch 2011-12-20 03:44:34 UTC (rev 15567) +++ trunk/excalibur-logkit/debian/patches/01_implement_abstract_methods.patch 2011-12-21 04:45:26 UTC (rev 15568) @@ -1,9 +1,21 @@ Description: Add method stubs to build against current APIs. Forwarded: not-needed -Author: Onkar Shinde <onshi...@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 <onshi...@ubuntu.com>, James page <james.p...@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 @@ + { + throw new UnsupportedOperationException(); + } ++ ++ public Logger getParentLogger() throws SQLFeatureNotSupportedException ++ { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ } _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
