Package: excalibur-logkit Version: 2.0-8 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu precise ubuntu-patch
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Dear Maintainer, In Ubuntu, the attached patch was applied to achieve the following: * Fix FTBFS with OpenJDK7 (LP: #888124): - d/patches/01_implement_abstract_methods.patch: add additional unimplemented abstract methods for Java 7. * d/copyright: tidied up misc lintian warnings. Thanks for considering the patch. - -- System Information: Debian Release: wheezy/sid APT prefers precise-updates APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500, 'precise') Architecture: amd64 (x86_64) Kernel: Linux 3.2.0-3-generic (SMP w/8 CPU cores) Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAEBCAAGBQJO6KlaAAoJEL/srsug59jDo04P/jkcxiOggoYQQd1jLuTDIItx GBrhBGo+Tr9lfvU4d1IhCxodYMdh+GH4l6V7S84babZM72qxzzXc+QRUY8/lrqWD Eg146eD2YfaABhv9uQkM8Jbyb2Vlq+ngsaQdJsuxfEciOLm24zGW05D9qNB6lPJr +hueoUtlJDb6TNwFBJMMMenPfEWXRN9HrxcUlYUQCviRE2sHnfOMSCaJHCSJmlrE oNIzGme8V+IWyXCmd/eTg/w/8ntxe++qrm3n5NQbhsiVA85jkRQfCjb62nChRqII 660vcxqBP+PrlUn8OwOKqOXDTKgJ5r/4DFPlvur4emmCiImewNdJddHln/fv3Mdz GklQpP1CydgjYd7vOIIbGag91twKUYDyyOiH1CZyXjjxQqQYU3yRrsIjmmPdXRlK Bt71OPLYCT1AaQoVefcyXftL5IMqK+p+pEbmym/kvxdxYyPwQSblceL+kq8EEvTM np1NhLXiJZ4pkJKtN9708zWdjZXqgxrX5Io7vsQAuLide83DKzi5907K0G+o304w F3vXq8G2vx/ZSTjSI85MaVHcTozKR41/jg71aFoxRMpi3ZzvkBNh45u2+S0saTHN q0iTTPtX+f4vego1YWr0lFTspHdf20Zny3aKO/Yxd1oH5o/+JdSBzCwEC2d1Uq4G hdiDvrY4gzzHObX3JR19 =qfO9 -----END PGP SIGNATURE-----
=== modified file 'debian/copyright' --- debian/copyright 2009-08-12 00:34:29 +0000 +++ debian/copyright 2011-12-14 13:43:41 +0000 @@ -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 file 'debian/patches/01_implement_abstract_methods.patch' --- debian/patches/01_implement_abstract_methods.patch 2011-05-29 09:36:55 +0000 +++ debian/patches/01_implement_abstract_methods.patch 2011-12-14 13:40:52 +0000 @@ -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(); ++ } ++ } === modified file 'src/java/org/apache/log/output/db/DefaultDataSource.java' --- src/java/org/apache/log/output/db/DefaultDataSource.java 2010-06-08 17:35:15 +0000 +++ src/java/org/apache/log/output/db/DefaultDataSource.java 2011-12-14 13:42:47 +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; /** @@ -121,4 +123,10 @@ { throw new UnsupportedOperationException(); } + + public Logger getParentLogger() throws SQLFeatureNotSupportedException + { + throw new SQLFeatureNotSupportedException(); + } + }