[netbeans] 01/01: Added a patch to build with Java 7

[Emmanuel Bourg]

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

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

commit 8e75a57a6604c607080aeeedcf63ca63b0006136
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Aug 17 03:47:26 2014 +0200

    Added a patch to build with Java 7
---
 debian/changelog                                  |  2 +-
 debian/patches/netbeans~java7-compatibility.patch | 18 ++++++++++++++++++
 debian/patches/series                             |  1 +
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 85ef2ff..ae7a8ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,7 +13,7 @@ netbeans (7.0.1+dfsg1-6) UNRELEASED; urgency=medium
   * Fixed the build failure with Ant 1.9 (Closes: #713182)
   * Removed the obsolete -mno-cygwin flag to build the Windows launcher
     with mingw32 4.9
-  * Enabled building with Java 7
+  * Added a patch to build with Java 7
   * debian/control:
     - Standards-Version updated to 3.9.5 (no changes)
   * Switch to debhelper level 9
diff --git a/debian/patches/netbeans~java7-compatibility.patch b/debian/patches/netbeans~java7-compatibility.patch
new file mode 100644
index 0000000..de0d5f8
--- /dev/null
+++ b/debian/patches/netbeans~java7-compatibility.patch
@@ -0,0 +1,18 @@
+Description: Fix the compatibility issues with Java 7
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/db/libsrc/org/netbeans/lib/ddl/adaptors/DefaultAdaptor.java
++++ b/db/libsrc/org/netbeans/lib/ddl/adaptors/DefaultAdaptor.java
+@@ -4089,4 +4089,12 @@
+     public boolean autoCommitFailureClosesAllResultSets() throws SQLException {
+         return false;
+     }
++
++    public ResultSet getPseudoColumns(String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern) throws SQLException {
++        return null;
++    }
++
++    public boolean generatedKeyAlwaysReturned() throws SQLException {
++        return false;
++    }
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 83248a7..5d1bb13 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -27,3 +27,4 @@ netbeans-platform~osgi-4.3.patch
 netbeans~include-junit.patch
 netbeans~xerces.patch
 netbeans~ant-compatibility.patch
+netbeans~java7-compatibility.patch

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