This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository netbeans.
commit 5ed42c8347d8afa1d8e9fd0cc4053996b374d2b1 Author: Markus Koschany <[email protected]> Date: Thu Dec 17 01:43:55 2015 +0100 Drop netbeans-svnclient.patch --- debian/patches/netbeans-svnclient.patch | 119 -------------------------------- debian/patches/series | 1 - 2 files changed, 120 deletions(-) diff --git a/debian/patches/netbeans-svnclient.patch b/debian/patches/netbeans-svnclient.patch deleted file mode 100644 index eb354be..0000000 --- a/debian/patches/netbeans-svnclient.patch +++ /dev/null @@ -1,119 +0,0 @@ -From: Markus Koschany <[email protected]> -Date: Fri, 12 Jun 2015 16:35:17 +0200 -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 | 6 +++--- - libs.svnClientAdapter.svnkit/nbproject/project.properties | 5 +++-- - libs.svnClientAdapter.svnkit/nbproject/project.xml | 12 ++++++++---- - libs.svnClientAdapter/nbproject/project.xml | 7 ++++++- - 5 files changed, 21 insertions(+), 11 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..36f488a 100644 ---- a/libs.svnClientAdapter.javahl/nbproject/project.xml -+++ b/libs.svnClientAdapter.javahl/nbproject/project.xml -@@ -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-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-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 -+++ 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.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-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 - -diff --git a/libs.svnClientAdapter.svnkit/nbproject/project.xml b/libs.svnClientAdapter.svnkit/nbproject/project.xml -index 5e8ac75..05f669f 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.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..612efbf 100644 ---- a/libs.svnClientAdapter/nbproject/project.xml -+++ b/libs.svnClientAdapter/nbproject/project.xml -@@ -81,11 +81,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 dfe84c3..ad38660 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -13,7 +13,6 @@ netbeans-spi.java.hints.patch netbeans-libs.jaxb.patch netbeans-xml.jaxb.api.patch netbeans-build.patch -netbeans-svnclient.patch netbeans-updatecenters.patch netbeans-slf4j.dummy.patch netbeans-include-junit.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netbeans.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
