...
 
Commits (5)
netbeans (10.0-2) UNRELEASED; urgency=medium
* Add Unsafe.patch
* Fix another NullPointerException by adding a symlink to asm-all.jar (ide)
* Fix broken subversion support.
-- Markus Koschany <apo@debian.org> Sat, 26 Jan 2019 18:43:03 +0100
netbeans (10.0-1) unstable; urgency=medium
* New upstream version 10.0.
......
......@@ -41,9 +41,6 @@ $JAVADIR/freemarker.jar ide/libs.freemarker/external ide/modules/ext freemarker-
$JAVADIR/jaxb-xjc.jar ide/libs.jaxb/external ide/modules/ext/jaxb jaxb-xjc-2.2.5-2.jar
$JAVADIR/jaxb-impl.jar ide/libs.jaxb/external ide/modules/ext/jaxb jaxb-impl-2.2.5-2.jar
$JAVADIR/jaxb-api.jar ide/xml.jaxb.api/external ide/modules/ext/jaxb/api jaxb-api-2.2.6.jar
$JAVADIR/svnClientAdapter.jar ide/libs.svnClientAdapter/external ide/modules/ext svnClientAdapter-main-1.10.12.jar
$JAVADIR/svnClientAdapter.jar ide/libs.svnClientAdapter.javahl/external ide/modules/ext svnClientAdapter-javahl-1.10.12.jar
$JAVADIR/svn-javahl.jar ide/libs.svnClientAdapter.javahl/external ide/modules/ext svnjavahl-1.9.3.jar
$JAVADIR/xercesImpl.jar ide/libs.xerces/external ide/modules/ext xercesImpl-2.8.0.jar
$JAVADIR/commons-codec.jar ide/o.apache.commons.codec/external ide/modules/ext commons-codec-1.3.jar
$JAVADIR/commons-io.jar ide/o.apache.commons.io/external ide/modules/ext commons-io-1.4.jar
......@@ -66,3 +63,11 @@ $JAVADIR/javac-impl.jar java/libs.javacimpl/external java/modules/ext nb-javac-9
$JAVADIR/junit4.jar platform/libs.junit4/external platform/modules/ext junit-4.12.jar
$JAVADIR/hamcrest-core.jar platform/libs.junit4/external platform/modules/ext hamcrest-core-1.3.jar
$JAVADIR/cglib.jar java/libs.cglib/external java/modules/ext cglib-2.2.jar
$JAVADIR/svnClientAdapter.jar ide/libs.svnClientAdapter/external ide/modules/ext svnClientAdapter-main-1.10.12.jar
$JAVADIR/svnClientAdapter.jar ide/libs.svnClientAdapter.javahl/external ide/modules/ext svnClientAdapter-javahl-1.10.12.jar
$JAVADIR/svnClientAdapter.jar ide/libs.svnClientAdapter.svnkit/external ide/modules/ext svnClientAdapter-svnkit-1.10.12.jar
$JAVADIR/svnkit-javahl16.jar ide/libs.svnClientAdapter.svnkit/external ide/modules/ext org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar
$JAVADIR/svnkit.jar ide/libs.svnClientAdapter.svnkit/external ide/modules/ext svnkit.jar
$JAVADIR/svn-javahl.jar ide/libs.svnClientAdapter.javahl/external ide/modules/ext svnjavahl-1.9.3.jar
$JAVADIR/trilead-ssh2.jar ide/libs.svnClientAdapter.svnkit/external ide/modules/ext com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar
$JAVADIR/sqljet.jar ide/libs.svnClientAdapter.svnkit/external ide/modules/ext sqljet-1.1.10.jar
From: Markus Koschany <apo@debian.org>
Date: Thu, 24 Jan 2019 22:33:31 +0100
Subject: netbeans slf4j.dummy
---
ide/o.eclipse.jgit/nbproject/project.xml | 5 +++++
slf4j.dummy/build.xml | 12 ++++++++++++
slf4j.dummy/manifest.mf | 1 +
slf4j.dummy/nbproject/project.xml | 15 +++++++++++++++
4 files changed, 33 insertions(+)
create mode 100644 slf4j.dummy/build.xml
create mode 100644 slf4j.dummy/manifest.mf
create mode 100644 slf4j.dummy/nbproject/project.xml
diff --git a/ide/o.eclipse.jgit/nbproject/project.xml b/ide/o.eclipse.jgit/nbproject/project.xml
index fa92725..63c11c1 100644
--- a/ide/o.eclipse.jgit/nbproject/project.xml
+++ b/ide/o.eclipse.jgit/nbproject/project.xml
@@ -37,6 +37,11 @@
<specification-version>0.6.12</specification-version>
</run-dependency>
</dependency>
+ <dependency>
+ <code-name-base>slf4j.dummy</code-name-base>
+ <compile-dependency/>
+ <run-dependency/>
+ </dependency>
</module-dependencies>
<public-packages/>
<class-path-extension>
diff --git a/slf4j.dummy/build.xml b/slf4j.dummy/build.xml
new file mode 100644
index 0000000..b7663bc
--- /dev/null
+++ b/slf4j.dummy/build.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="slf4j.dummy" default="netbeans" basedir=".">
+ <import file="../nbbuild/templates/projectized.xml"/>
+ <target name="jar">
+ <jar jarfile="${cluster}/${module.jar}">
+ <manifest>
+ <attribute name="Bundle-SymbolicName" value="slf4j.dummy;singleton:=true"/>
+ <attribute name="Export-Package" value="org.slf4j;version=1.7.14"/>
+ </manifest>
+ </jar>
+ </target>
+</project>
diff --git a/slf4j.dummy/manifest.mf b/slf4j.dummy/manifest.mf
new file mode 100644
index 0000000..74571ad
--- /dev/null
+++ b/slf4j.dummy/manifest.mf
@@ -0,0 +1 @@
+OpenIDE-Module: slf4j.dummy
diff --git a/slf4j.dummy/nbproject/project.xml b/slf4j.dummy/nbproject/project.xml
new file mode 100644
index 0000000..53962c8
--- /dev/null
+++ b/slf4j.dummy/nbproject/project.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+ <type>org.netbeans.modules.apisupport.project</type>
+ <configuration>
+ <data xmlns="http://www.netbeans.org/ns/nb-module-project/2">
+ <code-name-base>slf4j.dummy</code-name-base>
+ <module-dependencies/>
+ <public-packages/>
+ <class-path-extension>
+ <runtime-relative-path>slf4j-dummy.jar</runtime-relative-path>
+ <binary-origin>external/slf4j-dummy.jar</binary-origin>
+ </class-path-extension>
+ </data>
+ </configuration>
+</project>
......@@ -30,7 +30,6 @@ netbeans-ide-launcher.patch
netbeans-small-ide.patch
netbeans-updatecenters.patch
netbeans-xsl-httpserver.patch
netbeans-slf4j.dummy.patch
disable-Git-support.patch
disable-nativeexecution-module.patch
o.apache.commons.io.patch
......
......@@ -85,11 +85,8 @@ override_dh_auto_install:
$(INSTALL)$(pkg-ide) nbbuild/netbeans/ide/.noautoupdate $(NB_INSTALL_DIR)/$(base-ide)
$(INSTALL)$(pkg-ide) nbbuild/netbeans/ide/.lastModified $(NB_INSTALL_DIR)/$(base-ide)
# See netbeans-slf4j.dummy.patch for further information
$(LINK)$(pkg-ide) usr/share/java/slf4j-api.jar $(NB_INSTALL_DIR)/$(base-ide)/modules/slf4j-dummy.jar
#$(LINK)$(pkg-ide) usr/share/java/slf4j-api.jar $(NB_INSTALL_DIR)/$(base-ide)/modules/slf4j-dummy.jar
# Symlink IDE modules to corresponding system jar files
$(LINK)$(pkg-ide) usr/share/java/svnClientAdapter.jar $(NB_INSTALL_DIR)/$(base-ide)/modules/ext/svnClientAdapter-main.jar
$(LINK)$(pkg-ide) usr/share/java/svnClientAdapter.jar $(NB_INSTALL_DIR)/$(base-ide)/modules/ext/svnClientAdapter-javahl.jar
$(LINK)$(pkg-ide) usr/share/java/svnkit-javahl16.jar $(NB_INSTALL_DIR)/$(base-ide)/modules/ext/svnjavahl.jar
$(LINK)$(pkg-ide) usr/share/java/jsch.agentproxy.usocket-jna.jar $(NB_INSTALL_DIR)/$(base-ide)/modules/ext/jsch-agentproxy-usocket-jna.jar
$(LINK)$(pkg-ide) usr/share/java/htmlparser.jar $(NB_INSTALL_DIR)/$(base-ide)/modules/ext/html5-parser.jar
$(LINK)$(pkg-ide) usr/share/java/jsch.agentproxy.sshagent.jar $(NB_INSTALL_DIR)/$(base-ide)/modules/ext/jsch-agentproxy-sshagent.jar
......@@ -98,6 +95,7 @@ override_dh_auto_install:
$(LINK)$(pkg-ide) usr/share/java/jaxb-api.jar $(NB_INSTALL_DIR)/$(base-ide)/modules/ext/jaxb/jaxb-api.jar
$(LINK)$(pkg-ide) usr/share/java/xercesImpl.jar $(NB_INSTALL_DIR)/$(base-ide)/modules/ext/xerces-2.8.0.jar
$(LINK)$(pkg-ide) usr/share/java/simple-validation.jar $(NB_INSTALL_DIR)/$(base-ide)/modules/ext/ValidationAPI.jar
$(LINK)$(pkg-ide) usr/share/java/asm-all.jar $(NB_INSTALL_DIR)/$(base-ide)/modules/ext/asm-all-5.0.1.jar
# Make hostinfo.sh executable to silence Lintian warning about script-not-exectuable
find . -type f -name "hostinfo.sh" -exec chmod a+x {} \;
......