[SCM] EclipseLink: comprehensive open-source Java persistence solution branch, master, updated. debian/2.1.3-1-1-g522e0fd

[Miguel Landaeta]

The following commit has been merged in the master branch:
commit 522e0fdc5a16716d0f6bf48270b7d85b65ab4b45
Author: Miguel Landaeta <miguel at miguel.cc>
Date:   Thu Jun 21 08:37:34 2012 -0430

    Prepare 2.1.3-2 upload
    
    * Fix FTBFS with Java7 as default-java. (Closes: #678288).
    * Bump Standards-Version to 3.9.3. No changes were required.

diff --git a/debian/build.xml b/debian/build.xml
index 936edbf..a5b2a59 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -52,7 +52,8 @@
 			destdir="${dir.build}/api"
 			classpathref="classpath"
 			access="public"
-			defaultexcludes="yes">
+			defaultexcludes="yes"
+			source="1.5">
             <packageset
 				dir="${dir.src}"
 				excludesfile="${dir.debian}/excludesfiles/javadoc">
diff --git a/debian/changelog b/debian/changelog
index 5931988..281ffd4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+eclipselink (2.1.3-2) UNRELEASED; urgency=low
+
+  * Fix FTBFS with Java7 as default-java. (Closes: #678288).
+  * Bump Standards-Version to 3.9.3. No changes were required.
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Wed, 20 Jun 2012 22:27:34 -0430
+
 eclipselink (2.1.3-1) unstable; urgency=low
 
   * New upstream release. (Closes: #635210).
diff --git a/debian/control b/debian/control
index c5afdd6..bee9f99 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 7.0.50), default-jdk, javahelper, ant,
  glassfish-javaee, libgeronimo-jpa-2.0-spec-java, aspectj, libsdo-api-java,
  libgeronimo-validation-1.0-spec-java, libasm-java, libasm2-java,
  antlr3 (>= 3.2), default-jdk-doc
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://www.eclipse.org/eclipselink/
 Vcs-Git: git://git.debian.org/git/pkg-java/eclipselink.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/eclipselink.git
diff --git a/debian/patches/java7-compat.diff b/debian/patches/java7-compat.diff
new file mode 100644
index 0000000..77706a6
--- /dev/null
+++ b/debian/patches/java7-compat.diff
@@ -0,0 +1,20 @@
+Description: FTBFS with Java7 as default-java due to an API change in Java's SQL libraries
+Author: Niels Thykier <niels at thykier.net>
+Bug-Debian: http://bugs.debian.org/678288
+Forwarded: no
+Last-Update: <2012-06-20>
+
+--- eclipselink-2.1.3.orig/org/eclipse/persistence/internal/jpa/jdbc/DataSourceImpl.java
++++ eclipselink-2.1.3/org/eclipse/persistence/internal/jpa/jdbc/DataSourceImpl.java
+@@ -154,4 +154,11 @@ public class DataSourceImpl implements DataSource {
+         return false;
+     }
+ 
++    /*
++     * 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 6f7a6c6..cdad540 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 disable_antlr3_embedded_copy.diff
 disable_asm_embedded_copy.diff
 antlr32.diff
+java7-compat.diff

-- 
EclipseLink: comprehensive open-source Java persistence solution