Author: nthykier Date: 2012-06-24 14:02:59 +0000 (Sun, 24 Jun 2012) New Revision: 16199
Added: trunk/libproxool-java/debian/patches/java7-compat.diff Modified: trunk/libproxool-java/debian/changelog trunk/libproxool-java/debian/patches/series Log: Fix FTBFS with Java7 Modified: trunk/libproxool-java/debian/changelog =================================================================== --- trunk/libproxool-java/debian/changelog 2012-06-23 14:39:06 UTC (rev 16198) +++ trunk/libproxool-java/debian/changelog 2012-06-24 14:02:59 UTC (rev 16199) @@ -1,3 +1,10 @@ +libproxool-java (0.9.1-6) UNRELEASED; urgency=low + + * Team upload. + * Fix FTBFS with Java7. + + -- Niels Thykier <[email protected]> Sun, 24 Jun 2012 15:53:26 +0200 + libproxool-java (0.9.1-5) unstable; urgency=low [Miguel Landaeta] Added: trunk/libproxool-java/debian/patches/java7-compat.diff =================================================================== --- trunk/libproxool-java/debian/patches/java7-compat.diff (rev 0) +++ trunk/libproxool-java/debian/patches/java7-compat.diff 2012-06-24 14:02:59 UTC (rev 16199) @@ -0,0 +1,29 @@ +Description: Fix FTBFS with Java7 + +--- libproxool-java-0.9.1.orig/src/java/org/logicalcobwebs/proxool/ProxoolDataSource.java ++++ libproxool-java-0.9.1/src/java/org/logicalcobwebs/proxool/ProxoolDataSource.java +@@ -692,6 +692,11 @@ public class ProxoolDataSource implement + public boolean isWrapperFor(Class<?> iface) throws SQLException { + return false; + } ++ ++ // Java7 compat ++ public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException { ++ throw new java.sql.SQLFeatureNotSupportedException(); ++ } + } + + /* +--- libproxool-java-0.9.1.orig/src/java/org/logicalcobwebs/proxool/ProxoolDriver.java ++++ libproxool-java-0.9.1/src/java/org/logicalcobwebs/proxool/ProxoolDriver.java +@@ -221,6 +221,10 @@ public class ProxoolDriver implements Dr + return true; + } + ++ // Java7 compat ++ public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException { ++ throw new java.sql.SQLFeatureNotSupportedException(); ++ } + } + + /* Modified: trunk/libproxool-java/debian/patches/series =================================================================== --- trunk/libproxool-java/debian/patches/series 2012-06-23 14:39:06 UTC (rev 16198) +++ trunk/libproxool-java/debian/patches/series 2012-06-24 14:02:59 UTC (rev 16199) @@ -2,3 +2,4 @@ missing-methods.diff cglib.diff proxool-detect-cglib-enhancer.diff +java7-compat.diff _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
