[netbeans] 06/33: Drop netbeans-svnclient.patch
Markus Koschany
apo-guest at moszumanska.debian.org
Wed Feb 24 19:39:50 GMT 2016
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository netbeans.
commit 05a9a177507aee13edc4dd23ef96d20c6a0592ec
Author: Markus Koschany <apo at debian.org>
Date: Fri Feb 19 22:46:49 2016 +0100
Drop netbeans-svnclient.patch
---
debian/patches/netbeans-svnclient.patch | 115 --------------------------------
debian/patches/series | 1 -
2 files changed, 116 deletions(-)
diff --git a/debian/patches/netbeans-svnclient.patch b/debian/patches/netbeans-svnclient.patch
deleted file mode 100644
index 7f63009..0000000
--- a/debian/patches/netbeans-svnclient.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-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 | 12 ++++++++----
- libs.svnClientAdapter/nbproject/project.xml | 7 ++++++-
- 5 files changed, 20 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..18d0cbb 100644
---- a/libs.svnClientAdapter.svnkit/nbproject/project.xml
-+++ b/libs.svnClientAdapter.svnkit/nbproject/project.xml
-@@ -95,20 +95,24 @@ 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>
-+ <class-path-extension>
-+ <runtime-relative-path>ext/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 96d8cbb..6b6af67 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -25,7 +25,6 @@ db.dataview-setRowFilter-method.patch
netbeans-small-ide.patch
netbeans-dlight.nativeexecution.patch
netbeans-extexecution.impl.patch
-netbeans-svnclient.patch
javaewah-version.patch
netbeans-wildUpperBound.patch
netbeans-com.sun.tools.hc.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