[netbeans] 09/12: Enable sqljet and fix svnkit.jar runtime dependency.

[Markus Koschany]

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

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

commit ec5683e751a8a5a87c8d7c05b78c94b485e80054
Author: Markus Koschany <apo at gambaru.de>
Date:   Fri Jun 12 19:51:15 2015 +0200

    Enable sqljet and fix svnkit.jar runtime dependency.
---
 debian/patches/netbeans-svnclient.patch | 48 ++++++++++++++++++++-------------
 1 file changed, 29 insertions(+), 19 deletions(-)

diff --git a/debian/patches/netbeans-svnclient.patch b/debian/patches/netbeans-svnclient.patch
index 78d1000..324ebab 100644
--- a/debian/patches/netbeans-svnclient.patch
+++ b/debian/patches/netbeans-svnclient.patch
@@ -3,12 +3,26 @@ Date: Fri, 12 Jun 2015 16:35:17 +0200
 Subject: netbeans svnclient
 
 ---
+ libs.svnClientAdapter.javahl/nbproject/project.properties | 2 +-
  libs.svnClientAdapter.javahl/nbproject/project.xml        | 4 ++--
- libs.svnClientAdapter.svnkit/nbproject/project.properties | 4 ++--
- libs.svnClientAdapter.svnkit/nbproject/project.xml        | 8 ++++----
+ libs.svnClientAdapter.svnkit/nbproject/project.properties | 5 +++--
+ libs.svnClientAdapter.svnkit/nbproject/project.xml        | 8 ++++++--
  libs.svnClientAdapter/nbproject/project.xml               | 2 ++
- 4 files changed, 10 insertions(+), 8 deletions(-)
+ 5 files changed, 14 insertions(+), 7 deletions(-)
 
+diff --git a/libs.svnClientAdapter.javahl/nbproject/project.properties b/libs.svnClientAdapter.javahl/nbproject/project.properties
+index a520ea7..5e7850c 100644
+--- a/libs.svnClientAdapter.javahl/nbproject/project.properties
++++ b/libs.svnClientAdapter.javahl/nbproject/project.properties
+@@ -43,7 +43,7 @@
+ 
+ is.eager=true
+ javac.source=1.6
+-release.external/svnClientAdapter-javahl-1.10.3.jar=modules/ext/svnClientAdapter-javahl.jar
++#release.external/svnClientAdapter-javahl-1.10.3.jar=modules/ext/svnClientAdapter-javahl.jar
+ release.external/svnjavahl-1.8.4.jar=modules/ext/svnjavahl.jar
+ 
+ # Hidden class found: org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments in method protected byte[] org.tigris.subversion.svnclientadapter.commandline.SvnCommandLine.execBytes(org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments,boolean) throws java.lang.Exception in class org.tigris.subversion.svnclientadapter.commandline.SvnCommandLine
 diff --git a/libs.svnClientAdapter.javahl/nbproject/project.xml b/libs.svnClientAdapter.javahl/nbproject/project.xml
 index 66dc47e..f1d30a8 100644
 --- a/libs.svnClientAdapter.javahl/nbproject/project.xml
@@ -25,26 +39,26 @@ index 66dc47e..f1d30a8 100644
              <class-path-extension>
                  <runtime-relative-path>ext/svnjavahl.jar</runtime-relative-path>
 diff --git a/libs.svnClientAdapter.svnkit/nbproject/project.properties b/libs.svnClientAdapter.svnkit/nbproject/project.properties
-index b77cf2a..c6eef36 100644
+index b77cf2a..ca10635 100644
 --- a/libs.svnClientAdapter.svnkit/nbproject/project.properties
 +++ b/libs.svnClientAdapter.svnkit/nbproject/project.properties
-@@ -43,9 +43,9 @@
+@@ -43,8 +43,9 @@
  
  is.eager=true
  javac.source=1.6
 -release.external/svnClientAdapter-svnkit-1.10.3.jar=modules/ext/svnClientAdapter-svnkit.jar
+-release.external/org.tmatesoft.svnkit_1.8.4.r10218_v20140302_1242.jar=modules/ext/svnkit.jar
 +#release.external/svnClientAdapter-svnkit-1.10.3.jar=modules/ext/svnClientAdapter-svnkit.jar
- release.external/org.tmatesoft.svnkit_1.8.4.r10218_v20140302_1242.jar=modules/ext/svnkit.jar
--release.external/sqljet-1.1.10.jar=modules/ext/sqljet.jar
-+#release.external/sqljet-1.1.10.jar=modules/ext/sqljet.jar
++release.external/org.tmatesoft.svnkit_1.8.4.r10218_v20140302_1242.jar=modules/ext/svnkit-javahl16.jar
++release.external/svnkit.jar=modules/ext/svnkit.jar
+ release.external/sqljet-1.1.10.jar=modules/ext/sqljet.jar
  release.external/com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.jar=modules/ext/trilead.ssh2.jar
  
- sigtest.gen.fail.on.error=false
 diff --git a/libs.svnClientAdapter.svnkit/nbproject/project.xml b/libs.svnClientAdapter.svnkit/nbproject/project.xml
-index 5e8ac75..186b896 100644
+index 5e8ac75..ac06921 100644
 --- a/libs.svnClientAdapter.svnkit/nbproject/project.xml
 +++ b/libs.svnClientAdapter.svnkit/nbproject/project.xml
-@@ -95,18 +95,18 @@ made subject to such option by the copyright holder.
+@@ -95,12 +95,16 @@ made subject to such option by the copyright holder.
                  </test-type>
              </test-dependencies>
              <public-packages/>
@@ -56,17 +70,13 @@ index 5e8ac75..186b896 100644
 +            </class-path-extension>-->
              <class-path-extension>
                  <runtime-relative-path>ext/svnkit.jar</runtime-relative-path>
++                <binary-origin>external/svnkit.jar</binary-origin>
++            </class-path-extension>
++            <class-path-extension>
++                <runtime-relative-path>ext/svnkit-javahl16.jar</runtime-relative-path>
                  <binary-origin>external/org.tmatesoft.svnkit_1.8.4.r10218_v20140302_1242.jar</binary-origin>
              </class-path-extension>
--            <class-path-extension>
-+            <!--<class-path-extension>
-                 <runtime-relative-path>ext/sqljet.jar</runtime-relative-path>
-                 <binary-origin>external/sqljet-1.1.10.jar</binary-origin>
--            </class-path-extension>
-+            </class-path-extension>-->
              <class-path-extension>
-                 <runtime-relative-path>ext/trilead.ssh2.jar</runtime-relative-path>
-                 <binary-origin>external/com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.jar</binary-origin>
 diff --git a/libs.svnClientAdapter/nbproject/project.xml b/libs.svnClientAdapter/nbproject/project.xml
 index 7089cca..444e717 100644
 --- a/libs.svnClientAdapter/nbproject/project.xml

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