This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository netbeans.
commit 0d702960cdf7e5d8144a1fa5fb0d1f4448f7f98f Author: Markus Koschany <[email protected]> Date: Fri Jun 12 19:03:27 2015 +0200 Add sqljet. Revert svnclient patch. --- debian/control | 2 + debian/linked-jars | 5 +- debian/patches/netbeans-svnclient.patch | 82 --------------------------------- debian/patches/series | 1 - 4 files changed, 5 insertions(+), 85 deletions(-) diff --git a/debian/control b/debian/control index 24185d1..25b0dc1 100644 --- a/debian/control +++ b/debian/control @@ -59,6 +59,7 @@ Build-Depends: libsvn-java, libsvnclientadapter-java, libsvnkit-java, + libsqljet-java, libswing-layout-java (>= 1.0.3), libswingx-java, libtrilead-ssh2-java, @@ -214,6 +215,7 @@ Depends: libpostgresql-jdbc-java, libservlet2.5-java, libsimple-validation-java, + libsqljet-java, libsvn-java, libsvnclientadapter-java, libsvnkit-java, diff --git a/debian/linked-jars b/debian/linked-jars index 6e24436..b879610 100644 --- a/debian/linked-jars +++ b/debian/linked-jars @@ -36,10 +36,11 @@ $JAVADIR/lucene3-core.jar libs.lucene/external ide/modules/ext lucene-core-3.5.0 $JAVADIR/xml-resolver-1.2.jar o.apache.xml.resolver/external ide/modules/ext resolver-1.2.jar $JAVADIR/servlet-api-2.5.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 svnClientAdapter-javahl-1.10.3.jar +$JAVADIR/svnClientAdapter.jar libs.svnClientAdapter.javahl/external ide/modules/ext svnClientAdapter-javahl-1.10.3.jar +$JAVADIR/svnClientAdapter.jar libs.svnClientAdapter.svnkit/external ide/modules/ext svnClientAdapter-svnkit-1.10.3.jar $JAVADIR/svnkit-javahl16.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.jar libs.svnClientAdapter.svnkit/external ide/modules/ext sqljet-1.1.10.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/simple-validation.jar swing.validation/external ide/modules/ext ValidationAPI.jar diff --git a/debian/patches/netbeans-svnclient.patch b/debian/patches/netbeans-svnclient.patch deleted file mode 100644 index 78d1000..0000000 --- a/debian/patches/netbeans-svnclient.patch +++ /dev/null @@ -1,82 +0,0 @@ -From: Markus Koschany <[email protected]> -Date: Fri, 12 Jun 2015 16:35:17 +0200 -Subject: netbeans svnclient - ---- - 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..c6eef36 100644 ---- a/libs.svnClientAdapter.svnkit/nbproject/project.properties -+++ b/libs.svnClientAdapter.svnkit/nbproject/project.properties -@@ -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/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 - release.external/com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.jar=modules/ext/trilead.ssh2.jar - - sigtest.gen.fail.on.error=false -diff --git a/libs.svnClientAdapter.svnkit/nbproject/project.xml b/libs.svnClientAdapter.svnkit/nbproject/project.xml -index 5e8ac75..186b896 100644 ---- a/libs.svnClientAdapter.svnkit/nbproject/project.xml -+++ b/libs.svnClientAdapter.svnkit/nbproject/project.xml -@@ -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> -- <class-path-extension> -+ <!--<class-path-extension> - <runtime-relative-path>ext/sqljet.jar</runtime-relative-path> - <binary-origin>external/sqljet-1.1.10.jar</binary-origin> -- </class-path-extension> -+ </class-path-extension>--> - <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> diff --git a/debian/patches/series b/debian/patches/series index 4632bf7..b8bce9a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -27,4 +27,3 @@ netbeans-ide-launcher.patch netbeans-platform-launcher.patch netbeans-small-ide.patch netbeans-xsl-httpserver.patch -netbeans-svnclient.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
