[netbeans] 43/49: Refresh netbeans-svnclient.patch and update svn versions.
Markus Koschany
apo-guest at moszumanska.debian.org
Sat Dec 26 20:44:51 UTC 2015
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository netbeans.
commit a069bfa978720b38a1f84817d29a9e1a22dd7f8c
Author: Markus Koschany <apo at debian.org>
Date: Sat Dec 26 19:02:56 2015 +0100
Refresh netbeans-svnclient.patch and update svn versions.
---
debian/linked-jars | 4 +-
debian/patches/netbeans-svnclient.patch | 114 ++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 117 insertions(+), 2 deletions(-)
diff --git a/debian/linked-jars b/debian/linked-jars
index c146605..c1868ea 100644
--- a/debian/linked-jars
+++ b/debian/linked-jars
@@ -39,11 +39,11 @@ $JAVADIR/xml-resolver-1.2.jar o.apache.xml.resolver/external ide/modules/ext res
$JAVADIR/servlet-api-3.1.jar servletapi/external ide/modules/ext servlet-2.2.jar
$JAVADIR/svnClientAdapter.jar libs.svnClientAdapter/external ide/modules/ext svnClientAdapter-main-1.10.3.jar
$JAVADIR/svn-javahl.jar libs.svnClientAdapter.javahl/external ide/modules/ext svnjavahl-1.8.4.jar
-$JAVADIR/svnkit-javahl16.jar libs.svnClientAdapter.svnkit/external ide/modules/ext org.tmatesoft.svnkit_1.8.4.r10218_v20140302_1242.jar
+$JAVADIR/svnkit-javahl16.jar libs.svnClientAdapter.svnkit/external ide/modules/ext org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar
$JAVADIR/svnkit.jar libs.svnClientAdapter.svnkit/external ide/modules/ext svnkit.jar
$JAVADIR/sqljet.jar libs.svnClientAdapter.svnkit/external ide/modules/ext sqljet-1.1.10.jar
$JAVADIR/swingx.jar libs.swingx/external ide/modules/ext swingx-all-1.6.4.jar
-$JAVADIR/trilead-ssh2.jar libs.svnClientAdapter.svnkit/external ide/modules/ext com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.jar
+$JAVADIR/trilead-ssh2.jar libs.svnClientAdapter.svnkit/external ide/modules/ext com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar
$JAVADIR/simple-validation.jar swing.validation/external ide/modules/ext ValidationAPI.jar
$JAVADIR/xercesImpl.jar libs.xerces/external ide/modules/ext xerces-2.8.0.jar
$JAVADIR/jaxp-1.4.jar libs.xerces/external ide/modules/ext jaxp-1.4.jar
diff --git a/debian/patches/netbeans-svnclient.patch b/debian/patches/netbeans-svnclient.patch
new file mode 100644
index 0000000..990b55d
--- /dev/null
+++ b/debian/patches/netbeans-svnclient.patch
@@ -0,0 +1,114 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sat, 26 Dec 2015 19:00:28 +0100
+Subject: netbeans svnclient
+
+Fix the SVN module of Netbeans and add all necessary jar files to the
+classpath.
+
+Forwarded: not-needed
+---
+ 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 | 11 +++++++----
+ libs.svnClientAdapter/nbproject/project.xml | 7 ++++++-
+ 5 files changed, 19 insertions(+), 10 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 07a0852..741b576 100644
+--- a/libs.svnClientAdapter.javahl/nbproject/project.xml
++++ b/libs.svnClientAdapter.javahl/nbproject/project.xml
+@@ -103,8 +103,8 @@ 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-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>
+diff --git a/libs.svnClientAdapter.svnkit/nbproject/project.properties b/libs.svnClientAdapter.svnkit/nbproject/project.properties
+index aa7a77e..dddd782 100644
+--- a/libs.svnClientAdapter.svnkit/nbproject/project.properties
++++ b/libs.svnClientAdapter.svnkit/nbproject/project.properties
+@@ -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.10.r10446_v20150526_1454.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.10.r10446_v20150526_1454.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.build219_t20150519_2322.jar=modules/ext/trilead.ssh2.jar
+
+diff --git a/libs.svnClientAdapter.svnkit/nbproject/project.xml b/libs.svnClientAdapter.svnkit/nbproject/project.xml
+index 090a6dc..0a84982 100644
+--- a/libs.svnClientAdapter.svnkit/nbproject/project.xml
++++ b/libs.svnClientAdapter.svnkit/nbproject/project.xml
+@@ -95,20 +95,23 @@ made subject to such option by the copyright holder.
+ </test-type>
+ </test-dependencies>
+ <public-packages/>
+- <class-path-extension>
++ <!--<class-path-extension>
+ <runtime-relative-path>ext/svnClientAdapter-svnkit.jar</runtime-relative-path>
+ <binary-origin>external/svnClientAdapter-svnkit-1.10.3.jar</binary-origin>
+- </class-path-extension>
++ </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>
++ <runtime-relative-path>external/org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar</runtime-relative-path>
+ <binary-origin>external/org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.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.build219_t20150519_2322.jar</runtime-relative-path>
+ <binary-origin>external/com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar</binary-origin>
+ </class-path-extension>
+ </data>
+diff --git a/libs.svnClientAdapter/nbproject/project.xml b/libs.svnClientAdapter/nbproject/project.xml
+index 76bc6a9..6effaf3 100644
+--- a/libs.svnClientAdapter/nbproject/project.xml
++++ b/libs.svnClientAdapter/nbproject/project.xml
+@@ -89,11 +89,16 @@ 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>
++ <package>org.tigris.subversion.svnclientadapter.javahl</package>
++ <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-1.10.3.jar</runtime-relative-path>
+ <binary-origin>external/svnClientAdapter-main-1.10.3.jar</binary-origin>
+ </class-path-extension>
++ <class-path-extension>
++ <runtime-relative-path>ext/svnjavahl-1.8.4.jar</runtime-relative-path>
++ </class-path-extension>
+ </data>
+ </configuration>
+ </project>
diff --git a/debian/patches/series b/debian/patches/series
index 959ef9f..eeef765 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -26,3 +26,4 @@ db.dataview-setRowFilter-method.patch
netbeans-small-ide.patch
netbeans-dlight.nativeexecution.patch
netbeans-extexecution.impl.patch
+netbeans-svnclient.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netbeans.git
More information about the pkg-java-commits
mailing list