[netbeans] 10/12: Fix symlink paths to svnclient libs.

[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 a3d779088844ec1546cc570db6ae3a63a13b3fa0
Author: Markus Koschany <apo at gambaru.de>
Date:   Fri Jun 12 21:22:04 2015 +0200

    Fix symlink paths to svnclient libs.
---
 debian/patches/netbeans-svnclient.patch | 50 ++++++++++++++++++++++-----------
 1 file changed, 34 insertions(+), 16 deletions(-)

diff --git a/debian/patches/netbeans-svnclient.patch b/debian/patches/netbeans-svnclient.patch
index 324ebab..fcb5228 100644
--- a/debian/patches/netbeans-svnclient.patch
+++ b/debian/patches/netbeans-svnclient.patch
@@ -3,12 +3,12 @@ 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 | 5 +++--
- libs.svnClientAdapter.svnkit/nbproject/project.xml        | 8 ++++++--
- libs.svnClientAdapter/nbproject/project.xml               | 2 ++
- 5 files changed, 14 insertions(+), 7 deletions(-)
+ libs.svnClientAdapter.javahl/nbproject/project.properties |  2 +-
+ libs.svnClientAdapter.javahl/nbproject/project.xml        |  6 +++---
+ libs.svnClientAdapter.svnkit/nbproject/project.properties |  5 +++--
+ libs.svnClientAdapter.svnkit/nbproject/project.xml        | 12 ++++++++----
+ libs.svnClientAdapter/nbproject/project.xml               |  4 +++-
+ 5 files changed, 18 insertions(+), 11 deletions(-)
 
 diff --git a/libs.svnClientAdapter.javahl/nbproject/project.properties b/libs.svnClientAdapter.javahl/nbproject/project.properties
 index a520ea7..5e7850c 100644
@@ -24,20 +24,24 @@ index a520ea7..5e7850c 100644
  
  # 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
+index 66dc47e..36f488a 100644
 --- a/libs.svnClientAdapter.javahl/nbproject/project.xml
 +++ b/libs.svnClientAdapter.javahl/nbproject/project.xml
-@@ -95,8 +95,8 @@ made subject to such option by the copyright holder.
+@@ -95,11 +95,11 @@ made subject to such option by the copyright holder.
              </test-dependencies>
              <public-packages/>
              <class-path-extension>
 -                <runtime-relative-path>ext/svnClientAdapter-javahl.jar</runtime-relative-path>
 -                <binary-origin>external/svnClientAdapter-javahl-1.10.3.jar</binary-origin>
-+                <runtime-relative-path>ext/svnClientAdapter-main.jar</runtime-relative-path>
++                <runtime-relative-path>ext/svnClientAdapter-main-1.10.3.jar</runtime-relative-path>
 +                <!--<binary-origin>external/svnClientAdapter-javahl-1.10.3.jar</binary-origin>-->
              </class-path-extension>
              <class-path-extension>
-                 <runtime-relative-path>ext/svnjavahl.jar</runtime-relative-path>
+-                <runtime-relative-path>ext/svnjavahl.jar</runtime-relative-path>
++                <runtime-relative-path>ext/svnjavahl-1.8.4.jar</runtime-relative-path>
+                 <binary-origin>external/svnjavahl-1.8.4.jar</binary-origin>
+             </class-path-extension>
+         </data>
 diff --git a/libs.svnClientAdapter.svnkit/nbproject/project.properties b/libs.svnClientAdapter.svnkit/nbproject/project.properties
 index b77cf2a..ca10635 100644
 --- a/libs.svnClientAdapter.svnkit/nbproject/project.properties
@@ -55,10 +59,10 @@ index b77cf2a..ca10635 100644
  release.external/com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.jar=modules/ext/trilead.ssh2.jar
  
 diff --git a/libs.svnClientAdapter.svnkit/nbproject/project.xml b/libs.svnClientAdapter.svnkit/nbproject/project.xml
-index 5e8ac75..ac06921 100644
+index 5e8ac75..05f669f 100644
 --- a/libs.svnClientAdapter.svnkit/nbproject/project.xml
 +++ b/libs.svnClientAdapter.svnkit/nbproject/project.xml
-@@ -95,12 +95,16 @@ made subject to such option by the copyright holder.
+@@ -95,20 +95,24 @@ made subject to such option by the copyright holder.
                  </test-type>
              </test-dependencies>
              <public-packages/>
@@ -73,15 +77,25 @@ index 5e8ac75..ac06921 100644
 +                <binary-origin>external/svnkit.jar</binary-origin>
 +            </class-path-extension>
 +            <class-path-extension>
-+                <runtime-relative-path>ext/svnkit-javahl16.jar</runtime-relative-path>
++                <runtime-relative-path>ext/org.tmatesoft.svnkit_1.8.4.r10218_v20140302_1242.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>
+-                <runtime-relative-path>ext/sqljet.jar</runtime-relative-path>
++                <runtime-relative-path>ext/sqljet-1.1.10.jar</runtime-relative-path>
+                 <binary-origin>external/sqljet-1.1.10.jar</binary-origin>
+             </class-path-extension>
+             <class-path-extension>
+-                <runtime-relative-path>ext/trilead.ssh2.jar</runtime-relative-path>
++                <runtime-relative-path>ext/com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.jar</runtime-relative-path>
+                 <binary-origin>external/com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.jar</binary-origin>
+             </class-path-extension>
+         </data>
 diff --git a/libs.svnClientAdapter/nbproject/project.xml b/libs.svnClientAdapter/nbproject/project.xml
-index 7089cca..444e717 100644
+index 7089cca..b9b38de 100644
 --- a/libs.svnClientAdapter/nbproject/project.xml
 +++ b/libs.svnClientAdapter/nbproject/project.xml
-@@ -81,6 +81,8 @@ made subject to such option by the copyright holder.
+@@ -81,9 +81,11 @@ made subject to such option by the copyright holder.
                  <package>org.netbeans.libs.svnclientadapter</package>
                  <package>org.tigris.subversion.svnclientadapter</package>
                  <package>org.tigris.subversion.svnclientadapter.utils</package>
@@ -89,4 +103,8 @@ index 7089cca..444e717 100644
 +                <package>org.tigris.subversion.svnclientadapter.svnkit</package>
              </friend-packages>
              <class-path-extension>
-                 <runtime-relative-path>ext/svnClientAdapter-main.jar</runtime-relative-path>
+-                <runtime-relative-path>ext/svnClientAdapter-main.jar</runtime-relative-path>
++                <runtime-relative-path>ext/svnClientAdapter-main-1.10.3.jar</runtime-relative-path>
+                 <binary-origin>external/svnClientAdapter-main-1.10.3.jar</binary-origin>
+             </class-path-extension>
+         </data>

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