This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository netbeans.
commit 12d6a02bc23fc57fd58b168d0f46b9f48024489d Author: Markus Koschany <[email protected]> Date: Fri Jun 12 17:10:40 2015 +0200 Update netbeans-svnclient.patch --- debian/patches/netbeans-svnclient.patch | 59 ++++++++++++++++++++++++++++----- 1 file changed, 51 insertions(+), 8 deletions(-) diff --git a/debian/patches/netbeans-svnclient.patch b/debian/patches/netbeans-svnclient.patch index 2ee98ac..78d1000 100644 --- a/debian/patches/netbeans-svnclient.patch +++ b/debian/patches/netbeans-svnclient.patch @@ -3,17 +3,37 @@ Date: Fri, 12 Jun 2015 16:35:17 +0200 Subject: netbeans svnclient --- - libs.svnClientAdapter.svnkit/nbproject/project.properties | 2 +- - libs.svnClientAdapter.svnkit/nbproject/project.xml | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) + libs.svnClientAdapter.javahl/nbproject/project.xml | 4 ++-- + libs.svnClientAdapter.svnkit/nbproject/project.properties | 4 ++-- + libs.svnClientAdapter.svnkit/nbproject/project.xml | 8 ++++---- + libs.svnClientAdapter/nbproject/project.xml | 2 ++ + 4 files changed, 10 insertions(+), 8 deletions(-) +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 ++++ b/libs.svnClientAdapter.javahl/nbproject/project.xml +@@ -95,8 +95,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.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 b77cf2a..0521bf1 100644 +index b77cf2a..c6eef36 100644 --- a/libs.svnClientAdapter.svnkit/nbproject/project.properties +++ b/libs.svnClientAdapter.svnkit/nbproject/project.properties -@@ -45,7 +45,7 @@ is.eager=true +@@ -43,9 +43,9 @@ + + is.eager=true javac.source=1.6 - release.external/svnClientAdapter-svnkit-1.10.3.jar=modules/ext/svnClientAdapter-svnkit.jar +-release.external/svnClientAdapter-svnkit-1.10.3.jar=modules/ext/svnClientAdapter-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 @@ -21,10 +41,20 @@ index b77cf2a..0521bf1 100644 sigtest.gen.fail.on.error=false diff --git a/libs.svnClientAdapter.svnkit/nbproject/project.xml b/libs.svnClientAdapter.svnkit/nbproject/project.xml -index 5e8ac75..5889b4d 100644 +index 5e8ac75..186b896 100644 --- a/libs.svnClientAdapter.svnkit/nbproject/project.xml +++ b/libs.svnClientAdapter.svnkit/nbproject/project.xml -@@ -103,10 +103,10 @@ made subject to such option by the copyright holder. +@@ -95,18 +95,18 @@ 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/org.tmatesoft.svnkit_1.8.4.r10218_v20140302_1242.jar</binary-origin> </class-path-extension> @@ -37,3 +67,16 @@ index 5e8ac75..5889b4d 100644 <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 ++++ b/libs.svnClientAdapter/nbproject/project.xml +@@ -81,6 +81,8 @@ 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> -- 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
