[netbeans] 02/02: Add debian directory for Netbeans 8.2
Markus Koschany
apo at moszumanska.debian.org
Sat Dec 24 23:23:54 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch experimental
in repository netbeans.
commit bf771435048df66ae0842602fd3b1131b58d7764
Author: Markus Koschany <apo at debian.org>
Date: Sat Dec 24 23:32:51 2016 +0100
Add debian directory for Netbeans 8.2
---
debian/README.source | 1 +
debian/changelog | 6 +
debian/compat | 2 +-
debian/control | 9 +-
debian/linked-jars | 23 +-
debian/patches/antlr-3.5.2.patch | 6 +-
.../patches/db.dataview-setRowFilter-method.patch | 12 +-
debian/patches/javaewah-version.patch | 6 +-
debian/patches/netbeans-CommandLineParser.patch | 4 +-
debian/patches/netbeans-build.patch | 8 +-
debian/patches/netbeans-cluster-properties.patch | 135 +++--
debian/patches/netbeans-com.sun.tools.hc.patch | 12 +-
debian/patches/netbeans-commons-net.patch | 4 +-
.../patches/netbeans-dlight.nativeexecution.patch | 8 +-
debian/patches/netbeans-empty-binaries-list.patch | 609 ++++++++-------------
...tion.impl.patch => netbeans-extexecution.patch} | 51 +-
debian/patches/netbeans-ide-launcher.patch | 28 +-
debian/patches/netbeans-javacc.patch | 8 +-
debian/patches/netbeans-lib.nbjavac.patch | 71 +++
debian/patches/netbeans-libs.jaxb.patch | 6 +-
debian/patches/netbeans-nocopy.patch | 35 +-
.../netbeans-o.apache.tools.ant.module.patch | 17 +-
debian/patches/netbeans-o.n.bootstrap.patch | 6 +-
...etbeans-platform-disable-net.java-modules.patch | 16 +-
.../netbeans-platform-empty-binaries-list.patch | 196 +++++++
...s-jemmy.patch => netbeans-platform-jemmy.patch} | 6 +-
debian/patches/netbeans-platform-junitlib.patch | 6 +-
debian/patches/netbeans-platform-nbi.patch | 11 +-
.../patches/netbeans-platform-nojnabinaries.patch | 60 +-
.../patches/netbeans-platform-o.n.html.ko4j.patch | 12 +-
debian/patches/netbeans-platform-properties.patch | 10 +-
.../netbeans-platform-windowslauncher.patch | 379 -------------
debian/patches/netbeans-slf4j.dummy.patch | 18 +-
debian/patches/netbeans-small-ide.patch | 42 +-
debian/patches/netbeans-spi.java.hints.patch | 8 +-
debian/patches/netbeans-svnclientadapter.patch | 5 +-
debian/patches/netbeans-updatecenters.patch | 6 +-
debian/patches/netbeans-wildUpperBound.patch | 8 +-
debian/patches/netbeans-xml.jaxb.api.patch | 6 +-
debian/patches/netbeans-xsl-httpserver.patch | 8 +-
debian/patches/osgi-update.patch | 8 +-
debian/patches/reproducible-build.patch | 4 +-
debian/patches/series | 45 +-
debian/rules | 2 +-
44 files changed, 837 insertions(+), 1086 deletions(-)
diff --git a/debian/README.source b/debian/README.source
index cc1cd2f..9efefc6 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -22,6 +22,7 @@ How to maintain Netbeans
./debian/orig-tar.sh 8.1 ../tarballs/netbeans-8.1-201510222201-src.zip
+2.1 Copy html5doc.zip from the old package to the new one.
3. Refresh all Netbeans patches as necessary.
diff --git a/debian/changelog b/debian/changelog
index d09991d..188d01a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+netbeans (8.2+dfsg1-1) UNRELEASED; urgency=medium
+
+ * Work in progress
+
+ -- Markus Koschany <apo at debian.org> Thu, 08 Dec 2016 00:21:49 +0100
+
netbeans (8.1+dfsg3-1) unstable; urgency=medium
* Symlink asm-all.jar to libs.nashorn module.
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index 06a02a4..d360b7b 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,8 @@ Build-Depends:
ant,
ant-optional,
antlr3 (>= 3.5.2),
- debhelper (>= 9),
+ antlr4,
+ debhelper (>= 10),
default-jdk,
icnsutils,
javacc,
@@ -21,8 +22,9 @@ Build-Depends:
libbeansbinding-java,
libbindex-java,
libbytelist-java,
- libcglib3-java,
+ libcglib-java (>= 3.0),
libcommons-codec-java,
+ libcommons-compress-java,
libcommons-io-java,
libcommons-lang-java,
libcommons-logging-java,
@@ -32,6 +34,7 @@ Build-Depends:
libfelix-framework-java,
libfelix-main-java,
libfreemarker-java,
+ libguava-java,
libhamcrest-java,
libhtml5parser-java,
libhttpclient-java,
@@ -155,7 +158,7 @@ Depends:
junit-doc,
junit4-doc,
libbeansbinding-java,
- libcglib3-java,
+ libcglib-java (>= 3.0),
libeclipselink-java,
libjson-simple-java,
libnb-absolutelayout-java,
diff --git a/debian/linked-jars b/debian/linked-jars
index fb61181..fbf6f4d 100644
--- a/debian/linked-jars
+++ b/debian/linked-jars
@@ -5,8 +5,8 @@ $JAVADIR/jnlp-servlet.jar apisupport.harness/external harness/jnlp jnlp-servlet.
$JAVADIR/swing-layout.jar o.jdesktop.layout/external platform/modules/ext swing-layout-1.0.4.jar
$JAVADIR/jhall.jar javahelp/external platform/modules/ext jhall-2.0_05.jar
-$JAVADIR/jna.jar libs.jna/external platform/modules/ext jna-4.1.0.jar
-$JAVADIR/jna-platform.jar libs.jna.platform/external platform/modules/ext jna-platform-4.1.0.jar
+$JAVADIR/jna.jar libs.jna/external platform/modules/ext jna-4.2.2.jar
+$JAVADIR/jna-platform.jar libs.jna.platform/external platform/modules/ext jna-platform-4.2.2.jar
$JAVADIR/org.apache.felix.framework.jar libs.felix/external platform/modules/ext felix-4.2.1.jar
$JAVADIR/org.apache.felix.main.jar libs.felix/external platform/modules/ext felix-main-4.2.1.jar
$JAVADIR/osgi.compendium.jar libs.osgi/external platform/modules/ext osgi.cmpn-4.2.jar
@@ -19,12 +19,15 @@ $JAVADIR/openjfx/jre/lib/ext/jfxrt.jar libs.javafx/external platform/modules/ext
$JAVADIR/testng.jar libs.testng/external platform/modules/ext testng-6.8.1-dist.jar
$JAVADIR/org.eclipse.osgi.jar netbinox/external platform/modules/ext org.eclipse.osgi_3.9.1.v20140110-1610.jar
+$JAVADIR/guava.jar c.google.guava/external ide/modules/ext guava-15.0.jar
$JAVADIR/antlr3-runtime.jar libs.antlr3.runtime/external ide/modules/ext antlr-runtime-3.4.jar
+$JAVADIR/antlr4-runtime.jar libs.antlr4.runtime/external ide/modules/ext antlr-runtime-4.5.3.jar
$JAVADIR/asm-all.jar libs.asm/external ide/modules/ext asm-all-5.0.1.jar
$JAVADIR/asm-all.jar libs.nashorn/external ide/modules/ext asm-all-4.0.jar
$JAVADIR/commons-codec.jar o.apache.commons.codec/external ide/modules/ext apache-commons-codec-1.3.jar
$JAVADIR/bytelist.jar libs.bytelist/external ide/modules/ext bytelist-0.1.jar
$JAVADIR/commons-logging.jar o.apache.commons.logging/external ide/modules/ext commons-logging-1.1.1.jar
+$JAVADIR/commons-compress.jar libs.commons_compress/external ide/modules/ext commons-compress-1.8.1.jar
$JAVADIR/commons-net.jar libs.commons_net/external ide/modules/ext commons-net-3.3.jar
$JAVADIR/freemarker.jar libs.freemarker/external ide/modules/ext freemarker-2.3.19.jar
$JAVADIR/ini4j.jar libs.ini4j/external ide/modules/ext ini4j-0.5.1.jar
@@ -38,15 +41,15 @@ $JAVADIR/jzlib.jar c.jcraft.jzlib/external ide/modules/ext jzlib-1.0.7.jar
$JAVADIR/lucene3-core.jar libs.lucene/external ide/modules/ext lucene-core-3.5.0.jar
$JAVADIR/xml-resolver-1.2.jar o.apache.xml.resolver/external ide/modules/ext resolver-1.2.jar
$JAVADIR/servlet-api-3.1.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/svnClientAdapter.jar libs.svnClientAdapter.javahl/external ide/modules/ext svnClientAdapter-javahl-1.10.3.jar
-$JAVADIR/svn-javahl.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.10.r10446_v20150526_1454.jar
-$JAVADIR/svnClientAdapter.jar libs.svnClientAdapter.svnkit/external ide/modules/ext svnClientAdapter-svnkit-1.10.3.jar
+$JAVADIR/svnClientAdapter.jar libs.svnClientAdapter/external ide/modules/ext svnClientAdapter-main-1.10.12.jar
+$JAVADIR/svnClientAdapter.jar libs.svnClientAdapter.javahl/external ide/modules/ext svnClientAdapter-javahl-1.10.12.jar
+$JAVADIR/svn-javahl.jar libs.svnClientAdapter.javahl/external ide/modules/ext svnjavahl-1.9.3.jar
+$JAVADIR/svnkit-javahl16.jar libs.svnClientAdapter.svnkit/external ide/modules/ext org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar
+$JAVADIR/svnClientAdapter.jar libs.svnClientAdapter.svnkit/external ide/modules/ext svnClientAdapter-svnkit-1.10.12.jar
$JAVADIR/svnkit.jar libs.svnClientAdapter.svnkit/external ide/modules/ext svnkit.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.build219_t20150519_2322.jar
+$JAVADIR/trilead-ssh2.jar libs.svnClientAdapter.svnkit/external ide/modules/ext com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar
$JAVADIR/simple-validation.jar swing.validation/external ide/modules/ext ValidationAPI.jar
$JAVADIR/xercesImpl.jar libs.xerces/external ide/modules/ext xerces-2.8.0.jar
$JAVADIR/jaxp-1.4.jar libs.xerces/external ide/modules/ext jaxp-1.4.jar
@@ -58,7 +61,7 @@ $JAVADIR/org.eclipse.jgit.java7.jar o.eclipse.jgit.java7/external ide/modules/ex
$JAVADIR/org.eclipse.jgit.jar o.eclipse.jgit/external ide/modules/ext org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar
$JAVADIR/httpclient.jar o.apache.commons.httpclient/external ide/modules/ext commons-httpclient-3.1.jar
$JAVADIR/commons-io.jar o.apache.commons.io/external ide/modules/ext commons-io-1.4.jar
-$JAVADIR/commons-lang.jar o.apache.commons.lang/external ide/modules/ext commons-lang-2.4.jar
+$JAVADIR/commons-lang.jar o.apache.commons.lang/external ide/modules/ext commons-lang-2.6.jar
$JAVADIR/ws-commons-util.jar o.apache.ws.commons.util/external ide/modules/ext ws-commons-util-1.0.1.jar
$JAVADIR/jaxb-xjc.jar libs.jaxb/external ide/modules/ext/jaxb jaxb-xjc.jar
$JAVADIR/jaxb-impl.jar libs.jaxb/external ide/modules/ext/jaxb jaxb-impl.jar
@@ -68,7 +71,7 @@ $JAVADIR/com.ibm.icu-4.4.jar html.parser/external ide/modules/ext icu4j-4_4_2.ja
$JAVADIR/beansbinding.jar o.jdesktop.beansbinding/external java/modules/ext beansbinding-1.2.1.jar
$JAVADIR/org.eclipse.persistence.jpa.modelgen.processor.jar j2ee.eclipselinkmodelgen/external java/modules/ext/eclipselink org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar
-$JAVADIR/cglib3.jar libs.cglib/external java/modules/ext cglib-2.2.jar
+$JAVADIR/cglib.jar libs.cglib/external java/modules/ext cglib-2.2.jar
$JAVADIR/javac-api.jar libs.javacapi/external java/modules/ext nb-javac-api.jar
$JAVADIR/javac-impl.jar libs.javacimpl/external java/modules/ext nb-javac-impl.jar
$JAVADIR/eclipselink.jar j2ee.eclipselink/external java/modules/ext/eclipselink eclipselink.jar
diff --git a/debian/patches/antlr-3.5.2.patch b/debian/patches/antlr-3.5.2.patch
index e364c6d..a65e01a 100644
--- a/debian/patches/antlr-3.5.2.patch
+++ b/debian/patches/antlr-3.5.2.patch
@@ -1,16 +1,14 @@
From: Markus Koschany <apo at debian.org>
-Date: Fri, 25 Dec 2015 22:56:09 +0100
+Date: Wed, 7 Dec 2016 23:53:20 +0100
Subject: antlr 3.5.2
Fix a FTBFS with Debian's version of antlr.
-
-Forwarded: not-needed
---
css.lib/src/org/netbeans/modules/css/lib/NbParseTreeBuilder.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/css.lib/src/org/netbeans/modules/css/lib/NbParseTreeBuilder.java b/css.lib/src/org/netbeans/modules/css/lib/NbParseTreeBuilder.java
-index bbb50fa..965481e 100644
+index bbb50fa75..965481e78 100644
--- a/css.lib/src/org/netbeans/modules/css/lib/NbParseTreeBuilder.java
+++ b/css.lib/src/org/netbeans/modules/css/lib/NbParseTreeBuilder.java
@@ -226,7 +226,7 @@ public class NbParseTreeBuilder extends BlankDebugEventListener {
diff --git a/debian/patches/db.dataview-setRowFilter-method.patch b/debian/patches/db.dataview-setRowFilter-method.patch
index c970b6f..8659fc7 100644
--- a/debian/patches/db.dataview-setRowFilter-method.patch
+++ b/debian/patches/db.dataview-setRowFilter-method.patch
@@ -1,5 +1,5 @@
From: Markus Koschany <apo at debian.org>
-Date: Fri, 25 Dec 2015 23:20:55 +0100
+Date: Wed, 7 Dec 2016 23:53:42 +0100
Subject: db.dataview setRowFilter method
Fix for another compilation failure due to missing symbols.
@@ -12,10 +12,10 @@ Forwarded: not-needed
3 files changed, 12 deletions(-)
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewTableUI.java b/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewTableUI.java
-index e0d8a70..09fd256 100644
+index 55d6ced8c..8dd38a864 100644
--- a/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewTableUI.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewTableUI.java
-@@ -134,7 +134,6 @@ final class DataViewTableUI extends ResultSetJXTable {
+@@ -135,7 +135,6 @@ final class DataViewTableUI extends ResultSetJXTable {
}
super.setModel(dataModel);
dataModel.addTableModelListener(dataChangedListener); // Add new change listener
@@ -24,10 +24,10 @@ index e0d8a70..09fd256 100644
dataviewUI.handleColumnUpdated();
}
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewUI.java b/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewUI.java
-index b0eb987..5ce28c2 100644
+index efacaf8dc..e9f247ede 100644
--- a/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewUI.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewUI.java
-@@ -504,7 +504,6 @@ class DataViewUI extends JXPanel {
+@@ -436,7 +436,6 @@ class DataViewUI extends JXPanel {
{
MultiColPatternFilter filterP = new MultiColPatternFilter(rows);
filterP.setFilterStr(matchBoxField.getText(), LITERAL_FIND);
@@ -36,7 +36,7 @@ index b0eb987..5ce28c2 100644
}
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetJXTable.java b/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetJXTable.java
-index 88a9b3a..e1dd566 100644
+index 88a9b3aaf..e1dd566f3 100644
--- a/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetJXTable.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetJXTable.java
@@ -161,16 +161,6 @@ public class ResultSetJXTable extends JXTableDecorator {
diff --git a/debian/patches/javaewah-version.patch b/debian/patches/javaewah-version.patch
index da5855e..0fe1cc4 100644
--- a/debian/patches/javaewah-version.patch
+++ b/debian/patches/javaewah-version.patch
@@ -1,5 +1,5 @@
From: Markus Koschany <apo at debian.org>
-Date: Sat, 26 Dec 2015 19:27:27 +0100
+Date: Wed, 7 Dec 2016 23:54:18 +0100
Subject: javaewah version
Debian's javaewah package is currently outdated, so adjust the version
@@ -11,10 +11,10 @@ Forwarded: not-needed
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/o.eclipse.jgit/nbproject/project.xml b/o.eclipse.jgit/nbproject/project.xml
-index 897d09c..f31a978 100644
+index c07472421..382b4060c 100644
--- a/o.eclipse.jgit/nbproject/project.xml
+++ b/o.eclipse.jgit/nbproject/project.xml
-@@ -14,7 +14,7 @@
+@@ -53,7 +53,7 @@ Contributor(s):
<code-name-base>com.googlecode.javaewah.JavaEWAH</code-name-base>
<compile-dependency/>
<run-dependency>
diff --git a/debian/patches/netbeans-CommandLineParser.patch b/debian/patches/netbeans-CommandLineParser.patch
index d87054c..374b76f 100644
--- a/debian/patches/netbeans-CommandLineParser.patch
+++ b/debian/patches/netbeans-CommandLineParser.patch
@@ -1,5 +1,5 @@
From: Markus Koschany <apo at debian.org>
-Date: Sat, 26 Dec 2015 20:42:56 +0100
+Date: Thu, 8 Dec 2016 00:01:05 +0100
Subject: netbeans CommandLineParser
Work around FTBFS error: no suitable method found for addAll(List<CAP#1>
@@ -10,7 +10,7 @@ Forwarded: not-needed
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/customizer/vmo/gen/CommandLineParser.java b/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/customizer/vmo/gen/CommandLineParser.java
-index c3b9a82..5fa2145 100644
+index c3b9a8239..5fa2145b6 100644
--- a/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/customizer/vmo/gen/CommandLineParser.java
+++ b/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/customizer/vmo/gen/CommandLineParser.java
@@ -203,7 +203,7 @@ public class CommandLineParser extends Parser {
diff --git a/debian/patches/netbeans-build.patch b/debian/patches/netbeans-build.patch
index ddf0f17..2c2613d 100644
--- a/debian/patches/netbeans-build.patch
+++ b/debian/patches/netbeans-build.patch
@@ -1,5 +1,5 @@
From: Markus Koschany <apo at debian.org>
-Date: Wed, 10 Jun 2015 13:02:05 +0200
+Date: Wed, 7 Dec 2016 23:54:45 +0100
Subject: netbeans build
Fix FTBFS since we changed the build system in regard to build the windows
@@ -11,10 +11,10 @@ Forwarded: not-needed
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
-index 90c7a1a..e008f57 100644
+index d681a035f..14473cd1c 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
-@@ -145,7 +145,7 @@ made subject to such option by the copyright holder.
+@@ -150,7 +150,7 @@ made subject to such option by the copyright holder.
<target name="init-module-list" depends="bootstrap,init-tasks">
<!-- Define modules. -->
@@ -23,7 +23,7 @@ index 90c7a1a..e008f57 100644
<resolvelist name="allmodules" list="${nb.clusters.list}"/>
<pathconvert property="modules.fullpath" >
<path>
-@@ -314,8 +314,8 @@ made subject to such option by the copyright holder.
+@@ -319,8 +319,8 @@ made subject to such option by the copyright holder.
<mkdir dir="${netbeans.dest.dir}/bin" />
<copy file="../ide/launcher/unix/netbeans" todir="${netbeans.dest.dir}/bin" />
<chmod file="${netbeans.dest.dir}/bin/netbeans" perm="ugo+rx"/>
diff --git a/debian/patches/netbeans-cluster-properties.patch b/debian/patches/netbeans-cluster-properties.patch
index bea046c..2fb42a5 100644
--- a/debian/patches/netbeans-cluster-properties.patch
+++ b/debian/patches/netbeans-cluster-properties.patch
@@ -1,5 +1,5 @@
From: Markus Koschany <apo at debian.org>
-Date: Fri, 25 Dec 2015 18:39:51 +0100
+Date: Wed, 7 Dec 2016 23:59:34 +0100
Subject: netbeans cluster properties
Disable modules which are either not supported by us, depend on packages which
@@ -7,11 +7,11 @@ are not in Debian yet or cause other build failures.
Forwarded: not-needed
---
- nbbuild/cluster.properties | 104 ++-------------------------------------------
- 1 file changed, 3 insertions(+), 101 deletions(-)
+ nbbuild/cluster.properties | 106 ++-------------------------------------------
+ 1 file changed, 3 insertions(+), 103 deletions(-)
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
-index 4d3337a..a552b65 100644
+index 05d3f3d77..40bf23e65 100644
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
@@ -107,10 +107,8 @@ clusters.config.java.list=\
@@ -25,14 +25,23 @@ index 4d3337a..a552b65 100644
nb.cluster.nb
clusters.config.enterprise.list=\
-@@ -297,16 +295,11 @@ nb.cluster.ide=\
- api.knockout,\
+@@ -255,7 +253,6 @@ nb.cluster.platform=\
+ netbinox,\
+ o.jdesktop.layout,\
+ o.n.core,\
+- o.n.html.xhr4j,\
+ o.n.swing.outline,\
+ o.n.swing.plaf,\
+ o.n.swing.tabcontrol,\
+@@ -301,17 +298,12 @@ nb.cluster.ide=\
+ api.java.classpath,\
api.xml,\
api.xml.ui,\
- bugtracking,\
- bugtracking.bridge,\
- bugtracking.commons,\
- bugzilla,\
+ c.google.guava,\
c.googlecode.javaewah.JavaEWAH,\
c.jcraft.jsch,\
c.jcraft.jzlib,\
@@ -42,23 +51,16 @@ index 4d3337a..a552b65 100644
core.ide,\
core.multitabs.project,\
csl.api,\
-@@ -364,7 +357,6 @@ nb.cluster.ide=\
+@@ -374,7 +366,6 @@ nb.cluster.ide=\
extbrowser,\
extexecution,\
extexecution.base,\
- extexecution.impl,\
extexecution.process,\
+ extexecution.process.jdk9,\
git,\
- gototest,\
-@@ -372,15 +364,11 @@ nb.cluster.ide=\
- gsf.testrunner,\
- gsf.testrunner.ui,\
- html,\
-- html.angular,\
- html.custom,\
- html.editor,\
+@@ -388,8 +379,6 @@ nb.cluster.ide=\
html.editor.lib,\
-- html.knockout,\
html.lexer,\
html.parser,\
- html.validation,\
@@ -66,27 +68,10 @@ index 4d3337a..a552b65 100644
hudson,\
hudson.git,\
hudson.mercurial,\
-@@ -390,15 +378,6 @@ nb.cluster.ide=\
- ide.kit,\
- image,\
- javascript2.debug,\
-- javascript2.editor,\
-- javascript2.extjs,\
-- javascript2.jade,\
-- javascript2.jquery,\
-- javascript2.kit,\
-- javascript2.knockout,\
-- javascript2.nodejs,\
-- javascript2.prototypejs,\
-- javascript2.requirejs,\
- jellytools.ide,\
- jumpto,\
- languages,\
-@@ -419,17 +398,13 @@ nb.cluster.ide=\
- libs.json_simple,\
+@@ -422,16 +411,13 @@ nb.cluster.ide=\
+ libs.json_simple,\
libs.jvyamlb,\
libs.lucene,\
-- libs.nashorn,\
- libs.smack,\
libs.svnClientAdapter,\
libs.svnClientAdapter.javahl,\
@@ -100,7 +85,7 @@ index 4d3337a..a552b65 100644
notifications,\
o.apache.commons.codec,\
o.apache.commons.httpclient,\
-@@ -438,28 +413,8 @@ nb.cluster.ide=\
+@@ -440,29 +426,8 @@ nb.cluster.ide=\
o.apache.commons.logging,\
o.apache.ws.commons.util,\
o.apache.xml.resolver,\
@@ -125,11 +110,12 @@ index 4d3337a..a552b65 100644
- o.eclipse.mylyn.tasks.core,\
- o.eclipse.mylyn.wikitext.confluence.core,\
- o.eclipse.mylyn.wikitext.core,\
+- o.eclipse.mylyn.wikitext.markdown.core,\
- o.eclipse.mylyn.wikitext.textile.core,\
o.n.swing.dirchooser,\
o.openidex.util,\
options.editor,\
-@@ -491,11 +446,11 @@ nb.cluster.ide=\
+@@ -494,11 +459,11 @@ nb.cluster.ide=\
selenium2.server,\
server,\
servletapi,\
@@ -142,7 +128,7 @@ index 4d3337a..a552b65 100644
spellchecker.kit,\
spi.debugger.ui,\
spi.editor.hints,\
-@@ -554,7 +509,6 @@ nb.cluster.java.depends=\
+@@ -559,7 +524,6 @@ nb.cluster.java.depends=\
nb.cluster.ide,\
nb.cluster.extide,\
nb.cluster.platform,\
@@ -150,7 +136,7 @@ index 4d3337a..a552b65 100644
nb.cluster.harness
nb.cluster.java=\
ant.browsetask,\
-@@ -564,7 +518,6 @@ nb.cluster.java=\
+@@ -569,7 +533,6 @@ nb.cluster.java=\
ant.kit,\
api.debugger.jpda,\
api.java,\
@@ -158,7 +144,7 @@ index 4d3337a..a552b65 100644
beans,\
classfile,\
dbschema,\
-@@ -583,21 +536,15 @@ nb.cluster.java=\
+@@ -589,21 +552,15 @@ nb.cluster.java=\
form.kit,\
form.nb,\
form.refactoring,\
@@ -180,7 +166,7 @@ index 4d3337a..a552b65 100644
j2ee.persistenceapi,\
java.api.common,\
java.completion,\
-@@ -650,26 +597,6 @@ nb.cluster.java=\
+@@ -656,26 +613,6 @@ nb.cluster.java=\
libs.cglib,\
libs.javacapi,\
libs.javacimpl,\
@@ -207,7 +193,7 @@ index 4d3337a..a552b65 100644
nashorn.execution,\
o.jdesktop.beansbinding,\
performance,\
-@@ -678,18 +605,12 @@ nb.cluster.java=\
+@@ -684,18 +621,12 @@ nb.cluster.java=\
projectimport.eclipse.j2se,\
refactoring.java,\
selenium2.java,\
@@ -226,7 +212,7 @@ index 4d3337a..a552b65 100644
whitelist,\
xml.jaxb,\
xml.tools.java
-@@ -707,16 +628,12 @@ nb.cluster.apisupport.depends=\
+@@ -713,16 +644,12 @@ nb.cluster.apisupport.depends=\
nb.cluster.apisupport=\
apisupport.ant,\
apisupport.crudsample,\
@@ -244,7 +230,7 @@ index 4d3337a..a552b65 100644
nb.cluster.enterprise.dir=enterprise
nb.cluster.enterprise.depends=\
-@@ -730,7 +647,6 @@ nb.cluster.enterprise.depends=\
+@@ -736,7 +663,6 @@ nb.cluster.enterprise.depends=\
nb.cluster.harness
nb.cluster.enterprise=\
api.web.webmodule,\
@@ -252,7 +238,7 @@ index 4d3337a..a552b65 100644
cloud.amazon,\
cloud.common,\
el.lexer,\
-@@ -778,9 +694,6 @@ nb.cluster.enterprise=\
+@@ -784,9 +710,6 @@ nb.cluster.enterprise=\
libs.elimpl,\
libs.glassfish_logging,\
libs.jstl,\
@@ -262,7 +248,7 @@ index 4d3337a..a552b65 100644
performance.javaee,\
performance.scripting,\
performance.web,\
-@@ -858,7 +771,6 @@ nb.cluster.nb.depends=\
+@@ -863,7 +786,6 @@ nb.cluster.nb.depends=\
nb.cluster.harness
nb.cluster.nb=\
autoupdate.pluginimporter,\
@@ -270,7 +256,7 @@ index 4d3337a..a552b65 100644
deadlock.detector,\
ide.branding,\
ide.branding.kit,\
-@@ -888,7 +800,6 @@ nb.cluster.profiler=\
+@@ -893,7 +815,6 @@ nb.cluster.profiler=\
lib.profiler.charts,\
lib.profiler.common,\
lib.profiler.ui,\
@@ -278,7 +264,7 @@ index 4d3337a..a552b65 100644
profiler,\
profiler.api,\
profiler.attach,\
-@@ -972,9 +883,7 @@ nb.cluster.groovy=\
+@@ -978,9 +899,7 @@ nb.cluster.groovy=\
groovy.kit,\
groovy.refactoring,\
groovy.samples,\
@@ -289,15 +275,15 @@ index 4d3337a..a552b65 100644
nb.cluster.mobility.dir=mobility
nb.cluster.mobility.depends=\
-@@ -1068,7 +977,6 @@ nb.cluster.cnd=\
- cnd.toolchain,\
+@@ -1080,7 +999,6 @@ nb.cluster.cnd=\
cnd.utils,\
+ cnd.utils.ui,\
jellytools.cnd,\
- libs.clank
validation.nb.cluster.cnd=\
cnd.kit
-@@ -1121,8 +1029,6 @@ nb.cluster.jira=\
+@@ -1133,8 +1051,6 @@ nb.cluster.jira=\
o.apache.axis,\
o.apache.commons.discovery,\
o.codehaus.jettison,\
@@ -306,7 +292,7 @@ index 4d3337a..a552b65 100644
o.joda.time
nb.cluster.team.dir=extra
-@@ -1131,7 +1037,6 @@ nb.cluster.team.depends=\
+@@ -1143,7 +1059,6 @@ nb.cluster.team.depends=\
nb.cluster.platform,\
nb.cluster.ide
nb.cluster.team=\
@@ -314,7 +300,7 @@ index 4d3337a..a552b65 100644
c.tasktop.c2c.server.cloud.api,\
c.tasktop.c2c.server.common.api,\
c.tasktop.c2c.server.profile.api,\
-@@ -1140,7 +1045,6 @@ nb.cluster.team=\
+@@ -1152,7 +1067,6 @@ nb.cluster.team=\
c.tasktop.c2c.server.wiki.api,\
kenai,\
kenai.kit,\
@@ -322,7 +308,7 @@ index 4d3337a..a552b65 100644
kenai.ui,\
lib.cvsclient,\
o.codehaus.jackson.core,\
-@@ -1194,7 +1098,6 @@ nb.cluster.stableuc=\
+@@ -1230,7 +1144,6 @@ nb.cluster.stableuc=\
libs.oracle.cloud,\
libs.ppawtlayout,\
loadgenerator,\
@@ -330,7 +316,7 @@ index 4d3337a..a552b65 100644
mobility.antext,\
mobility.cldcplatform.catalog,\
mobility.deployment.ftpscp,\
-@@ -1267,7 +1170,6 @@ nb.cluster.betauc=\
+@@ -1303,7 +1216,6 @@ nb.cluster.betauc=\
contrib/modulemanager,\
contrib/quickfilechooser,\
contrib/selenium,\
@@ -338,3 +324,42 @@ index 4d3337a..a552b65 100644
contrib/selenium.php,\
contrib/selenium.server,\
o.apache.jmeter.module,\
+@@ -1447,8 +1359,6 @@ nb.cluster.webcommon=\
+ cordova.platforms.android,\
+ cordova.platforms.ios,\
+ extbrowser.chrome,\
+- html.angular,\
+- html.knockout,\
+ html.ojet,\
+ javascript.bower,\
+ javascript.cdnjs,\
+@@ -1460,21 +1370,12 @@ nb.cluster.webcommon=\
+ javascript.v8debug,\
+ javascript.v8debug.ui,\
+ javascript2.doc,\
+- javascript2.editor,\
+ javascript2.extdoc,\
+- javascript2.extjs,\
+- javascript2.jade,\
+- javascript2.jquery,\
+ javascript2.jsdoc,\
+ javascript2.json,\
+- javascript2.kit,\
+- javascript2.knockout,\
+ javascript2.lexer,\
+ javascript2.model,\
+- javascript2.nodejs,\
+- javascript2.prototypejs,\
+ javascript2.react,\
+- javascript2.requirejs,\
+ javascript2.sdoc,\
+ javascript2.source.query,\
+ javascript2.types,\
+@@ -1482,7 +1383,6 @@ nb.cluster.webcommon=\
+ languages.ini,\
+ lib.v8debug,\
+ libs.jstestdriver,\
+- libs.nashorn,\
+ libs.plist,\
+ netserver,\
+ selenium2.webclient,\
diff --git a/debian/patches/netbeans-com.sun.tools.hc.patch b/debian/patches/netbeans-com.sun.tools.hc.patch
index 7650c81..a59ab0f 100644
--- a/debian/patches/netbeans-com.sun.tools.hc.patch
+++ b/debian/patches/netbeans-com.sun.tools.hc.patch
@@ -1,19 +1,19 @@
From: Markus Koschany <apo at debian.org>
-Date: Sat, 26 Dec 2015 20:07:41 +0100
-Subject: netbeans com.sun.tools.hc
+Date: Thu, 8 Dec 2016 00:02:13 +0100
+Subject: netbeans-com.sun.tools.hc
-Fix a compilation error due to missing package com.sun.tools.hc
+Another FTBFS due to an unavailable class
-Forwarded: http://hg.netbeans.org/main-silver/diff/e332ef83926a/java.source.base/src/org/netbeans/modules/java/source/parsing/CachingArchiveClassLoader.java
+Forwarded: not-needed
---
.../modules/java/source/parsing/CachingArchiveClassLoader.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/java.source.base/src/org/netbeans/modules/java/source/parsing/CachingArchiveClassLoader.java b/java.source.base/src/org/netbeans/modules/java/source/parsing/CachingArchiveClassLoader.java
-index a4b8abc..d4df87c 100644
+index e45436d49..50e8d1455 100644
--- a/java.source.base/src/org/netbeans/modules/java/source/parsing/CachingArchiveClassLoader.java
+++ b/java.source.base/src/org/netbeans/modules/java/source/parsing/CachingArchiveClassLoader.java
-@@ -106,7 +106,8 @@ public final class CachingArchiveClassLoader extends ClassLoader {
+@@ -114,7 +114,8 @@ public final class CachingArchiveClassLoader extends ClassLoader {
}
return defineClass(
name,
diff --git a/debian/patches/netbeans-commons-net.patch b/debian/patches/netbeans-commons-net.patch
index f97ea80..ddd3d09 100644
--- a/debian/patches/netbeans-commons-net.patch
+++ b/debian/patches/netbeans-commons-net.patch
@@ -1,5 +1,5 @@
From: Markus Koschany <apo at debian.org>
-Date: Tue, 9 Jun 2015 13:52:39 +0200
+Date: Thu, 8 Dec 2016 00:01:37 +0100
Subject: netbeans commons net
Workaround for missing class org.apache.commons.net.util.Base64 in
@@ -11,7 +11,7 @@ Forwarded: not-needed
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/hudson.ui/src/org/netbeans/modules/hudson/ui/APITokenConnectionAuthenticator.java b/hudson.ui/src/org/netbeans/modules/hudson/ui/APITokenConnectionAuthenticator.java
-index b02755d..b3f8d8b 100644
+index b02755d1a..b3f8d8b7a 100644
--- a/hudson.ui/src/org/netbeans/modules/hudson/ui/APITokenConnectionAuthenticator.java
+++ b/hudson.ui/src/org/netbeans/modules/hudson/ui/APITokenConnectionAuthenticator.java
@@ -47,7 +47,6 @@ import java.util.Map;
diff --git a/debian/patches/netbeans-dlight.nativeexecution.patch b/debian/patches/netbeans-dlight.nativeexecution.patch
index 7195942..a99f5bc 100644
--- a/debian/patches/netbeans-dlight.nativeexecution.patch
+++ b/debian/patches/netbeans-dlight.nativeexecution.patch
@@ -1,6 +1,6 @@
From: Markus Koschany <apo at debian.org>
-Date: Sat, 26 Dec 2015 00:00:02 +0100
-Subject: netbeans dlight.nativeexecution
+Date: Thu, 8 Dec 2016 00:02:35 +0100
+Subject: netbeans-dlight.nativeexecution
Fix another FTBFS since we don't build the nativeexecution module.
@@ -10,10 +10,10 @@ Forwarded: not-needed
1 file changed, 77 deletions(-)
diff --git a/dlight.nativeexecution/nbproject/project.properties b/dlight.nativeexecution/nbproject/project.properties
-index 33908a3..12ea4cf 100644
+index e7872f8a3..bfd99d4c7 100644
--- a/dlight.nativeexecution/nbproject/project.properties
+++ b/dlight.nativeexecution/nbproject/project.properties
-@@ -24,80 +24,3 @@ test.config.stableBTD.excludes=\
+@@ -61,80 +61,3 @@ test.config.stableBTD.excludes=\
**/TerminalConfigurationProviderTest.class,\
**/WindowsSupportTest.class
diff --git a/debian/patches/netbeans-empty-binaries-list.patch b/debian/patches/netbeans-empty-binaries-list.patch
index edec358..7da023d 100644
--- a/debian/patches/netbeans-empty-binaries-list.patch
+++ b/debian/patches/netbeans-empty-binaries-list.patch
@@ -1,18 +1,18 @@
From: Markus Koschany <apo at debian.org>
-Date: Tue, 15 Dec 2015 01:08:12 +0100
+Date: Wed, 7 Dec 2016 23:52:44 +0100
Subject: netbeans empty binaries list
Empty all the binaries-list files so nothing gets downloaded.
Forwarded: not-needed
---
apisupport.feedreader/external/binaries-list | 3 ---
- apisupport.harness/external/binaries-list | 4 ----
+ c.google.guava/external/binaries-list | 1 -
c.googlecode.javaewah.JavaEWAH/external/binaries-list | 1 -
c.jcraft.jsch/external/binaries-list | 1 -
c.jcraft.jzlib/external/binaries-list | 1 -
cnd.discovery/external/binaries-list | 1 -
cnd.modelimpl/external/binaries-list | 1 -
- cnd.remote/external/binaries-list | 1 -
+ cnd.remote/external/binaries-list | 7 -------
cordova.platforms.ios/external/binaries-list | 5 -----
css.editor/external/binaries-list | 2 --
db.drivers/external/binaries-list | 3 ---
@@ -20,12 +20,13 @@ Forwarded: not-needed
db/external/binaries-list | 2 --
derby/external/binaries-list | 2 --
dlight.nativeexecution/external/binaries-list | 2 --
- dlight.remote.impl/external/binaries-list | 6 ------
+ dlight.remote.impl/external/binaries-list | 5 -----
extexecution.process/external/binaries-list | 3 ---
hibernate4lib/external/binaries-list | 1 -
html.editor/external/binaries-list | 1 -
+ html.ojet/external/binaries-list | 3 ---
html.parser/external/binaries-list | 3 ---
- html.validation/external/binaries-list | 9 ---------
+ html.validation/external/binaries-list | 6 ------
httpserver/external/binaries-list | 1 -
j2ee.dd/external/binaries-list | 1 -
j2ee.eclipselink/external/binaries-list | 4 ----
@@ -37,22 +38,17 @@ Forwarded: not-needed
javacard.ri.platform/external/binaries-list | 1 -
javaee.api/external/binaries-list | 5 -----
javaee7.api/external/binaries-list | 7 -------
- javahelp/external/binaries-list | 1 -
javascript2.editor/external/binaries-list | 3 ---
- jemmy/external/binaries-list | 3 ---
- junitlib/external/binaries-list | 2 --
libs.amazon/external/binaries-list | 5 -----
- libs.antlr3.devel/external/binaries-list | 1 -
libs.antlr3.runtime/external/binaries-list | 1 -
- libs.asm/external/binaries-list | 1 -
+ libs.antlr4.runtime/external/binaries-list | 1 -
libs.bytelist/external/binaries-list | 1 -
libs.cglib/external/binaries-list | 1 -
- libs.clank/external/binaries-list | 6 ------
+ libs.clank/external/binaries-list | 9 ---------
libs.commons_compress/external/binaries-list | 1 -
libs.commons_fileupload/external/binaries-list | 1 -
libs.commons_net/external/binaries-list | 1 -
libs.elimpl/external/binaries-list | 1 -
- libs.felix/external/binaries-list | 1 -
libs.freemarker/external/binaries-list | 1 -
libs.glassfish_logging/external/binaries-list | 1 -
libs.groovy/external/binaries-list | 1 -
@@ -60,19 +56,14 @@ Forwarded: not-needed
libs.javacapi/external/binaries-list | 1 -
libs.javacimpl/external/binaries-list | 1 -
libs.javacup/external/binaries-list | 1 -
- libs.javafx/external/binaries-list | 1 -
libs.jaxb/external/binaries-list | 4 ----
- libs.jna.platform/external/binaries-list | 1 -
- libs.jna/external/binaries-list | 1 -
libs.jsch.agentproxy/external/binaries-list | 4 ----
libs.json_simple/external/binaries-list | 1 -
libs.jstestdriver/external/binaries-list | 1 -
libs.jstl/external/binaries-list | 2 --
- libs.junit4/external/binaries-list | 2 --
libs.jvyamlb/external/binaries-list | 1 -
libs.lucene/external/binaries-list | 1 -
- libs.nashorn/external/binaries-list | 2 --
- libs.osgi/external/binaries-list | 2 --
+ libs.nashorn/external/binaries-list | 1 -
libs.plist/external/binaries-list | 1 -
libs.smack/external/binaries-list | 2 --
libs.springframework/external/binaries-list | 2 --
@@ -80,20 +71,10 @@ Forwarded: not-needed
libs.svnClientAdapter.svnkit/external/binaries-list | 4 ----
libs.svnClientAdapter/external/binaries-list | 1 -
libs.swingx/external/binaries-list | 1 -
- libs.testng/external/binaries-list | 2 --
libs.xerces/external/binaries-list | 1 -
- maven.embedder/external/binaries-list | 4 ----
+ maven.embedder/external/binaries-list | 7 -------
maven.indexer/external/binaries-list | 4 ----
maven/external/binaries-list | 2 --
- nbbuild/external/binaries-list | 2 --
- net.java.html.boot.fx/external/binaries-list | 1 -
- net.java.html.boot.script/external/binaries-list | 1 -
- net.java.html.boot/external/binaries-list | 1 -
- net.java.html.geo/external/binaries-list | 1 -
- net.java.html.json/external/binaries-list | 1 -
- net.java.html.sound/external/binaries-list | 1 -
- net.java.html/external/binaries-list | 1 -
- netbinox/external/binaries-list | 2 --
o.apache.commons.codec/external/binaries-list | 1 -
o.apache.commons.httpclient/external/binaries-list | 1 -
o.apache.commons.io/external/binaries-list | 1 -
@@ -123,10 +104,10 @@ Forwarded: not-needed
o.eclipse.mylyn.tasks.core/external/binaries-list | 1 -
o.eclipse.mylyn.wikitext.confluence.core/external/binaries-list | 1 -
o.eclipse.mylyn.wikitext.core/external/binaries-list | 1 -
+ o.eclipse.mylyn.wikitext.markdown.core/external/binaries-list | 1 -
o.eclipse.mylyn.wikitext.textile.core/external/binaries-list | 1 -
o.jdesktop.beansbinding/external/binaries-list | 2 --
- o.jdesktop.layout/external/binaries-list | 3 ---
- o.n.html.ko4j/external/binaries-list | 1 -
+ performance/external/binaries-list | 1 -
php.editor/external/binaries-list | 1 -
php.phpdoc.documentation/external/binaries-list | 1 -
php.project/external/binaries-list | 1 -
@@ -147,77 +128,81 @@ Forwarded: not-needed
websvc.metro.lib/external/binaries-list | 2 --
websvc.restlib/external/binaries-list | 1 -
xml.jaxb.api/external/binaries-list | 3 ---
- 142 files changed, 240 deletions(-)
+ 123 files changed, 217 deletions(-)
diff --git a/apisupport.feedreader/external/binaries-list b/apisupport.feedreader/external/binaries-list
-index 2ba5c4d..e69de29 100644
+index 2ba5c4dbd..e69de29bb 100644
--- a/apisupport.feedreader/external/binaries-list
+++ b/apisupport.feedreader/external/binaries-list
@@ -1,3 +0,0 @@
-A2AC1CD690AB4C80DEFE7F9BCE14D35934C35CEC jdom-1.0.jar
-EA66BB8EBA805BAD567DB5A6730F96AC89062601 rome-0.6.jar
-7408D747109A701926646E859C8907D3A7C9B26E rome-fetcher-0.6.jar
-diff --git a/apisupport.harness/external/binaries-list b/apisupport.harness/external/binaries-list
-index fb7dd1e..e69de29 100644
---- a/apisupport.harness/external/binaries-list
-+++ b/apisupport.harness/external/binaries-list
-@@ -1,4 +0,0 @@
--D4EF66C1CC8A5B3C97E0CC7C210227AAEC1F1086 jsearch-2.0_05.jar
--A806D99716C5E9441BFD8B401176FDDEFC673022 bindex-2.2.jar
--20D826CC819A5A969CF3F7204E2E26CB6263EC43 jnlp-servlet.jar
--
+diff --git a/c.google.guava/external/binaries-list b/c.google.guava/external/binaries-list
+index b140c0b60..e69de29bb 100644
+--- a/c.google.guava/external/binaries-list
++++ b/c.google.guava/external/binaries-list
+@@ -1 +0,0 @@
+-ED727A8D9F247E2050281CB083F1C77B09DCB5CD guava-15.0.jar
+\ No newline at end of file
diff --git a/c.googlecode.javaewah.JavaEWAH/external/binaries-list b/c.googlecode.javaewah.JavaEWAH/external/binaries-list
-index 0a93fdd..e69de29 100644
+index 0a93fdd1f..e69de29bb 100644
--- a/c.googlecode.javaewah.JavaEWAH/external/binaries-list
+++ b/c.googlecode.javaewah.JavaEWAH/external/binaries-list
@@ -1 +0,0 @@
-ECEAF316A8FAF0E794296EBE158AE110C7D72A5A JavaEWAH-0.7.9.jar
\ No newline at end of file
diff --git a/c.jcraft.jsch/external/binaries-list b/c.jcraft.jsch/external/binaries-list
-index 8f19c44..e69de29 100644
+index 8f19c4450..e69de29bb 100644
--- a/c.jcraft.jsch/external/binaries-list
+++ b/c.jcraft.jsch/external/binaries-list
@@ -1 +0,0 @@
-28B183F2DB44DE2CA82F324EA996593DC6931B12 jsch-0.1.53.jar
\ No newline at end of file
diff --git a/c.jcraft.jzlib/external/binaries-list b/c.jcraft.jzlib/external/binaries-list
-index 4702320..e69de29 100644
+index 4702320aa..e69de29bb 100644
--- a/c.jcraft.jzlib/external/binaries-list
+++ b/c.jcraft.jzlib/external/binaries-list
@@ -1 +0,0 @@
-F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB jzlib-1.0.7.jar
diff --git a/cnd.discovery/external/binaries-list b/cnd.discovery/external/binaries-list
-index d2c8c3a..e69de29 100644
+index 13113e901..e69de29bb 100644
--- a/cnd.discovery/external/binaries-list
+++ b/cnd.discovery/external/binaries-list
@@ -1 +0,0 @@
--BF2C234985CF9BD6CDE18114406C67EC7C32B84A cnd-build-trace-1.0.zip
+-43A82EB3CE61B9B0B1C60586C7D84729BD5BE3E0 cnd-build-trace-1.0.zip
\ No newline at end of file
diff --git a/cnd.modelimpl/external/binaries-list b/cnd.modelimpl/external/binaries-list
-index cc2a892..e69de29 100644
+index cc2a892f1..e69de29bb 100644
--- a/cnd.modelimpl/external/binaries-list
+++ b/cnd.modelimpl/external/binaries-list
@@ -1 +0,0 @@
-C51780D99464CBF45B0495C7646B442AB3C7B463 open-fortran-parser-0.7.1.2.zip
\ No newline at end of file
diff --git a/cnd.remote/external/binaries-list b/cnd.remote/external/binaries-list
-index fbbe9d5..e69de29 100644
+index b28810f51..e69de29bb 100644
--- a/cnd.remote/external/binaries-list
+++ b/cnd.remote/external/binaries-list
-@@ -1 +0,0 @@
--BB83D4F8047D608858154CB041054F5CAE35B903 cnd-rfs-1.0.zip
+@@ -1,7 +0,0 @@
+-#changeset: 305509:b3676044604d
+-#branch: release81
+-#tag: tip
+-#user: Vladimir Kvashin <vkvashin at netbeans.org>
+-#date: Thu Jan 14 22:18:02 2016 +0300
+-#summary: fixed remaining issues in #256919 - fix issues discovered in rfs_controller and rfs_preload:
+-E59851B0E49C05D728D5C653E52750FA5B6A8F0E cnd-rfs-1.0.zip
diff --git a/cordova.platforms.ios/external/binaries-list b/cordova.platforms.ios/external/binaries-list
-index fd5af85..e69de29 100644
+index 183c5c3d3..e69de29bb 100644
--- a/cordova.platforms.ios/external/binaries-list
+++ b/cordova.platforms.ios/external/binaries-list
@@ -1,5 +0,0 @@
-7C4A82593A85524A3541E55A4A9C906B773ABAD6 ios-sim
--9D29F2A9722C91A403F32971E97DD0E49E97B02E libiDeviceNativeBinding.dylib
+-0929AC5F40B5A8667021408748D64F30F77B3165 libiDeviceNativeBinding.dylib
-480C9E376169E21EA3BDA5D5841425BD7CC054D7 libplist.1.dylib
--D05B7274396C8EED185207399B6D0400DE347DB7 libusbmuxd.2.dylib
--9F0D0D95F57E73C0110FA023813A4F9756D543B1 libimobiledevice.4.dylib
+-C1BB9FF4232248B0054E5A26A33474A251EA19CB libusbmuxd.2.dylib
+-2A38DA3DB5D36DBBDC0B03990B46810F72430D5E libimobiledevice.4.dylib
diff --git a/css.editor/external/binaries-list b/css.editor/external/binaries-list
-index 7776400..e69de29 100644
+index 77764003d..e69de29bb 100644
--- a/css.editor/external/binaries-list
+++ b/css.editor/external/binaries-list
@@ -1,2 +0,0 @@
@@ -225,74 +210,81 @@ index 7776400..e69de29 100644
-83E794DFF9A39401AC65252C8E10157761584224 css3-spec.zip
\ No newline at end of file
diff --git a/db.drivers/external/binaries-list b/db.drivers/external/binaries-list
-index d69f4f6..e69de29 100644
+index 93f5443de..e69de29bb 100644
--- a/db.drivers/external/binaries-list
+++ b/db.drivers/external/binaries-list
@@ -1,3 +0,0 @@
-C264E2114579474D13DD808A510FC74E762DDA8C mysql-connector-java-5.1.23-bin.jar
--65B528162F7CF20B4D44BC31A446724E217BA35B postgresql-9.2-1002.jdbc4.jar
+-7F25826357976ED495184938B6A464ACDF0EA3F8 postgresql-9.4.1209.jar
-
diff --git a/db.sql.visualeditor/external/binaries-list b/db.sql.visualeditor/external/binaries-list
-index e4b97c1..e69de29 100644
+index e4b97c156..e69de29bb 100644
--- a/db.sql.visualeditor/external/binaries-list
+++ b/db.sql.visualeditor/external/binaries-list
@@ -1 +0,0 @@
-EE416CB5D6AA88473EFE487F42DC1410360F7948 javacc-3.2.jar
diff --git a/db/external/binaries-list b/db/external/binaries-list
-index 79aa981..e69de29 100644
+index 79aa9813e..e69de29bb 100644
--- a/db/external/binaries-list
+++ b/db/external/binaries-list
@@ -1,2 +0,0 @@
-F787C9B484CD7526F866C21D8925C4DACE467F8A derby-10.2.2.0.jar
-97771BE04E7452FC197EB875D2591A7E91F274D0 derby-10.2.2.0.zip
diff --git a/derby/external/binaries-list b/derby/external/binaries-list
-index 9ecddbe..e69de29 100644
+index 9ecddbeea..e69de29bb 100644
--- a/derby/external/binaries-list
+++ b/derby/external/binaries-list
@@ -1,2 +0,0 @@
-C9A6304FAA121C97CB2458B93D30B1FD6F0F7691 derbysampledb.zip
-
diff --git a/dlight.nativeexecution/external/binaries-list b/dlight.nativeexecution/external/binaries-list
-index 2abd5ce..e69de29 100644
+index 2abd5ceb5..e69de29bb 100644
--- a/dlight.nativeexecution/external/binaries-list
+++ b/dlight.nativeexecution/external/binaries-list
@@ -1,2 +0,0 @@
-3502EB7D4A72C2C684D23AFC241CCF50797079D1 exechlp-1.0.zip
-
diff --git a/dlight.remote.impl/external/binaries-list b/dlight.remote.impl/external/binaries-list
-index 875f788..e69de29 100644
+index 52817a521..e69de29bb 100644
--- a/dlight.remote.impl/external/binaries-list
+++ b/dlight.remote.impl/external/binaries-list
-@@ -1,6 +0,0 @@
--#source change:
--#changeset: 292853:94e815a553de
+@@ -1,5 +0,0 @@
+-#changeset: 300533:4cd06f905ed3
-#user: Vladimir Kvashin <vkvashin at netbeans.org>
--#date: Fri Oct 09 23:32:45 2015 +0300
--#summary: addfix (increment fs_server version) #255826 - Open Remote File/Project Dialog is empty in certain cases
--51AC4960C19CF4C2CCA636765BFBC09A5029BFC5 fs_server-1.0.zip
+-#date: Mon Sep 12 20:14:52 2016 +0300
+-#summary: better error processing, sources (fixing #267975 - NullPointerException at org.netbeans.modules.subversion.remote.RepositoryFile.<init>)
+-18E39A0D10357B72EDB76F2070E27019317792F1 fs_server-1.0.zip
diff --git a/extexecution.process/external/binaries-list b/extexecution.process/external/binaries-list
-index 33dd192..e69de29 100644
+index f04d00658..e69de29bb 100644
--- a/extexecution.process/external/binaries-list
+++ b/extexecution.process/external/binaries-list
@@ -1,3 +0,0 @@
-C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505 winp-1.14-patched.jar
-2E07375E5CA3A452472F0E87FB33F243F7A5C08C libpam4j-1.1.jar
--E90EF50215FFD23928B3308DC76A17B7DADE5F33 processtreekiller-1.0.5.jar
+-6819C79348FCF4F5125C834E7D3B742582DCA34D processtreekiller-1.0.7.jar
diff --git a/hibernate4lib/external/binaries-list b/hibernate4lib/external/binaries-list
-index f4a4067..e69de29 100644
+index f4a40677c..e69de29bb 100644
--- a/hibernate4lib/external/binaries-list
+++ b/hibernate4lib/external/binaries-list
@@ -1 +0,0 @@
-A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA hibernate-release-4.3.1-lib.zip
\ No newline at end of file
diff --git a/html.editor/external/binaries-list b/html.editor/external/binaries-list
-index a600ee9..e69de29 100644
+index a600ee94e..e69de29bb 100644
--- a/html.editor/external/binaries-list
+++ b/html.editor/external/binaries-list
@@ -1 +0,0 @@
-23123BB29025254556B6E573023FCDF0F6715A66 html-4.01.zip
+diff --git a/html.ojet/external/binaries-list b/html.ojet/external/binaries-list
+index b7947d1a3..e69de29bb 100644
+--- a/html.ojet/external/binaries-list
++++ b/html.ojet/external/binaries-list
+@@ -1,3 +0,0 @@
+-D4BD3F62EADB61216A47EF96B3152EDD35A56005 ojetdocs-1_0_0.zip
+-1EFED55F8C442E4DB1C2338A5C35D494364F9ECD ojetdocs-1_1_2.zip
+-CA8F6968FED0BE20E786C70CF9B603F4D7B66C68 ojetdocs-2_0_0.zip
diff --git a/html.parser/external/binaries-list b/html.parser/external/binaries-list
-index b4d8ead..e69de29 100644
+index b4d8ead1f..e69de29bb 100644
--- a/html.parser/external/binaries-list
+++ b/html.parser/external/binaries-list
@@ -1,3 +0,0 @@
@@ -300,33 +292,30 @@ index b4d8ead..e69de29 100644
-2541D025F428A361110C4D656CDD99B5C5C5DFCE html5doc.zip
-F6C205D05BE87DF2A64FB501E08AC9ED38519353 icu4j-4_4_2.jar
diff --git a/html.validation/external/binaries-list b/html.validation/external/binaries-list
-index 3bd81de..e69de29 100644
+index c877c9db3..e69de29bb 100644
--- a/html.validation/external/binaries-list
+++ b/html.validation/external/binaries-list
-@@ -1,9 +0,0 @@
--F4A1696661E6233F8C27EE323CAEF9CB052666F1 html5-datatypes.jar
--A2862B7795EF0E0F0716BEC84528FA3B629E479C io-xml-util.jar
+@@ -1,6 +0,0 @@
-0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0 iri.jar
-483A61B688B13C62BB201A683D98A6688B5373B6 jing.jar
-F0A0D2E29ED910808C33135A3A5A51BBA6358F7B log4j-1.2.15.jar
--010FC8BD229B7F68C8C4D5BDE399475373096601 non-schema.jar
--6FC6098C230D7CBA5730106D379CBBB42F6EC48A validator.jar
+-15ACB06E2E3A70FC188782BA51369CA81ACFE860 validator.jar
-85A67D883A879E7BF767758A8413B690DEF29735 saxon9B.jar
-FACC6D84B0B0A650B1D44FED941E9ADD9F326862 isorelax.jar
diff --git a/httpserver/external/binaries-list b/httpserver/external/binaries-list
-index c9ddf06..e69de29 100644
+index c9ddf06c4..e69de29bb 100644
--- a/httpserver/external/binaries-list
+++ b/httpserver/external/binaries-list
@@ -1 +0,0 @@
-CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7 tomcat-webserver-3.2.jar
diff --git a/j2ee.dd/external/binaries-list b/j2ee.dd/external/binaries-list
-index 7af9f73..e69de29 100644
+index 7af9f738a..e69de29bb 100644
--- a/j2ee.dd/external/binaries-list
+++ b/j2ee.dd/external/binaries-list
@@ -1 +0,0 @@
-D2F2B34B7D0A13256D491B14590ED23CA0E49B46 javaee-api-5.jar
diff --git a/j2ee.eclipselink/external/binaries-list b/j2ee.eclipselink/external/binaries-list
-index 274a71e..e69de29 100644
+index 274a71e15..e69de29bb 100644
--- a/j2ee.eclipselink/external/binaries-list
+++ b/j2ee.eclipselink/external/binaries-list
@@ -1,4 +0,0 @@
@@ -335,44 +324,44 @@ index 274a71e..e69de29 100644
-29AF1D338CBB76290D1A96F5A6610F1E8C319AE5 org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
-A8BD39C5B88571B4D4697E78DD1A56566E44B1DD JPAjavadocs04032013.zip
diff --git a/j2ee.eclipselinkmodelgen/external/binaries-list b/j2ee.eclipselinkmodelgen/external/binaries-list
-index 042b33b..e69de29 100644
+index 042b33b6c..e69de29bb 100644
--- a/j2ee.eclipselinkmodelgen/external/binaries-list
+++ b/j2ee.eclipselinkmodelgen/external/binaries-list
@@ -1,2 +0,0 @@
-3CE04BDB48FE315736B1DCE407362C57DFAE286D org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar
-
diff --git a/j2ee.platform/external/binaries-list b/j2ee.platform/external/binaries-list
-index 1a843ca..e69de29 100644
+index 1a843ca78..e69de29bb 100644
--- a/j2ee.platform/external/binaries-list
+++ b/j2ee.platform/external/binaries-list
@@ -1 +0,0 @@
-27E9711AA35C39EF455BFD900D544BACB99C0E89 javaee-doc-api.jar
diff --git a/j2eeapis/external/binaries-list b/j2eeapis/external/binaries-list
-index 8f48f90..e69de29 100644
+index 8f48f9036..e69de29bb 100644
--- a/j2eeapis/external/binaries-list
+++ b/j2eeapis/external/binaries-list
@@ -1 +0,0 @@
-EC24BF46E047E735ED802DFA8B9FCA2ED8FB11B0 jsr88javax.jar
diff --git a/javacard.apdu.io/external/binaries-list b/javacard.apdu.io/external/binaries-list
-index c767da3..e69de29 100644
+index c767da377..e69de29bb 100644
--- a/javacard.apdu.io/external/binaries-list
+++ b/javacard.apdu.io/external/binaries-list
@@ -1 +0,0 @@
-9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF apduio.jar
diff --git a/javacard.ri.bundle/external/binaries-list b/javacard.ri.bundle/external/binaries-list
-index e49fa6f..e69de29 100644
+index e49fa6f49..e69de29bb 100644
--- a/javacard.ri.bundle/external/binaries-list
+++ b/javacard.ri.bundle/external/binaries-list
@@ -1 +0,0 @@
-6243337E93F5841D4FFB404011AA076BFEB1590A javacard_ri.zip
diff --git a/javacard.ri.platform/external/binaries-list b/javacard.ri.platform/external/binaries-list
-index 5e56afd..e69de29 100644
+index 5e56afdb7..e69de29bb 100644
--- a/javacard.ri.platform/external/binaries-list
+++ b/javacard.ri.platform/external/binaries-list
@@ -1 +0,0 @@
-33DCFAE258453BDD3D8A042F6ECF80656A82B8DD anttasks.jar
diff --git a/javaee.api/external/binaries-list b/javaee.api/external/binaries-list
-index 55d5314..e69de29 100644
+index 55d53149f..e69de29bb 100644
--- a/javaee.api/external/binaries-list
+++ b/javaee.api/external/binaries-list
@@ -1,5 +0,0 @@
@@ -382,7 +371,7 @@ index 55d5314..e69de29 100644
-EB77D3664EEA27D67B799ED28CB766B4D0971505 jaxb-api-osgi.jar
-A5744971ACE1F44A0FC71CCB93DE530CB3022965 webservices-api-osgi.jar
diff --git a/javaee7.api/external/binaries-list b/javaee7.api/external/binaries-list
-index 4391715..e69de29 100644
+index 439171538..e69de29bb 100644
--- a/javaee7.api/external/binaries-list
+++ b/javaee7.api/external/binaries-list
@@ -1,7 +0,0 @@
@@ -393,38 +382,16 @@ index 4391715..e69de29 100644
-45EBA8B0520A70787D5DD2EA154ACE152F817C0D jaxb-api-osgi.jar
-D4C96D968F87B1BFEF138E91E06C8FD4A1904208 jaxws-api.jar
-401CC1D0E5F0D8F4D0532A54928CEAA27EC21258 jsr181-api.jar
-diff --git a/javahelp/external/binaries-list b/javahelp/external/binaries-list
-index 357a938..e69de29 100644
---- a/javahelp/external/binaries-list
-+++ b/javahelp/external/binaries-list
-@@ -1 +0,0 @@
--CA70822C47A67FC3A11670270567C2D01566DAE1 jhall-2.0_05.jar
diff --git a/javascript2.editor/external/binaries-list b/javascript2.editor/external/binaries-list
-index ff22b85..e69de29 100644
+index 8b26c0cc7..e69de29bb 100644
--- a/javascript2.editor/external/binaries-list
+++ b/javascript2.editor/external/binaries-list
@@ -1,3 +0,0 @@
--3699DFFE17089F9B9C73857EDA9B8669AAD657D3 js-corestubs.zip
+-C8EEAB10E4539BEAF97476EBA252BD4B40377FA9 js-corestubs.zip
-2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C js-domstubs.zip
-7C0C3CFD989EE775198337C11715C1ACD6C84F41 js-reststubs.zip
-diff --git a/jemmy/external/binaries-list b/jemmy/external/binaries-list
-index f3c2082..e69de29 100644
---- a/jemmy/external/binaries-list
-+++ b/jemmy/external/binaries-list
-@@ -1,3 +0,0 @@
--D325D3913CBC0F9A8D73A466FABB98EDEEC014AB jemmy-2.3.1.1.jar
--D06C8980C9025183C044202419EA29E69FBD4B99 jemmy-2.3.1.1-doc.zip
--49197106637CCA8C337AF16CC01BB5D9DEC7E179 jemmy-2.3.1.1-src.zip
-\ No newline at end of file
-diff --git a/junitlib/external/binaries-list b/junitlib/external/binaries-list
-index bc0a581..e69de29 100644
---- a/junitlib/external/binaries-list
-+++ b/junitlib/external/binaries-list
-@@ -1,2 +0,0 @@
--A6C32B40BF3D76ECA54E3C601E5D1470C86FCDFA junit-4.12-sources.jar
--941A8BE4506C65F0A9001C08812FB7DA1E505E21 junit-4.12-javadoc.jar
diff --git a/libs.amazon/external/binaries-list b/libs.amazon/external/binaries-list
-index e1207a0..e69de29 100644
+index e1207a05a..e69de29bb 100644
--- a/libs.amazon/external/binaries-list
+++ b/libs.amazon/external/binaries-list
@@ -1,5 +0,0 @@
@@ -433,128 +400,113 @@ index e1207a0..e69de29 100644
-FD32786786E2ADB664D5ECC965DA47629DCA14BA commons-codec-1.3.jar
-3D74BFB229C259E2398F2B383D5425CB81C643F0 httpclient-4.1.1.jar
-33FC26C02F8043AB0EDE19EADC8C9885386B255C httpcore-4.1.jar
-diff --git a/libs.antlr3.devel/external/binaries-list b/libs.antlr3.devel/external/binaries-list
-index 87aff10..e69de29 100644
---- a/libs.antlr3.devel/external/binaries-list
-+++ b/libs.antlr3.devel/external/binaries-list
-@@ -1 +0,0 @@
--5CAB59D859CAA6598E28131D30DD2E89806DB57F antlr-3.4.jar
diff --git a/libs.antlr3.runtime/external/binaries-list b/libs.antlr3.runtime/external/binaries-list
-index ce15f24..e69de29 100644
+index ce15f2409..e69de29bb 100644
--- a/libs.antlr3.runtime/external/binaries-list
+++ b/libs.antlr3.runtime/external/binaries-list
@@ -1 +0,0 @@
-4E74C6BE42FE89871A878C7C4D6158F21A6D8010 antlr-runtime-3.4.jar
-diff --git a/libs.asm/external/binaries-list b/libs.asm/external/binaries-list
-index c982df1..e69de29 100644
---- a/libs.asm/external/binaries-list
-+++ b/libs.asm/external/binaries-list
+diff --git a/libs.antlr4.runtime/external/binaries-list b/libs.antlr4.runtime/external/binaries-list
+index 1bc44d215..e69de29bb 100644
+--- a/libs.antlr4.runtime/external/binaries-list
++++ b/libs.antlr4.runtime/external/binaries-list
@@ -1 +0,0 @@
--2F7553F50B0D14ED811B849C282DA8C1FFC32AAE asm-all-5.0.1.jar
+-2609E36F18F7E8D593CC1CDDFB2AC776DC96B8E0 antlr-runtime-4.5.3.jar
diff --git a/libs.bytelist/external/binaries-list b/libs.bytelist/external/binaries-list
-index a8570bf..e69de29 100644
+index a8570bf20..e69de29bb 100644
--- a/libs.bytelist/external/binaries-list
+++ b/libs.bytelist/external/binaries-list
@@ -1 +0,0 @@
-886FAF4B85054DD6E50D9B3438542F432B5F9251 bytelist-0.1.jar
diff --git a/libs.cglib/external/binaries-list b/libs.cglib/external/binaries-list
-index c3de176..e69de29 100644
+index c3de1767e..e69de29bb 100644
--- a/libs.cglib/external/binaries-list
+++ b/libs.cglib/external/binaries-list
@@ -1 +0,0 @@
-97D03461DC1C04FFC636DCB2579AAE7724A78EF2 cglib-2.2.jar
diff --git a/libs.clank/external/binaries-list b/libs.clank/external/binaries-list
-index 0edcef2..e69de29 100644
+index 721a92813..e69de29bb 100644
--- a/libs.clank/external/binaries-list
+++ b/libs.clank/external/binaries-list
-@@ -1,6 +0,0 @@
--#changeset: 15883:d69fda690151
+@@ -1,9 +0,0 @@
+-#changeset: 19740:c3f4a3537ba5
+-#branch: jclank
-#tag: tip
+-#parent: 19738:2b3b59ce09a1
+-#parent: 19739:82abd3484987
-#user: Vladimir Voskresensky <vv159170 at netbeans.org>
--#date: Thu Oct 22 16:03:23 2015 +0300
--#summary: extra fix #253863 - [newcodemodel] broken code model in file if file has been excluded from project
--99529DC0E1426A102A98EF5494B6F6AA6E497F62 clank_0.3.6.zip
+-#date: Tue Sep 20 15:24:44 2016 +0300
+-#summary: merging jclank_39_upgrade into jclank
+-F20EEEDF4FE6B93B180387576FB780EED9F79C66 clank_0.3.9.zip
diff --git a/libs.commons_compress/external/binaries-list b/libs.commons_compress/external/binaries-list
-index ffb03b6..e69de29 100644
+index ffb03b64b..e69de29bb 100644
--- a/libs.commons_compress/external/binaries-list
+++ b/libs.commons_compress/external/binaries-list
@@ -1 +0,0 @@
-A698750C16740FD5B3871425F4CB3BBAA87F529D commons-compress-1.8.1.jar
diff --git a/libs.commons_fileupload/external/binaries-list b/libs.commons_fileupload/external/binaries-list
-index 0c1e632..e69de29 100644
+index 0c1e632eb..e69de29bb 100644
--- a/libs.commons_fileupload/external/binaries-list
+++ b/libs.commons_fileupload/external/binaries-list
@@ -1 +0,0 @@
-C89E540E4A12CB034FB973E12135839B5DE9A87E commons-fileupload-1.3.jar
diff --git a/libs.commons_net/external/binaries-list b/libs.commons_net/external/binaries-list
-index 16d19e5..e69de29 100644
+index 16d19e52b..e69de29bb 100644
--- a/libs.commons_net/external/binaries-list
+++ b/libs.commons_net/external/binaries-list
@@ -1 +0,0 @@
-CD0D5510908225F76C5FE5A3F1DF4FA44866F81E commons-net-3.3.jar
\ No newline at end of file
diff --git a/libs.elimpl/external/binaries-list b/libs.elimpl/external/binaries-list
-index a757565..e69de29 100644
+index a7575655d..e69de29bb 100644
--- a/libs.elimpl/external/binaries-list
+++ b/libs.elimpl/external/binaries-list
@@ -1 +0,0 @@
-BA8A45A96AFE07D914DE153E0BB137DCDC7734F6 el-impl.jar
-diff --git a/libs.felix/external/binaries-list b/libs.felix/external/binaries-list
-index 1cac7b8..e69de29 100644
---- a/libs.felix/external/binaries-list
-+++ b/libs.felix/external/binaries-list
-@@ -1 +0,0 @@
--1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7 felix-4.2.1.jar
diff --git a/libs.freemarker/external/binaries-list b/libs.freemarker/external/binaries-list
-index d7191f4..e69de29 100644
+index d7191f4a8..e69de29bb 100644
--- a/libs.freemarker/external/binaries-list
+++ b/libs.freemarker/external/binaries-list
@@ -1 +0,0 @@
-5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80 freemarker-2.3.19.jar
diff --git a/libs.glassfish_logging/external/binaries-list b/libs.glassfish_logging/external/binaries-list
-index 09c420b..e69de29 100644
+index 09c420be7..e69de29bb 100644
--- a/libs.glassfish_logging/external/binaries-list
+++ b/libs.glassfish_logging/external/binaries-list
@@ -1 +0,0 @@
-D813E05A06B587CD0FE36B00442EAB03C1431AA9 glassfish-logging-2.0.jar
diff --git a/libs.groovy/external/binaries-list b/libs.groovy/external/binaries-list
-index b854e32..e69de29 100644
+index a93a9bd9f..e69de29bb 100644
--- a/libs.groovy/external/binaries-list
+++ b/libs.groovy/external/binaries-list
@@ -1 +0,0 @@
--C136AE67C3C40740AE986582BAF65BA5C5CE69A0 groovy-all-2.1.7.jar
+-01730F61E9C9E59FD1B814371265334D7BE0B8D2 groovy-all-2.4.5.jar
diff --git a/libs.ini4j/external/binaries-list b/libs.ini4j/external/binaries-list
-index 87c05af..e69de29 100644
+index 87c05af37..e69de29bb 100644
--- a/libs.ini4j/external/binaries-list
+++ b/libs.ini4j/external/binaries-list
@@ -1 +0,0 @@
-8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC ini4j-0.5.1.jar
diff --git a/libs.javacapi/external/binaries-list b/libs.javacapi/external/binaries-list
-index 7781ef5..e69de29 100644
+index 6982f20bf..e69de29bb 100644
--- a/libs.javacapi/external/binaries-list
+++ b/libs.javacapi/external/binaries-list
@@ -1 +0,0 @@
--B2EB2006BCDB022420BDB4C2D596564539C65699 nb-javac-api.jar
+-5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD nb-javac-api.jar
diff --git a/libs.javacimpl/external/binaries-list b/libs.javacimpl/external/binaries-list
-index b10fc92..e69de29 100644
+index a91015c29..e69de29bb 100644
--- a/libs.javacimpl/external/binaries-list
+++ b/libs.javacimpl/external/binaries-list
@@ -1 +0,0 @@
--FBC85B83A93F76A159C8C0D782F02AF7E68E8ECF nb-javac-impl.jar
+-5968566A351B28623DE4720B0ACB1E40338074D0 nb-javac-impl.jar
diff --git a/libs.javacup/external/binaries-list b/libs.javacup/external/binaries-list
-index 812c479..e69de29 100644
+index 812c479e5..e69de29bb 100644
--- a/libs.javacup/external/binaries-list
+++ b/libs.javacup/external/binaries-list
@@ -1 +0,0 @@
-1DE46CC85D147D9F91AF59D4A0107091C8B112D6 java-cup-11a.jar
-diff --git a/libs.javafx/external/binaries-list b/libs.javafx/external/binaries-list
-index b01c319..e69de29 100644
---- a/libs.javafx/external/binaries-list
-+++ b/libs.javafx/external/binaries-list
-@@ -1 +0,0 @@
--5E40984A55F6FFF704F05D511A119CA5B456DDB1 jfxrt.jar
diff --git a/libs.jaxb/external/binaries-list b/libs.jaxb/external/binaries-list
-index 8f3e419..e69de29 100644
+index 8f3e419fe..e69de29bb 100644
--- a/libs.jaxb/external/binaries-list
+++ b/libs.jaxb/external/binaries-list
@@ -1,4 +0,0 @@
@@ -562,21 +514,8 @@ index 8f3e419..e69de29 100644
-F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3 jaxb1-impl.jar
-C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7 jaxb-xjc.jar
-27FAE927B5B9AE53A5B0ED825575DD8217CE7042 jaxb-api-doc.zip
-diff --git a/libs.jna.platform/external/binaries-list b/libs.jna.platform/external/binaries-list
-index 7373694..e69de29 100644
---- a/libs.jna.platform/external/binaries-list
-+++ b/libs.jna.platform/external/binaries-list
-@@ -1 +0,0 @@
--23457AD1CF75C2C16763330DE5565A0E67B4BC0A jna-platform-4.1.0.jar
-\ No newline at end of file
-diff --git a/libs.jna/external/binaries-list b/libs.jna/external/binaries-list
-index 535d54a..e69de29 100644
---- a/libs.jna/external/binaries-list
-+++ b/libs.jna/external/binaries-list
-@@ -1 +0,0 @@
--1C12D070E602EFD8021891CDD7FD18BC129372D4 jna-4.1.0.jar
diff --git a/libs.jsch.agentproxy/external/binaries-list b/libs.jsch.agentproxy/external/binaries-list
-index e7d855e..e69de29 100644
+index e7d855eae..e69de29bb 100644
--- a/libs.jsch.agentproxy/external/binaries-list
+++ b/libs.jsch.agentproxy/external/binaries-list
@@ -1,4 +0,0 @@
@@ -585,131 +524,112 @@ index e7d855e..e69de29 100644
-3FA59A536F3DC2197826DC7F224C0823C1534203 jsch.agentproxy.pageant-0.0.7.jar
-F759114E5A9F9AE907EADB59DBF65189AA399B45 jsch.agentproxy.usocket-jna-0.0.7.jar
diff --git a/libs.json_simple/external/binaries-list b/libs.json_simple/external/binaries-list
-index 04a84d6..e69de29 100644
+index 04a84d610..e69de29bb 100644
--- a/libs.json_simple/external/binaries-list
+++ b/libs.json_simple/external/binaries-list
@@ -1 +0,0 @@
-5D6F9B6A9DDCA2A28C0216CC44EFB2E20D9C23B5 json-simple-1.1.1.jar
diff --git a/libs.jstestdriver/external/binaries-list b/libs.jstestdriver/external/binaries-list
-index f39c548..e69de29 100644
+index f39c5487a..e69de29bb 100644
--- a/libs.jstestdriver/external/binaries-list
+++ b/libs.jstestdriver/external/binaries-list
@@ -1 +0,0 @@
-08FE518AB60FFA2E5440B75B4D9F8502E0791B3C libs.jstestdriver-ext.jar
diff --git a/libs.jstl/external/binaries-list b/libs.jstl/external/binaries-list
-index 0e4ca21..e69de29 100644
+index 0e4ca21ba..e69de29bb 100644
--- a/libs.jstl/external/binaries-list
+++ b/libs.jstl/external/binaries-list
@@ -1,2 +0,0 @@
-F072F63AB1689E885AC40C221DF3E6BB3E64A84A jstl-api.jar
-5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A jstl-impl.jar
-diff --git a/libs.junit4/external/binaries-list b/libs.junit4/external/binaries-list
-index cf7e327..e69de29 100644
---- a/libs.junit4/external/binaries-list
-+++ b/libs.junit4/external/binaries-list
-@@ -1,2 +0,0 @@
--2973D150C0DC1FEFE998F834810D68F278EA58EC junit-4.12.jar
--42A25DC3219429F0E5D060061F71ACB49BF010A0 hamcrest-core-1.3.jar
diff --git a/libs.jvyamlb/external/binaries-list b/libs.jvyamlb/external/binaries-list
-index fa83c54..e69de29 100644
+index fa83c54ff..e69de29bb 100644
--- a/libs.jvyamlb/external/binaries-list
+++ b/libs.jvyamlb/external/binaries-list
@@ -1 +0,0 @@
-ED45F5C56EC70CC77936E92B43B6F32F46E6F4B3 jvyamlb-0.2.7.jar
diff --git a/libs.lucene/external/binaries-list b/libs.lucene/external/binaries-list
-index ecbff95..e69de29 100644
+index ecbff9599..e69de29bb 100644
--- a/libs.lucene/external/binaries-list
+++ b/libs.lucene/external/binaries-list
@@ -1 +0,0 @@
-90FF0731FAFB05C01FEE4F2247140D56E9C30A3B lucene-core-3.5.0.jar
diff --git a/libs.nashorn/external/binaries-list b/libs.nashorn/external/binaries-list
-index 6793db7..e69de29 100644
+index 529bd58a6..e69de29bb 100644
--- a/libs.nashorn/external/binaries-list
+++ b/libs.nashorn/external/binaries-list
-@@ -1,2 +0,0 @@
--98308890597ACB64047F7E896638E0D98753AE82 asm-all-4.0.jar
--76E901A1F432323E7E90FC86FDB2534A28952293 nashorn-02f810c26ff9-patched.jar
-diff --git a/libs.osgi/external/binaries-list b/libs.osgi/external/binaries-list
-index c0ac1f0..e69de29 100644
---- a/libs.osgi/external/binaries-list
-+++ b/libs.osgi/external/binaries-list
-@@ -1,2 +0,0 @@
--972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD osgi.cmpn-4.2.jar
--2F2FBFF3FB80F91B159A7FA9F0C42A894BB8BCC5 osgi.core-5.0.0.jar
+@@ -1 +0,0 @@
+-7CA13589F586F659BB0E1561719A91CA47BF1897 com.oracle.js.parser.jar
diff --git a/libs.plist/external/binaries-list b/libs.plist/external/binaries-list
-index 09aeeb4..e69de29 100644
+index 09aeeb4d5..e69de29bb 100644
--- a/libs.plist/external/binaries-list
+++ b/libs.plist/external/binaries-list
@@ -1 +0,0 @@
-59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B dd-plist.jar
diff --git a/libs.smack/external/binaries-list b/libs.smack/external/binaries-list
-index 3f5f295..e69de29 100644
+index 3f5f295ab..e69de29bb 100644
--- a/libs.smack/external/binaries-list
+++ b/libs.smack/external/binaries-list
@@ -1,2 +0,0 @@
-916A0FE08D840A08C950F49FB59B961E14D673B8 smack.jar
-BA1365C7E5F3CF7F7641B354677B3F54A6EA5A15 smackx.jar
diff --git a/libs.springframework/external/binaries-list b/libs.springframework/external/binaries-list
-index 8d8a184..e69de29 100644
+index 8d8a184dc..e69de29bb 100644
--- a/libs.springframework/external/binaries-list
+++ b/libs.springframework/external/binaries-list
@@ -1,2 +0,0 @@
-7666B94C1004AFFFE88E5328BD70EBA6F60125F4 spring-framework-3.2.7.RELEASE.zip
-91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266 spring-framework-4.0.1.RELEASE.zip
diff --git a/libs.svnClientAdapter.javahl/external/binaries-list b/libs.svnClientAdapter.javahl/external/binaries-list
-index 75bcb0e..e69de29 100644
+index bb7f48530..e69de29bb 100644
--- a/libs.svnClientAdapter.javahl/external/binaries-list
+++ b/libs.svnClientAdapter.javahl/external/binaries-list
@@ -1,2 +0,0 @@
--D08E473A4D0510FB329D64E4CC4F2963D000699C svnClientAdapter-javahl-1.10.3.jar
--24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2 svnjavahl-1.8.4.jar
+-DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8 svnClientAdapter-javahl-1.10.12.jar
+-5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5 svnjavahl-1.9.3.jar
diff --git a/libs.svnClientAdapter.svnkit/external/binaries-list b/libs.svnClientAdapter.svnkit/external/binaries-list
-index 14d07b3..e69de29 100644
+index 8cd78020e..e69de29bb 100644
--- a/libs.svnClientAdapter.svnkit/external/binaries-list
+++ b/libs.svnClientAdapter.svnkit/external/binaries-list
@@ -1,4 +0,0 @@
--5D37A7FE167A1D44731192748C79B2D7905D474F svnClientAdapter-svnkit-1.10.3.jar
--8307A44D3F150F1BB317532097A0C7D125C00F2D org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar
+-AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8 svnClientAdapter-svnkit-1.10.12.jar
+-17C0C8D6DEBF5EBE734881C131888D8088BD9E7D org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar
-EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA sqljet-1.1.10.jar
--ACAB7C860DF78C4A528FD8A64F2C62A0A96639E5 com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar
+-DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8 com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar
diff --git a/libs.svnClientAdapter/external/binaries-list b/libs.svnClientAdapter/external/binaries-list
-index d9527ab..e69de29 100644
+index 8ca85d4f8..e69de29bb 100644
--- a/libs.svnClientAdapter/external/binaries-list
+++ b/libs.svnClientAdapter/external/binaries-list
@@ -1 +0,0 @@
--2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D svnClientAdapter-main-1.10.3.jar
+-C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8 svnClientAdapter-main-1.10.12.jar
\ No newline at end of file
diff --git a/libs.swingx/external/binaries-list b/libs.swingx/external/binaries-list
-index 136f7d4..e69de29 100644
+index 136f7d41f..e69de29bb 100644
--- a/libs.swingx/external/binaries-list
+++ b/libs.swingx/external/binaries-list
@@ -1 +0,0 @@
-C0D8A3265D194CC886BAFD585117B6465FD97DCE swingx-all-1.6.4.jar
-diff --git a/libs.testng/external/binaries-list b/libs.testng/external/binaries-list
-index 574feaa..e69de29 100644
---- a/libs.testng/external/binaries-list
-+++ b/libs.testng/external/binaries-list
-@@ -1,2 +0,0 @@
--AC97B566699146713B3CF0ABC226B5C08EF7CF33 testng-6.8.1-dist.jar
--AF022CBCACD8CBFCF946816441D1E7568D817745 testng-6.8.1-javadoc.zip
diff --git a/libs.xerces/external/binaries-list b/libs.xerces/external/binaries-list
-index c515207..e69de29 100644
+index c51520762..e69de29bb 100644
--- a/libs.xerces/external/binaries-list
+++ b/libs.xerces/external/binaries-list
@@ -1 +0,0 @@
-6E60617C9D81EA1EF96913C226900BC2D1E69C37 xerces-2.8.0.jar
diff --git a/maven.embedder/external/binaries-list b/maven.embedder/external/binaries-list
-index c26fbd3..e69de29 100644
+index 7bdd9285c..e69de29bb 100644
--- a/maven.embedder/external/binaries-list
+++ b/maven.embedder/external/binaries-list
-@@ -1,4 +0,0 @@
+@@ -1,7 +0,0 @@
-A2AC1CD690AB4C80DEFE7F9BCE14D35934C35CEC jdom-1.0.jar
-BF206C4AA93C74A739FBAF1F1C78E3AD5F167245 maven-dependency-tree-2.0.jar
-694F57282D92C434800F79218E64704E5947008A apache-maven-3.0.5-bin.zip
--B572007A07023ADF7ECBDB7FC2D572BF1BDED20D wagon-http-2.8-shaded.jar
+-BFCC4C322190D6E3DD2FA9F191C0359D380D87C5 wagon-file-2.10.jar
+-4EF309C09ABB5F8B2D0C6A4010205DB185729CDC wagon-http-2.10-shaded.jar
+-3B96251214DF697E902C849EB0B4A0EFA2CD1A53 wagon-http-shared-2.10.jar
+-0CD9CDDE3F56BB5250D87C54592F04CBC24F03BF wagon-provider-api-2.10.jar
\ No newline at end of file
diff --git a/maven.indexer/external/binaries-list b/maven.indexer/external/binaries-list
-index b605d5b..e69de29 100644
+index b605d5be8..e69de29bb 100644
--- a/maven.indexer/external/binaries-list
+++ b/maven.indexer/external/binaries-list
@@ -1,4 +0,0 @@
@@ -719,124 +639,68 @@ index b605d5b..e69de29 100644
-A90682C6BC0B9E105BD260C9A041FEFEA9579E46 lucene-highlighter-3.6.2.jar
\ No newline at end of file
diff --git a/maven/external/binaries-list b/maven/external/binaries-list
-index a2173a6..e69de29 100644
+index 6066ceaf0..e69de29bb 100644
--- a/maven/external/binaries-list
+++ b/maven/external/binaries-list
@@ -1,2 +0,0 @@
-D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050 jarjar-1.4.jar
--CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1 netbeans-cos.jar
+-839F93A5213FB3E233B09BFD6D6B95669F7043C0 aether-api-1.0.2.v20150114.jar
\ No newline at end of file
-diff --git a/nbbuild/external/binaries-list b/nbbuild/external/binaries-list
-index 3b388fb..e69de29 100644
---- a/nbbuild/external/binaries-list
-+++ b/nbbuild/external/binaries-list
-@@ -1,2 +0,0 @@
--EAE299D9D3B1C6E2F8B030DCD3BCF0B05517FBA9 apitest.jar
--
-diff --git a/net.java.html.boot.fx/external/binaries-list b/net.java.html.boot.fx/external/binaries-list
-index 78768bf..e69de29 100644
---- a/net.java.html.boot.fx/external/binaries-list
-+++ b/net.java.html.boot.fx/external/binaries-list
-@@ -1 +0,0 @@
--068B9902E65F2292C9EA30E5423E41FB6B30D8AA net.java.html.boot.fx-1.2.3.jar
-diff --git a/net.java.html.boot.script/external/binaries-list b/net.java.html.boot.script/external/binaries-list
-index 30f7fad..e69de29 100644
---- a/net.java.html.boot.script/external/binaries-list
-+++ b/net.java.html.boot.script/external/binaries-list
-@@ -1 +0,0 @@
--8621531E83EC4850DA61AA2266FE41105C304F40 net.java.html.boot.script-1.2.3.jar
-diff --git a/net.java.html.boot/external/binaries-list b/net.java.html.boot/external/binaries-list
-index 908358f..e69de29 100644
---- a/net.java.html.boot/external/binaries-list
-+++ b/net.java.html.boot/external/binaries-list
-@@ -1 +0,0 @@
--7BA1E1C450BCD0AD9D0D2F6797A2EB50A4822E0E net.java.html.boot-1.2.3.jar
-diff --git a/net.java.html.geo/external/binaries-list b/net.java.html.geo/external/binaries-list
-index 79eedf2..e69de29 100644
---- a/net.java.html.geo/external/binaries-list
-+++ b/net.java.html.geo/external/binaries-list
-@@ -1 +0,0 @@
--24824B1E8C2A2D3A5C471F5875BF61F27E8916DB net.java.html.geo-1.2.3.jar
-diff --git a/net.java.html.json/external/binaries-list b/net.java.html.json/external/binaries-list
-index 935fbbf..e69de29 100644
---- a/net.java.html.json/external/binaries-list
-+++ b/net.java.html.json/external/binaries-list
-@@ -1 +0,0 @@
--F41518385DA4B5682C864F19B82C3BA4AF65AE83 net.java.html.json-1.2.3.jar
-diff --git a/net.java.html.sound/external/binaries-list b/net.java.html.sound/external/binaries-list
-index d436017..e69de29 100644
---- a/net.java.html.sound/external/binaries-list
-+++ b/net.java.html.sound/external/binaries-list
-@@ -1 +0,0 @@
--989A81454D4FA962EB1C158FE794D2EB060AB9F6 net.java.html.sound-1.2.3.jar
-diff --git a/net.java.html/external/binaries-list b/net.java.html/external/binaries-list
-index a23ebca..e69de29 100644
---- a/net.java.html/external/binaries-list
-+++ b/net.java.html/external/binaries-list
-@@ -1 +0,0 @@
--78DD1C0B4EDC348FF4DCD0616597BB809AAE248D net.java.html-1.2.3.jar
-diff --git a/netbinox/external/binaries-list b/netbinox/external/binaries-list
-index a246e5c..e69de29 100644
---- a/netbinox/external/binaries-list
-+++ b/netbinox/external/binaries-list
-@@ -1,2 +0,0 @@
--B27F1304F18FEDE876F940AEFA6C9EB5632619D7 org.eclipse.osgi_3.9.1.v20140110-1610.jar
--
diff --git a/o.apache.commons.codec/external/binaries-list b/o.apache.commons.codec/external/binaries-list
-index 97d4dbf..e69de29 100644
+index 97d4dbfd0..e69de29bb 100644
--- a/o.apache.commons.codec/external/binaries-list
+++ b/o.apache.commons.codec/external/binaries-list
@@ -1 +0,0 @@
-FD32786786E2ADB664D5ECC965DA47629DCA14BA apache-commons-codec-1.3.jar
diff --git a/o.apache.commons.httpclient/external/binaries-list b/o.apache.commons.httpclient/external/binaries-list
-index 493ca18..e69de29 100644
+index 493ca188c..e69de29bb 100644
--- a/o.apache.commons.httpclient/external/binaries-list
+++ b/o.apache.commons.httpclient/external/binaries-list
@@ -1 +0,0 @@
-964CD74171F427720480EFDEC40A7C7F6E58426A commons-httpclient-3.1.jar
\ No newline at end of file
diff --git a/o.apache.commons.io/external/binaries-list b/o.apache.commons.io/external/binaries-list
-index d78f410..e69de29 100644
+index d78f41072..e69de29bb 100644
--- a/o.apache.commons.io/external/binaries-list
+++ b/o.apache.commons.io/external/binaries-list
@@ -1 +0,0 @@
-A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE commons-io-1.4.jar
\ No newline at end of file
diff --git a/o.apache.commons.lang/external/binaries-list b/o.apache.commons.lang/external/binaries-list
-index 3e5eb08..e69de29 100644
+index a30cd31ee..e69de29bb 100644
--- a/o.apache.commons.lang/external/binaries-list
+++ b/o.apache.commons.lang/external/binaries-list
@@ -1 +0,0 @@
--16313E02A793435009F1E458FA4AF5D879F6FB11 commons-lang-2.4.jar
+-0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2 commons-lang-2.6.jar
\ No newline at end of file
diff --git a/o.apache.commons.logging/external/binaries-list b/o.apache.commons.logging/external/binaries-list
-index c7b57dc..e69de29 100644
+index c7b57dc83..e69de29bb 100644
--- a/o.apache.commons.logging/external/binaries-list
+++ b/o.apache.commons.logging/external/binaries-list
@@ -1 +0,0 @@
-2D859791FBF7D880591864BD4004D8442A8A3B81 commons-logging-1.1.1.jar
diff --git a/o.apache.tools.ant.module/external/binaries-list b/o.apache.tools.ant.module/external/binaries-list
-index 63ce5aa..e69de29 100644
+index 09b9b7370..e69de29bb 100644
--- a/o.apache.tools.ant.module/external/binaries-list
+++ b/o.apache.tools.ant.module/external/binaries-list
@@ -1,3 +0,0 @@
--22CB933E3A1450B092C45785C187837E97523F5C ant-libs-1.9.4.zip
--95CCE237B1E9390FBED0440B601822813DB220E6 ant-misc-1.9.4.zip
+-BEA15848D713D491C6EBA1307E0564A5BC3965E7 ant-libs-1.9.7.zip
+-545E2B7AB1BD579CC76E3836055877982C5CD0C6 ant-misc-1.9.7.zip
-
diff --git a/o.apache.ws.commons.util/external/binaries-list b/o.apache.ws.commons.util/external/binaries-list
-index 5f55f71..e69de29 100644
+index 5f55f713c..e69de29bb 100644
--- a/o.apache.ws.commons.util/external/binaries-list
+++ b/o.apache.ws.commons.util/external/binaries-list
@@ -1 +0,0 @@
-52BEF8900248E7AB86C5743ED14A48AD787BF457 ws-commons-util-1.0.1.jar
diff --git a/o.apache.xml.resolver/external/binaries-list b/o.apache.xml.resolver/external/binaries-list
-index aa6eba3..e69de29 100644
+index aa6eba372..e69de29bb 100644
--- a/o.apache.xml.resolver/external/binaries-list
+++ b/o.apache.xml.resolver/external/binaries-list
@@ -1 +0,0 @@
-B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3 resolver-1.2.jar
diff --git a/o.apache.xmlrpc/external/binaries-list b/o.apache.xmlrpc/external/binaries-list
-index b2e2668..e69de29 100644
+index b2e266880..e69de29bb 100644
--- a/o.apache.xmlrpc/external/binaries-list
+++ b/o.apache.xmlrpc/external/binaries-list
@@ -1,3 +0,0 @@
@@ -844,293 +708,292 @@ index b2e2668..e69de29 100644
-8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF xmlrpc-common-3.0.jar
-D6917BF718583002CBE44E773EE21E2DF08ADC71 xmlrpc-server-3.0.jar
diff --git a/o.eclipse.core.contenttype/external/binaries-list b/o.eclipse.core.contenttype/external/binaries-list
-index cf0a9e0..e69de29 100644
+index 60985ca18..e69de29bb 100644
--- a/o.eclipse.core.contenttype/external/binaries-list
+++ b/o.eclipse.core.contenttype/external/binaries-list
@@ -1 +0,0 @@
--F27BF427BE72709F3094BF76ECA8C5A2B9AC6DA9 org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar
+-AA2671239EBB762FEEE8B908E9F35473A72AFE1B org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar
\ No newline at end of file
diff --git a/o.eclipse.core.jobs/external/binaries-list b/o.eclipse.core.jobs/external/binaries-list
-index f0e1729..e69de29 100644
+index 19d32bf67..e69de29bb 100644
--- a/o.eclipse.core.jobs/external/binaries-list
+++ b/o.eclipse.core.jobs/external/binaries-list
@@ -1 +0,0 @@
--9BC512C5BB9A9F5276B9E8672F6B30AD0BD97D88 org.eclipse.core.jobs-3.5.101_nosignature.jar
+-1605B38BB28EAE32C11EAB8F9E238A497754A5B8 org.eclipse.core.jobs-3.5.101_nosignature.jar
\ No newline at end of file
diff --git a/o.eclipse.core.net/external/binaries-list b/o.eclipse.core.net/external/binaries-list
-index 9880cea..e69de29 100644
+index 70288f278..e69de29bb 100644
--- a/o.eclipse.core.net/external/binaries-list
+++ b/o.eclipse.core.net/external/binaries-list
@@ -1 +0,0 @@
--105DC9A1A93E6EA9A6CD368AD12897B1F247D6AE org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar
+-20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30 org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar
\ No newline at end of file
diff --git a/o.eclipse.core.runtime.compatibility.auth/external/binaries-list b/o.eclipse.core.runtime.compatibility.auth/external/binaries-list
-index 5be37fd..e69de29 100644
+index d5044e9c0..e69de29bb 100644
--- a/o.eclipse.core.runtime.compatibility.auth/external/binaries-list
+++ b/o.eclipse.core.runtime.compatibility.auth/external/binaries-list
@@ -1 +0,0 @@
--84FC6D443CD0816FA87093B6B7AD6876ADFC4207 org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar
+-16507EAFDC2B95121AA718895BDB54D616EE4B0F org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar
\ No newline at end of file
diff --git a/o.eclipse.core.runtime/external/binaries-list b/o.eclipse.core.runtime/external/binaries-list
-index 181729a..e69de29 100644
+index 04288fb74..e69de29bb 100644
--- a/o.eclipse.core.runtime/external/binaries-list
+++ b/o.eclipse.core.runtime/external/binaries-list
@@ -1 +0,0 @@
--E99C3C29A90F8AB29078A38CF8EBC3860249640C org.eclipse.core.runtime-3.7.0_nosignature.jar
+-D2D2105B1E3C9E2FA6240AD088237A57590DDA8D org.eclipse.core.runtime-3.7.0_nosignature.jar
\ No newline at end of file
diff --git a/o.eclipse.equinox.app/external/binaries-list b/o.eclipse.equinox.app/external/binaries-list
-index d412e22..e69de29 100644
+index 53d7d67ae..e69de29bb 100644
--- a/o.eclipse.equinox.app/external/binaries-list
+++ b/o.eclipse.equinox.app/external/binaries-list
@@ -1 +0,0 @@
--74069BFD03B2C66A9EBB4370C0B8064E3F5B6594 org.eclipse.equinox.app-1.3.100_nosignature.jar
+-BD55836AABD558DC643A7844B78866AD990544BC org.eclipse.equinox.app-1.3.100_nosignature.jar
\ No newline at end of file
diff --git a/o.eclipse.equinox.common/external/binaries-list b/o.eclipse.equinox.common/external/binaries-list
-index d26e80d..e69de29 100644
+index 8d9f830e4..e69de29bb 100644
--- a/o.eclipse.equinox.common/external/binaries-list
+++ b/o.eclipse.equinox.common/external/binaries-list
@@ -1 +0,0 @@
--A7953EEE9D4D7CD896C7D0AD6D21902E6259979B org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar
+-4EE275AE73A140A403903D7E4DBA68C8FBB07001 org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar
\ No newline at end of file
diff --git a/o.eclipse.equinox.preferences/external/binaries-list b/o.eclipse.equinox.preferences/external/binaries-list
-index ab899a5..e69de29 100644
+index cb953298c..e69de29bb 100644
--- a/o.eclipse.equinox.preferences/external/binaries-list
+++ b/o.eclipse.equinox.preferences/external/binaries-list
@@ -1 +0,0 @@
--3FB169C95F095B70F05B96BE9496DA63FAE7F707 org.eclipse.equinox.preferences-3.4.2_nosignature.jar
+-B7001D9CC2E2AC4E167D22A13063F0350C71AAA9 org.eclipse.equinox.preferences-3.4.2_nosignature.jar
\ No newline at end of file
diff --git a/o.eclipse.equinox.registry/external/binaries-list b/o.eclipse.equinox.registry/external/binaries-list
-index 9564a01..e69de29 100644
+index 525c1dfc9..e69de29bb 100644
--- a/o.eclipse.equinox.registry/external/binaries-list
+++ b/o.eclipse.equinox.registry/external/binaries-list
@@ -1 +0,0 @@
--CD5919A707EB6B5C1FC29964C8EF5E2CF3F5A3D4 org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar
+-C647079E36A4EB7A24AED2C545E4F0F94194C4D1 org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar
\ No newline at end of file
diff --git a/o.eclipse.equinox.security/external/binaries-list b/o.eclipse.equinox.security/external/binaries-list
-index 002e17e..e69de29 100644
+index ddfcced7c..e69de29bb 100644
--- a/o.eclipse.equinox.security/external/binaries-list
+++ b/o.eclipse.equinox.security/external/binaries-list
@@ -1 +0,0 @@
--A4634373DC60650C49CC98AEA2090889F7ADC68F org.eclipse.equinox.security-1.1.1_nosignature.jar
+-9267CF311F979078211A70C1B19AF8A8EE71DC8E org.eclipse.equinox.security-1.1.1_nosignature.jar
\ No newline at end of file
diff --git a/o.eclipse.jgit.java7/external/binaries-list b/o.eclipse.jgit.java7/external/binaries-list
-index 828f34e..e69de29 100644
+index b8080db55..e69de29bb 100644
--- a/o.eclipse.jgit.java7/external/binaries-list
+++ b/o.eclipse.jgit.java7/external/binaries-list
@@ -1 +0,0 @@
--9039A0C1FA0E56CB56A1A192908814478FA747C5 org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar
+-244560B99152F3F9BC75DF2D6FAFA8A5216B06B6 org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar
\ No newline at end of file
diff --git a/o.eclipse.jgit/external/binaries-list b/o.eclipse.jgit/external/binaries-list
-index 74400b2..e69de29 100644
+index 7bfcf345b..e69de29bb 100644
--- a/o.eclipse.jgit/external/binaries-list
+++ b/o.eclipse.jgit/external/binaries-list
@@ -1 +0,0 @@
--278049664FFA5447191BD5FE96B0B62B0CFD15D1 org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar
+-B580E446B543A8DD2F5AA368B07F9C4C9C2E7029 org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar
\ No newline at end of file
diff --git a/o.eclipse.mylyn.bugzilla.core/external/binaries-list b/o.eclipse.mylyn.bugzilla.core/external/binaries-list
-index cdae2d0..e69de29 100644
+index 0834e2f88..e69de29bb 100644
--- a/o.eclipse.mylyn.bugzilla.core/external/binaries-list
+++ b/o.eclipse.mylyn.bugzilla.core/external/binaries-list
@@ -1 +0,0 @@
--DAA45A7EE529A7532F5DC08625A5A3E81DB2D4CB org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar
+-8E2776DE17446EC7450285F19F2C6366117748A8 org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar
\ No newline at end of file
diff --git a/o.eclipse.mylyn.commons.core/external/binaries-list b/o.eclipse.mylyn.commons.core/external/binaries-list
-index afac472..e69de29 100644
+index 9fec2906b..e69de29bb 100644
--- a/o.eclipse.mylyn.commons.core/external/binaries-list
+++ b/o.eclipse.mylyn.commons.core/external/binaries-list
@@ -1 +0,0 @@
--F5AC8FBA216A8C52F319EC2CB455B44FFD734B38 org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar
+-D4F2BE52B5C048158B5C046C0ACAC3965027FE12 org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar
\ No newline at end of file
diff --git a/o.eclipse.mylyn.commons.net/external/binaries-list b/o.eclipse.mylyn.commons.net/external/binaries-list
-index 05b0bab..e69de29 100644
+index 848341e6a..e69de29bb 100644
--- a/o.eclipse.mylyn.commons.net/external/binaries-list
+++ b/o.eclipse.mylyn.commons.net/external/binaries-list
@@ -1 +0,0 @@
--B43E7CE55F0DECA3BE1A6E695A3E3ABC6D62567F org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar
+-4C753A9D8AB768A55EC99A377A0D22EDA67BAE25 org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar
\ No newline at end of file
diff --git a/o.eclipse.mylyn.commons.repositories.core/external/binaries-list b/o.eclipse.mylyn.commons.repositories.core/external/binaries-list
-index 5ca6cc4..e69de29 100644
+index 99c158e24..e69de29bb 100644
--- a/o.eclipse.mylyn.commons.repositories.core/external/binaries-list
+++ b/o.eclipse.mylyn.commons.repositories.core/external/binaries-list
@@ -1 +0,0 @@
--1B9CBEC0FCB47C279519E52D360199C24EC99B01 org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar
+-8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar
\ No newline at end of file
diff --git a/o.eclipse.mylyn.commons.xmlrpc/external/binaries-list b/o.eclipse.mylyn.commons.xmlrpc/external/binaries-list
-index 29f2b01..e69de29 100644
+index d9ba5cb9f..e69de29bb 100644
--- a/o.eclipse.mylyn.commons.xmlrpc/external/binaries-list
+++ b/o.eclipse.mylyn.commons.xmlrpc/external/binaries-list
@@ -1 +0,0 @@
--6B0A6E9F9179E314944E4ADB831A9D6FCADED3DC org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar
+-50F0A49BDF7C5610E3E602609926065D47A16C6E org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar
\ No newline at end of file
diff --git a/o.eclipse.mylyn.tasks.core/external/binaries-list b/o.eclipse.mylyn.tasks.core/external/binaries-list
-index 2ae70f2..e69de29 100644
+index 548c85832..e69de29bb 100644
--- a/o.eclipse.mylyn.tasks.core/external/binaries-list
+++ b/o.eclipse.mylyn.tasks.core/external/binaries-list
@@ -1 +0,0 @@
--B28B8EE777232102471EA5334FD70E20851845DD org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar
+-4F2E28BDB091E2DD215FB9B16C8708513288F16A org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar
\ No newline at end of file
diff --git a/o.eclipse.mylyn.wikitext.confluence.core/external/binaries-list b/o.eclipse.mylyn.wikitext.confluence.core/external/binaries-list
-index bf17785..e69de29 100644
+index 47627183b..e69de29bb 100644
--- a/o.eclipse.mylyn.wikitext.confluence.core/external/binaries-list
+++ b/o.eclipse.mylyn.wikitext.confluence.core/external/binaries-list
@@ -1 +0,0 @@
--24A15BD37950663933CC4975EE6E518BEB2C28A3 org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar
+-11D1982BE23B06B2721240F424DBEF9F5FDE7F45 org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar
\ No newline at end of file
diff --git a/o.eclipse.mylyn.wikitext.core/external/binaries-list b/o.eclipse.mylyn.wikitext.core/external/binaries-list
-index 3b346c9..e69de29 100644
+index 83f226309..e69de29bb 100644
--- a/o.eclipse.mylyn.wikitext.core/external/binaries-list
+++ b/o.eclipse.mylyn.wikitext.core/external/binaries-list
@@ -1 +0,0 @@
--01CD242F06F6F7E4E61C9E05ABBE07318E501D51 org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar
+-A3FEF6144ED1622E4CDD506B9D745527CC675D8D org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar
+\ No newline at end of file
+diff --git a/o.eclipse.mylyn.wikitext.markdown.core/external/binaries-list b/o.eclipse.mylyn.wikitext.markdown.core/external/binaries-list
+index 3acc1a56b..e69de29bb 100644
+--- a/o.eclipse.mylyn.wikitext.markdown.core/external/binaries-list
++++ b/o.eclipse.mylyn.wikitext.markdown.core/external/binaries-list
+@@ -1 +0,0 @@
+-825DC870D1D423E347F4F8229A211A2C297BB15D org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar
\ No newline at end of file
diff --git a/o.eclipse.mylyn.wikitext.textile.core/external/binaries-list b/o.eclipse.mylyn.wikitext.textile.core/external/binaries-list
-index f08affa..e69de29 100644
+index 63908c67f..e69de29bb 100644
--- a/o.eclipse.mylyn.wikitext.textile.core/external/binaries-list
+++ b/o.eclipse.mylyn.wikitext.textile.core/external/binaries-list
@@ -1 +0,0 @@
--75928E4368CA748131A6767BA1A97D9DA643C306 org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar
+-C3024631DD14008D2FF35A576C3D82AC6FCB2E10 org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar
\ No newline at end of file
diff --git a/o.jdesktop.beansbinding/external/binaries-list b/o.jdesktop.beansbinding/external/binaries-list
-index d8f416a..e69de29 100644
+index d8f416a51..e69de29bb 100644
--- a/o.jdesktop.beansbinding/external/binaries-list
+++ b/o.jdesktop.beansbinding/external/binaries-list
@@ -1,2 +0,0 @@
-F7BD95641780C2AAE8CB9BED1686441A1CE5E749 beansbinding-1.2.1-doc.zip
-C4F88C2CFC1F3F72451CDE2AA3BB1F40879801FD beansbinding-1.2.1.jar
-diff --git a/o.jdesktop.layout/external/binaries-list b/o.jdesktop.layout/external/binaries-list
-index 1d6b722..e69de29 100644
---- a/o.jdesktop.layout/external/binaries-list
-+++ b/o.jdesktop.layout/external/binaries-list
-@@ -1,3 +0,0 @@
--1C7FE319052EF49126CF07D0DB6953CB7007229E swing-layout-1.0.4-doc.zip
--69D72835E165439CF7816EFDA65868FD4E0C6E2A swing-layout-1.0.4.jar
--D2503D2217868ABAE1A5E7480A9CCA1DB3522464 swing-layout-1.0.4-src.zip
-diff --git a/o.n.html.ko4j/external/binaries-list b/o.n.html.ko4j/external/binaries-list
-index 177b434..e69de29 100644
---- a/o.n.html.ko4j/external/binaries-list
-+++ b/o.n.html.ko4j/external/binaries-list
-@@ -1 +0,0 @@
--A3432F57D9B3B4AD62CB0B294EEC43D12FCF3F62 ko4j-1.2.3.jar
+diff --git a/performance/external/binaries-list b/performance/external/binaries-list
+index e4b97c156..e69de29bb 100644
+--- a/performance/external/binaries-list
++++ b/performance/external/binaries-list
+@@ -1 +0,0 @@
+-EE416CB5D6AA88473EFE487F42DC1410360F7948 javacc-3.2.jar
diff --git a/php.editor/external/binaries-list b/php.editor/external/binaries-list
-index a96edf6..e69de29 100644
+index a96edf616..e69de29bb 100644
--- a/php.editor/external/binaries-list
+++ b/php.editor/external/binaries-list
@@ -1 +0,0 @@
-3D6AF75EA20D715887DAF47A3F063864EF0814C1 predefined_vars.zip
diff --git a/php.phpdoc.documentation/external/binaries-list b/php.phpdoc.documentation/external/binaries-list
-index eadf287..e69de29 100644
+index eadf28709..e69de29bb 100644
--- a/php.phpdoc.documentation/external/binaries-list
+++ b/php.phpdoc.documentation/external/binaries-list
@@ -1 +0,0 @@
-0702230EB3354A1687E4496D73A94F33A1E343BD phpdocdesc.zip
diff --git a/php.project/external/binaries-list b/php.project/external/binaries-list
-index abf81d4..e69de29 100644
+index c8661ef6f..e69de29bb 100644
--- a/php.project/external/binaries-list
+++ b/php.project/external/binaries-list
@@ -1 +0,0 @@
--73E9BC8A7AF36E0C95210F61A85AFEF212AEE1A9 phpsigfiles.zip
+-472A52636BE09823B4E5F707071B31FB990A7375 phpsigfiles.zip
diff --git a/servletapi/external/binaries-list b/servletapi/external/binaries-list
-index 397a462..e69de29 100644
+index 397a462a1..e69de29bb 100644
--- a/servletapi/external/binaries-list
+++ b/servletapi/external/binaries-list
@@ -1 +0,0 @@
-85F9EE8921A08E5478118005D5829C6A1637374B servlet-2.2.jar
diff --git a/servletjspapi/external/binaries-list b/servletjspapi/external/binaries-list
-index 0c1203a..e69de29 100644
+index 0c1203a66..e69de29bb 100644
--- a/servletjspapi/external/binaries-list
+++ b/servletjspapi/external/binaries-list
@@ -1 +0,0 @@
-68C97A238A2143B616879E8C1EF5BF01EA25B11E servlet3.1-jsp2.3-api.jar
diff --git a/spellchecker.dictionary_en/external/binaries-list b/spellchecker.dictionary_en/external/binaries-list
-index bea0730..e69de29 100644
+index bea073084..e69de29bb 100644
--- a/spellchecker.dictionary_en/external/binaries-list
+++ b/spellchecker.dictionary_en/external/binaries-list
@@ -1 +0,0 @@
-F90E3DA5259DB07F36E6987EFDED647A5231DE76 ispell-enwl-3.1.20.zip
diff --git a/swing.validation/external/binaries-list b/swing.validation/external/binaries-list
-index 4251da3..e69de29 100644
+index 4251da335..e69de29bb 100644
--- a/swing.validation/external/binaries-list
+++ b/swing.validation/external/binaries-list
@@ -1 +0,0 @@
-89BC047153217F5254506F4C622A771A78883CBC ValidationAPI.jar
diff --git a/web.core.syntax/external/binaries-list b/web.core.syntax/external/binaries-list
-index ffb640e..e69de29 100644
+index ffb640eba..e69de29bb 100644
--- a/web.core.syntax/external/binaries-list
+++ b/web.core.syntax/external/binaries-list
@@ -1 +0,0 @@
-F6E990DF59BD1FD2058320002A853A5411A45CD4 syntaxref20.zip
diff --git a/web.jsf.editor/external/binaries-list b/web.jsf.editor/external/binaries-list
-index 3d8ea20..e69de29 100644
+index 3d8ea20ea..e69de29bb 100644
--- a/web.jsf.editor/external/binaries-list
+++ b/web.jsf.editor/external/binaries-list
@@ -1 +0,0 @@
-93A58E37BA1D014375B1578F3D904736CB2D408F jsf-api-docs.zip
diff --git a/web.jsf12/external/binaries-list b/web.jsf12/external/binaries-list
-index 3551756..e69de29 100644
+index 3551756c1..e69de29bb 100644
--- a/web.jsf12/external/binaries-list
+++ b/web.jsf12/external/binaries-list
@@ -1 +0,0 @@
-B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D jsf-1.2.zip
diff --git a/web.jsf20/external/binaries-list b/web.jsf20/external/binaries-list
-index ba72612..e69de29 100644
+index ba726127a..e69de29bb 100644
--- a/web.jsf20/external/binaries-list
+++ b/web.jsf20/external/binaries-list
@@ -1 +0,0 @@
-99277566601C4D5C2598B0206B5DC071932F3641 jsf-2.2.zip
diff --git a/web.jspparser/external/binaries-list b/web.jspparser/external/binaries-list
-index 4762c08..e69de29 100644
+index 4762c0887..e69de29bb 100644
--- a/web.jspparser/external/binaries-list
+++ b/web.jspparser/external/binaries-list
@@ -1 +0,0 @@
-33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4 glassfish-jspparser-4.0.jar
diff --git a/web.monitor/external/binaries-list b/web.monitor/external/binaries-list
-index f49f136..e69de29 100644
+index f49f136b1..e69de29bb 100644
--- a/web.monitor/external/binaries-list
+++ b/web.monitor/external/binaries-list
@@ -1 +0,0 @@
-2C033740B8F78C1081AF25C0173FC57317D2783A servlet-2.3.jar
diff --git a/web.primefaces/external/binaries-list b/web.primefaces/external/binaries-list
-index f4a6e45..e69de29 100644
+index f4a6e4540..e69de29bb 100644
--- a/web.primefaces/external/binaries-list
+++ b/web.primefaces/external/binaries-list
@@ -1 +0,0 @@
-065BDCE80509320280B3B5210FCDDAE9B7D50338 primefaces-5.0.jar
diff --git a/web.struts/external/binaries-list b/web.struts/external/binaries-list
-index 998a1a9..e69de29 100644
+index 998a1a964..e69de29bb 100644
--- a/web.struts/external/binaries-list
+++ b/web.struts/external/binaries-list
@@ -1,2 +0,0 @@
-9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469 struts-1.3.10-javadoc.zip
-9E226CFC08177A6666E5A2C535C25837A92C54C9 struts-1.3.10-lib.zip
diff --git a/websvc.jaxws21/external/binaries-list b/websvc.jaxws21/external/binaries-list
-index d48b7a1..e69de29 100644
+index d48b7a1df..e69de29bb 100644
--- a/websvc.jaxws21/external/binaries-list
+++ b/websvc.jaxws21/external/binaries-list
@@ -1,2 +0,0 @@
-84E2020E5499015E9F40D1212C86918264B89EB1 jaxws-2.2.6.zip
-8ECD169E9E308C258287E4F28B03B6D6F1E55F47 jaxws-api-doc.zip
diff --git a/websvc.jaxws21api/external/binaries-list b/websvc.jaxws21api/external/binaries-list
-index 3ba1cd2..e69de29 100644
+index 3ba1cd210..e69de29bb 100644
--- a/websvc.jaxws21api/external/binaries-list
+++ b/websvc.jaxws21api/external/binaries-list
@@ -1 +0,0 @@
-D64C40E770C95C2A6994081C00CCD489C0AA20C9 jaxws-2.2.6-api.zip
\ No newline at end of file
diff --git a/websvc.metro.lib/external/binaries-list b/websvc.metro.lib/external/binaries-list
-index 6465935..e69de29 100644
+index 64659354b..e69de29bb 100644
--- a/websvc.metro.lib/external/binaries-list
+++ b/websvc.metro.lib/external/binaries-list
@@ -1,2 +0,0 @@
-FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1 metro-1.4-doc.zip
-F05AE8173BC750ECF1B52AD1F80050226458E490 metro-2.0.zip
diff --git a/websvc.restlib/external/binaries-list b/websvc.restlib/external/binaries-list
-index 272c3c8..e69de29 100644
+index 272c3c8b4..e69de29bb 100644
--- a/websvc.restlib/external/binaries-list
+++ b/websvc.restlib/external/binaries-list
@@ -1 +0,0 @@
-C614ECF62381F88208D66D96146A8307781058DB jaxrs-ri-2.5.1.zip
diff --git a/xml.jaxb.api/external/binaries-list b/xml.jaxb.api/external/binaries-list
-index 4662210..e69de29 100644
+index 4662210e9..e69de29bb 100644
--- a/xml.jaxb.api/external/binaries-list
+++ b/xml.jaxb.api/external/binaries-list
@@ -1,3 +0,0 @@
diff --git a/debian/patches/netbeans-extexecution.impl.patch b/debian/patches/netbeans-extexecution.patch
similarity index 68%
rename from debian/patches/netbeans-extexecution.impl.patch
rename to debian/patches/netbeans-extexecution.patch
index caf0818..c237be9 100644
--- a/debian/patches/netbeans-extexecution.impl.patch
+++ b/debian/patches/netbeans-extexecution.patch
@@ -1,35 +1,32 @@
From: Markus Koschany <apo at debian.org>
-Date: Sat, 26 Dec 2015 00:11:06 +0100
-Subject: netbeans extexecution.impl
+Date: Thu, 8 Dec 2016 16:08:21 +0100
+Subject: netbeans extexecution
We don't build the extexecution.impl module.
Forwarded: not-needed
---
- extexecution.process/nbproject/project.properties | 6 +++---
- extexecution.process/nbproject/project.xml | 4 ++--
- .../org/netbeans/modules/extexecution/process/ProcessesImpl.java | 3 +--
- 3 files changed, 6 insertions(+), 7 deletions(-)
+ extexecution.process/nbproject/project.properties | 3 ---
+ extexecution.process/nbproject/project.xml | 4 ++--
+ .../src/org/netbeans/modules/extexecution/process/ProcessesImpl.java | 3 +--
+ 3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/extexecution.process/nbproject/project.properties b/extexecution.process/nbproject/project.properties
-index 4d9b43c..d5be2ba 100644
+index 94d136b4d..60bcb5829 100644
--- a/extexecution.process/nbproject/project.properties
+++ b/extexecution.process/nbproject/project.properties
-@@ -1,6 +1,6 @@
- is.eager=true
- javac.source=1.6
+@@ -38,6 +38,3 @@
+ is.autoload=true
+ javac.source=1.7
javac.compilerargs=-Xlint -Xlint:-serial
-release.external/winp-1.14-patched.jar=modules/ext/winp-1.14-patched.jar
-release.external/libpam4j-1.1.jar=modules/ext/libpam4j-1.1.jar
--release.external/processtreekiller-1.0.5.jar=modules/ext/processtreekiller-1.0.5.jar
-+#release.external/winp-1.14-patched.jar=modules/ext/winp-1.14-patched.jar
-+#release.external/libpam4j-1.1.jar=modules/ext/libpam4j-1.1.jar
-+#release.external/processtreekiller-1.0.5.jar=modules/ext/processtreekiller-1.0.5.jar
+-release.external/processtreekiller-1.0.7.jar=modules/ext/processtreekiller-1.0.7.jar
diff --git a/extexecution.process/nbproject/project.xml b/extexecution.process/nbproject/project.xml
-index 36199b1..13e0001 100644
+index 6ccb04150..672896732 100644
--- a/extexecution.process/nbproject/project.xml
+++ b/extexecution.process/nbproject/project.xml
-@@ -47,7 +47,7 @@
+@@ -86,7 +86,7 @@ Contributor(s):
</dependency>
</module-dependencies>
<public-packages/>
@@ -38,17 +35,17 @@ index 36199b1..13e0001 100644
<runtime-relative-path>ext/winp-1.14-patched.jar</runtime-relative-path>
<binary-origin>external/winp-1.14-patched.jar</binary-origin>
</class-path-extension>
-@@ -58,7 +58,7 @@
+@@ -97,7 +97,7 @@ Contributor(s):
<class-path-extension>
- <runtime-relative-path>ext/processtreekiller-1.0.5.jar</runtime-relative-path>
- <binary-origin>external/processtreekiller-1.0.5.jar</binary-origin>
+ <runtime-relative-path>ext/processtreekiller-1.0.7.jar</runtime-relative-path>
+ <binary-origin>external/processtreekiller-1.0.7.jar</binary-origin>
- </class-path-extension>
+ </class-path-extension>-->
</data>
</configuration>
</project>
diff --git a/extexecution.process/src/org/netbeans/modules/extexecution/process/ProcessesImpl.java b/extexecution.process/src/org/netbeans/modules/extexecution/process/ProcessesImpl.java
-index 8f75676..66d4301 100644
+index 5ac5d6d84..aed57825d 100644
--- a/extexecution.process/src/org/netbeans/modules/extexecution/process/ProcessesImpl.java
+++ b/extexecution.process/src/org/netbeans/modules/extexecution/process/ProcessesImpl.java
@@ -43,7 +43,6 @@
@@ -59,12 +56,12 @@ index 8f75676..66d4301 100644
import org.netbeans.spi.extexecution.base.ProcessesImplementation;
import org.openide.util.lookup.ServiceProvider;
-@@ -56,7 +55,7 @@ public class ProcessesImpl implements ProcessesImplementation {
-
+@@ -57,7 +56,7 @@ public class ProcessesImpl implements ProcessesImplementation {
@Override
public void killTree(Process process, Map<String, String> environment) {
-- ProcessTreeKiller.get().kill(process, environment);
-+ //ProcessTreeKiller.get().kill(process, environment);
- }
-
- }
+ try {
+- ProcessTreeKiller.get().kill(process, environment);
++ //ProcessTreeKiller.get().kill(process, environment);
+ } catch (LinkageError e) {
+ throw new UnsupportedOperationException(null, e);
+ }
diff --git a/debian/patches/netbeans-ide-launcher.patch b/debian/patches/netbeans-ide-launcher.patch
index ef6997c..78c2d06 100644
--- a/debian/patches/netbeans-ide-launcher.patch
+++ b/debian/patches/netbeans-ide-launcher.patch
@@ -1,6 +1,6 @@
From: Markus Koschany <apo at debian.org>
-Date: Sun, 27 Dec 2015 00:06:16 +0100
-Subject: netbeans ide launcher
+Date: Thu, 8 Dec 2016 00:04:11 +0100
+Subject: netbeans-ide-launcher
Update the launcher script to use Debian specific paths and start parameters.
Disable check for license agreement since we have debian/copyright for that in
@@ -8,15 +8,15 @@ Debian.
Forwarded: not-needed
---
- ide/launcher/netbeans.conf | 3 +--
- ide/launcher/unix/netbeans | 10 ++++------
- 2 files changed, 5 insertions(+), 8 deletions(-)
+ ide/launcher/netbeans.conf | 3 +--
+ ide/launcher/unix/netbeans | 9 ++++-----
+ 2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/ide/launcher/netbeans.conf b/ide/launcher/netbeans.conf
-index 3cdd3dc..96a12fc 100644
+index bfbd50780..1e2d6607f 100644
--- a/ide/launcher/netbeans.conf
+++ b/ide/launcher/netbeans.conf
-@@ -43,8 +43,7 @@ netbeans_default_cachedir="${DEFAULT_CACHEDIR_ROOT}/8.1"
+@@ -43,8 +43,7 @@ netbeans_default_cachedir="${DEFAULT_CACHEDIR_ROOT}/8.2"
# Concurrent Mark & Sweep garbage collector.
# (see http://wiki.netbeans.org/FaqGCPauses)
#
@@ -27,7 +27,7 @@ index 3cdd3dc..96a12fc 100644
# (set by installer or commented out if launcher should decide)
#
diff --git a/ide/launcher/unix/netbeans b/ide/launcher/unix/netbeans
-index 8218c36..acaa554 100644
+index 458e7ebc6..0af5cee91 100644
--- a/ide/launcher/unix/netbeans
+++ b/ide/launcher/unix/netbeans
@@ -57,7 +57,7 @@ while [ -h "$PRG" ]; do
@@ -39,7 +39,7 @@ index 8218c36..acaa554 100644
old=`pwd`
cd "$progdir"/..
basedir=`pwd`
-@@ -84,9 +84,9 @@ if [ -f "$basedir"/etc/netbeans.conf ] ; then
+@@ -82,9 +82,9 @@ if [ -f "$basedir"/etc/netbeans.conf ] ; then
fi
# following should be done just in RPM or Solaris Launcher
@@ -52,15 +52,7 @@ index 8218c36..acaa554 100644
export DEFAULT_USERDIR_ROOT
-@@ -236,7 +236,6 @@ case "`uname`" in
- --branding nb \
- --clusters '"$netbeans_clusters"' \
- -J-Dnetbeans.importclass=org.netbeans.upgrade.AutoUpgrade \
-- -J-Dnetbeans.accept_license_class=org.netbeans.license.AcceptLicense \
- ${netbeans_default_options} \
- '"$@"'
- ;;
-@@ -246,7 +245,6 @@ case "`uname`" in
+@@ -231,7 +231,6 @@ case "`uname`" in
--branding nb \
--clusters '"$netbeans_clusters"' \
-J-Dnetbeans.importclass=org.netbeans.upgrade.AutoUpgrade \
diff --git a/debian/patches/netbeans-javacc.patch b/debian/patches/netbeans-javacc.patch
index 43370c9..f5b21c3 100644
--- a/debian/patches/netbeans-javacc.patch
+++ b/debian/patches/netbeans-javacc.patch
@@ -1,6 +1,6 @@
From: Markus Koschany <apo at debian.org>
-Date: Mon, 8 Jun 2015 17:23:04 +0200
-Subject: netbeans javacc
+Date: Thu, 8 Dec 2016 00:06:50 +0100
+Subject: netbeans-javacc
Use Debian's system javacc.jar.
@@ -10,10 +10,10 @@ Forwarded: not-needed
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/db.sql.visualeditor/build.xml b/db.sql.visualeditor/build.xml
-index 456f782..aab434c 100644
+index 1037e8333..ac49aa066 100644
--- a/db.sql.visualeditor/build.xml
+++ b/db.sql.visualeditor/build.xml
-@@ -16,9 +16,9 @@
+@@ -55,9 +55,9 @@ Contributor(s):
<target name="sql">
<mkdir dir="build"/>
diff --git a/debian/patches/netbeans-lib.nbjavac.patch b/debian/patches/netbeans-lib.nbjavac.patch
new file mode 100644
index 0000000..d50cc0a
--- /dev/null
+++ b/debian/patches/netbeans-lib.nbjavac.patch
@@ -0,0 +1,71 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sun, 11 Dec 2016 17:56:25 +0100
+Subject: netbeans lib.nbjavac
+
+Another FTBFS due to a signature mismatch.
+
+Forwarded: not-needed
+---
+ .../src/org/netbeans/lib/nbjavac/services/NBClassReader.java | 8 ++++----
+ .../src/org/netbeans/lib/nbjavac/services/PartialReparser.java | 6 +++---
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBClassReader.java b/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBClassReader.java
+index 7e75d1183..4c39aa1ac 100644
+--- a/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBClassReader.java
++++ b/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBClassReader.java
+@@ -58,10 +58,10 @@ import com.sun.tools.javac.util.Names;
+ */
+ public class NBClassReader extends ClassReader {
+
+- public static void preRegister(Context context) {
++ public static void preRegister(Context context, final boolean loadDocEnv) {
+ context.put(classReaderKey, new Context.Factory<ClassReader>() {
+ public ClassReader make(Context c) {
+- return new NBClassReader(c);
++ return new NBClassReader(c, loadDocEnv);
+ }
+ });
+ }
+@@ -69,8 +69,8 @@ public class NBClassReader extends ClassReader {
+ private final Names names;
+ private final NBNames nbNames;
+
+- public NBClassReader(Context context) {
+- super(context);
++ public NBClassReader(Context context, boolean placeholder) {
++ super(context,placeholder);
+
+ names = Names.instance(context);
+ nbNames = NBNames.instance(context);
+diff --git a/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/PartialReparser.java b/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/PartialReparser.java
+index b5bb4a9c5..24eaf1c72 100644
+--- a/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/PartialReparser.java
++++ b/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/PartialReparser.java
+@@ -54,7 +54,7 @@ import com.sun.tools.javac.comp.Attr;
+ import com.sun.tools.javac.comp.AttrContext;
+ import com.sun.tools.javac.comp.Env;
+ import com.sun.tools.javac.comp.Flow;
+-import com.sun.tools.javac.comp.TypeEnter;
++import com.sun.tools.javac.comp.MemberEnter;
+ import com.sun.tools.javac.parser.JavacParser;
+ import com.sun.tools.javac.parser.LazyDocCommentTable;
+ import com.sun.tools.javac.tree.JCTree;
+@@ -119,7 +119,7 @@ public class PartialReparser {
+ JCMethodDecl tree = (JCMethodDecl) methodToReparse;
+ final Names names = Names.instance(context);
+ final Symtab syms = Symtab.instance(context);
+- final TypeEnter typeEnter = TypeEnter.instance(context);
++ final MemberEnter memberEnter = MemberEnter.instance(context);
+ final Log log = Log.instance(context);
+ final TreeMaker make = TreeMaker.instance(context);
+ final Env<AttrContext> env = attr.dupLocalEnv(((JCMethodDecl) methodToReparse).localEnv);
+@@ -128,7 +128,7 @@ public class PartialReparser {
+ JCBlock body = tree.body;
+ if (body.stats.isEmpty() || !TreeInfo.isSelfCall(body.stats.head)) {
+ body.stats = body.stats.
+- prepend(typeEnter.SuperCall(make.at(body.pos),
++ prepend(memberEnter.SuperCall(make.at(body.pos),
+ List.<Type>nil(),
+ List.<JCVariableDecl>nil(),
+ false));
diff --git a/debian/patches/netbeans-libs.jaxb.patch b/debian/patches/netbeans-libs.jaxb.patch
index be25dfc..febb2ea 100644
--- a/debian/patches/netbeans-libs.jaxb.patch
+++ b/debian/patches/netbeans-libs.jaxb.patch
@@ -1,6 +1,6 @@
From: Markus Koschany <apo at debian.org>
-Date: Wed, 10 Jun 2015 11:46:45 +0200
-Subject: netbeans libs.jaxb
+Date: Thu, 8 Dec 2016 00:07:36 +0100
+Subject: netbeans-libs.jaxb
Fix another FTBFS and use Debian's system jars.
@@ -10,7 +10,7 @@ Forwarded: not-needed
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libs.jaxb/nbproject/project.properties b/libs.jaxb/nbproject/project.properties
-index 299cbe2..e1de8b1 100644
+index 299cbe28c..e1de8b12f 100644
--- a/libs.jaxb/nbproject/project.properties
+++ b/libs.jaxb/nbproject/project.properties
@@ -52,10 +52,10 @@ jnlp.indirect.jars=\
diff --git a/debian/patches/netbeans-nocopy.patch b/debian/patches/netbeans-nocopy.patch
index c7904cd..f90a61b 100644
--- a/debian/patches/netbeans-nocopy.patch
+++ b/debian/patches/netbeans-nocopy.patch
@@ -1,6 +1,6 @@
From: Markus Koschany <apo at debian.org>
-Date: Fri, 25 Dec 2015 23:09:59 +0100
-Subject: netbeans nocopy
+Date: Thu, 8 Dec 2016 00:10:34 +0100
+Subject: netbeans-nocopy
Fix a FTBFS. Do not copy files which we don't use or are replaced by system jar
files.
@@ -17,7 +17,7 @@ Forwarded: not-needed
7 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/css.editor/nbproject/project.properties b/css.editor/nbproject/project.properties
-index 35a1046..ad38710 100644
+index 35a10464a..ad3871081 100644
--- a/css.editor/nbproject/project.properties
+++ b/css.editor/nbproject/project.properties
@@ -40,8 +40,8 @@
@@ -32,7 +32,7 @@ index 35a1046..ad38710 100644
jnlp.indirect.files=\
docs/css21-spec.zip,\
diff --git a/db.drivers/nbproject/project.properties b/db.drivers/nbproject/project.properties
-index 929aa22..d2f7131 100644
+index 825b9662c..87325c327 100644
--- a/db.drivers/nbproject/project.properties
+++ b/db.drivers/nbproject/project.properties
@@ -42,8 +42,8 @@
@@ -40,14 +40,14 @@ index 929aa22..d2f7131 100644
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.6
-release.external/mysql-connector-java-5.1.23-bin.jar=modules/ext/mysql-connector-java-5.1.23-bin.jar
--release.external/postgresql-9.2-1002.jdbc4.jar=modules/ext/postgresql-9.2-1002.jdbc4.jar
+-release.external/postgresql-9.4.1209.jar=modules/ext/postgresql-9.4.1209.jar
+#release.external/mysql-connector-java-5.1.23-bin.jar=modules/ext/mysql-connector-java-5.1.23-bin.jar
-+#release.external/postgresql-9.2-1002.jdbc4.jar=modules/ext/postgresql-9.2-1002.jdbc4.jar
++#release.external/postgresql-9.4.1209.jar=modules/ext/postgresql-9.4.1209.jar
jnlp.indirect.jars=\
modules/ext/mysql-connector-java-5.1.23-bin.jar,\
- modules/ext/postgresql-9.2-1002.jdbc4.jar
+ modules/ext/postgresql-9.4.1209.jar
diff --git a/derby/nbproject/project.properties b/derby/nbproject/project.properties
-index 4039fad..77f3494 100644
+index 4039fade9..77f349480 100644
--- a/derby/nbproject/project.properties
+++ b/derby/nbproject/project.properties
@@ -43,9 +43,9 @@
@@ -64,7 +64,7 @@ index 4039fad..77f3494 100644
test.config.stableBTD.includes=**/*Test.class
test.config.stableBTD.excludes=\
diff --git a/html.editor/nbproject/project.properties b/html.editor/nbproject/project.properties
-index bd9151b..bfe5d8c 100644
+index 2b641fd05..ea1cb068a 100644
--- a/html.editor/nbproject/project.properties
+++ b/html.editor/nbproject/project.properties
@@ -40,7 +40,7 @@
@@ -77,7 +77,7 @@ index bd9151b..bfe5d8c 100644
javac.compilerargs=-Xlint:unchecked
javac.source=1.7
diff --git a/j2ee.eclipselink/nbproject/project.properties b/j2ee.eclipselink/nbproject/project.properties
-index 53059dc..8ad821b 100644
+index 53059dc0f..8ad821b0a 100644
--- a/j2ee.eclipselink/nbproject/project.properties
+++ b/j2ee.eclipselink/nbproject/project.properties
@@ -46,10 +46,9 @@ javac.source=1.6
@@ -95,7 +95,7 @@ index 53059dc..8ad821b 100644
\ No newline at end of file
+#release.external/JPAjavadocs04032013.zip=modules/ext/docs/javax.persistence-2.1.0-doc.zip
diff --git a/libs.swingx/nbproject/project.properties b/libs.swingx/nbproject/project.properties
-index 077a5ea..b021baf 100644
+index 077a5ea2c..b021baf2e 100644
--- a/libs.swingx/nbproject/project.properties
+++ b/libs.swingx/nbproject/project.properties
@@ -40,6 +40,6 @@
@@ -107,15 +107,16 @@ index 077a5ea..b021baf 100644
sigtest.gen.fail.on.error=false
diff --git a/o.jdesktop.beansbinding/nbproject/project.properties b/o.jdesktop.beansbinding/nbproject/project.properties
-index d2951bb..9a40c4c 100644
+index cc03d1211..841ad7f43 100644
--- a/o.jdesktop.beansbinding/nbproject/project.properties
+++ b/o.jdesktop.beansbinding/nbproject/project.properties
-@@ -42,6 +42,6 @@
+@@ -41,7 +41,7 @@
+ # made subject to such option by the copyright holder.
is.autoload=true
- release.external/beansbinding-1.2.1.jar=modules/ext/beansbinding-1.2.1.jar
+-release.external/beansbinding-1.2.1.jar=modules/ext/beansbinding-1.2.1.jar
-release.external/beansbinding-1.2.1-doc.zip=docs/beansbinding-1.2.1-doc.zip
--jnlp.indirect.jars=docs/beansbinding-1.2.1-doc.zip
++#release.external/beansbinding-1.2.1.jar=modules/ext/beansbinding-1.2.1.jar
+#release.external/beansbinding-1.2.1-doc.zip=docs/beansbinding-1.2.1-doc.zip
-+#jnlp.indirect.jars=docs/beansbinding-1.2.1-doc.zip
- spec.version.base=1.26.1
+ jnlp.indirect.jars=docs/beansbinding-1.2.1-doc.zip
+ spec.version.base=1.27.1
diff --git a/debian/patches/netbeans-o.apache.tools.ant.module.patch b/debian/patches/netbeans-o.apache.tools.ant.module.patch
index 0e98295..07a1a5b 100644
--- a/debian/patches/netbeans-o.apache.tools.ant.module.patch
+++ b/debian/patches/netbeans-o.apache.tools.ant.module.patch
@@ -1,6 +1,6 @@
From: Markus Koschany <apo at debian.org>
-Date: Tue, 9 Jun 2015 19:06:47 +0200
-Subject: netbeans o.apache.tools.ant.module
+Date: Thu, 8 Dec 2016 00:11:29 +0100
+Subject: netbeans-o.apache.tools.ant.module
Use Debian's ant package and don't unzip the now non-existent embedded ant
version.
@@ -8,11 +8,11 @@ version.
Forwarded: not-needed
---
o.apache.tools.ant.module/build.xml | 4 ++--
- o.apache.tools.ant.module/external/build.xml | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
+ o.apache.tools.ant.module/external/build.xml | 1 -
+ 2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/o.apache.tools.ant.module/build.xml b/o.apache.tools.ant.module/build.xml
-index 9d8a0d7..e54585b 100644
+index f22f05997..8d5ffc952 100644
--- a/o.apache.tools.ant.module/build.xml
+++ b/o.apache.tools.ant.module/build.xml
@@ -79,14 +79,14 @@ made subject to such option by the copyright holder.
@@ -33,15 +33,14 @@ index 9d8a0d7..e54585b 100644
<target name="test-build" depends="jar-bridge,projectized-common.test-build"/>
diff --git a/o.apache.tools.ant.module/external/build.xml b/o.apache.tools.ant.module/external/build.xml
-index 3629c6b..516568d 100644
+index 75018201c..a0eb36db8 100644
--- a/o.apache.tools.ant.module/external/build.xml
+++ b/o.apache.tools.ant.module/external/build.xml
-@@ -45,7 +45,7 @@ made subject to such option by the copyright holder.
+@@ -45,7 +45,6 @@ made subject to such option by the copyright holder.
-->
<project name="o.apache.tools.ant.module/external" default="unzip" basedir=".">
<target name="unzip">
-- <unzip src="ant-libs-1.9.4.zip" dest="lib"/>
-+ <!-- <unzip src="ant-libs-1.9.4.zip" dest="lib"/>-->
+- <unzip src="ant-libs-1.9.7.zip" dest="lib"/>
</target>
<target name="clean">
<delete dir="lib"/>
diff --git a/debian/patches/netbeans-o.n.bootstrap.patch b/debian/patches/netbeans-o.n.bootstrap.patch
index f05eb06..3ad9a2b 100644
--- a/debian/patches/netbeans-o.n.bootstrap.patch
+++ b/debian/patches/netbeans-o.n.bootstrap.patch
@@ -1,6 +1,6 @@
From: Markus Koschany <apo at debian.org>
-Date: Fri, 25 Dec 2015 19:16:50 +0100
-Subject: netbeans o.n.bootstrap
+Date: Thu, 8 Dec 2016 00:11:58 +0100
+Subject: netbeans-o.n.bootstrap
Fixes another FTBFS. We do not build the platform packages with source:netbeans
and no windows launchers. Therefore we depend on libnb-platform-java and
@@ -12,7 +12,7 @@ Forwarded: not-needed
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/o.n.bootstrap/nbproject/project.properties b/o.n.bootstrap/nbproject/project.properties
-index bc67095..396d029 100644
+index bc670951f..396d02946 100644
--- a/o.n.bootstrap/nbproject/project.properties
+++ b/o.n.bootstrap/nbproject/project.properties
@@ -44,11 +44,11 @@ javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/debian/patches/netbeans-platform-disable-net.java-modules.patch b/debian/patches/netbeans-platform-disable-net.java-modules.patch
index 6625a76..9aa7b55 100644
--- a/debian/patches/netbeans-platform-disable-net.java-modules.patch
+++ b/debian/patches/netbeans-platform-disable-net.java-modules.patch
@@ -1,6 +1,6 @@
From: Markus Koschany <apo at debian.org>
-Date: Tue, 15 Dec 2015 16:54:49 +0100
-Subject: netbeans platform disable net.java modules
+Date: Sun, 23 Oct 2016 21:38:22 +0200
+Subject: netbeans platform disable-net.java modules
Disable the net.java.module because it is not available in Debian.
@@ -12,7 +12,7 @@ Forwarded: not-needed
3 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/nbbuild/build.properties b/nbbuild/build.properties
-index 8e3826a..3c780eb 100644
+index e0180b69a..bba35981b 100644
--- a/nbbuild/build.properties
+++ b/nbbuild/build.properties
@@ -99,7 +99,6 @@ javadoc.packages=\
@@ -24,10 +24,10 @@ index 8e3826a..3c780eb 100644
api.io,\
api.knockout,\
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
-index 9b1177a..36b0988 100644
+index 15a22d6ff..da9364eac 100644
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
-@@ -201,7 +201,6 @@ nb.cluster.platform.dir=platform
+@@ -205,7 +205,6 @@ nb.cluster.platform.dir=platform
nb.cluster.platform.depends=nb.cluster.bootstrap
nb.cluster.platform=\
api.annotations.common,\
@@ -35,7 +35,7 @@ index 9b1177a..36b0988 100644
api.intent,\
api.io,\
api.progress,\
-@@ -249,13 +248,6 @@ nb.cluster.platform=\
+@@ -253,13 +252,6 @@ nb.cluster.platform=\
masterfs.nio2,\
masterfs.ui,\
masterfs.windows,\
@@ -50,10 +50,10 @@ index 9b1177a..36b0988 100644
o.jdesktop.layout,\
o.n.core,\
diff --git a/net.java.html/build.xml b/net.java.html/build.xml
-index 9d4bc83..28f236f 100644
+index e9476b166..b152aaf23 100644
--- a/net.java.html/build.xml
+++ b/net.java.html/build.xml
-@@ -3,3 +3,4 @@
+@@ -42,3 +42,4 @@ Contributor(s):
<import file="../nbbuild/templates/projectized.xml"/>
<target name="jar"/>
</project>
diff --git a/debian/patches/netbeans-platform-empty-binaries-list.patch b/debian/patches/netbeans-platform-empty-binaries-list.patch
new file mode 100644
index 0000000..fbcf06f
--- /dev/null
+++ b/debian/patches/netbeans-platform-empty-binaries-list.patch
@@ -0,0 +1,196 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sun, 23 Oct 2016 19:27:56 +0200
+Subject: netbeans platform empty binaries list
+
+Empty all the binaries-list files so nothing gets downloaded.
+Forwarded: not-needed
+---
+ apisupport.harness/external/binaries-list | 4 ----
+ javahelp/external/binaries-list | 1 -
+ jemmy/external/binaries-list | 3 ---
+ junitlib/external/binaries-list | 2 --
+ libs.antlr3.devel/external/binaries-list | 1 -
+ libs.asm/external/binaries-list | 1 -
+ libs.felix/external/binaries-list | 1 -
+ libs.javafx/external/binaries-list | 1 -
+ libs.jna.platform/external/binaries-list | 1 -
+ libs.jna/external/binaries-list | 1 -
+ libs.junit4/external/binaries-list | 2 --
+ libs.osgi/external/binaries-list | 2 --
+ libs.testng/external/binaries-list | 2 --
+ nbbuild/external/binaries-list | 1 -
+ net.java.html.boot.fx/external/binaries-list | 1 -
+ net.java.html.boot.script/external/binaries-list | 1 -
+ net.java.html.boot/external/binaries-list | 1 -
+ net.java.html.geo/external/binaries-list | 1 -
+ net.java.html.json/external/binaries-list | 1 -
+ net.java.html.sound/external/binaries-list | 1 -
+ net.java.html/external/binaries-list | 1 -
+ netbinox/external/binaries-list | 1 -
+ o.jdesktop.layout/external/binaries-list | 3 ---
+ o.n.html.ko4j/external/binaries-list | 1 -
+ o.n.html.xhr4j/external/binaries-list | 1 -
+ 25 files changed, 36 deletions(-)
+
+diff --git a/apisupport.harness/external/binaries-list b/apisupport.harness/external/binaries-list
+index fb7dd1e70..e69de29bb 100644
+--- a/apisupport.harness/external/binaries-list
++++ b/apisupport.harness/external/binaries-list
+@@ -1,4 +0,0 @@
+-D4EF66C1CC8A5B3C97E0CC7C210227AAEC1F1086 jsearch-2.0_05.jar
+-A806D99716C5E9441BFD8B401176FDDEFC673022 bindex-2.2.jar
+-20D826CC819A5A969CF3F7204E2E26CB6263EC43 jnlp-servlet.jar
+-
+diff --git a/javahelp/external/binaries-list b/javahelp/external/binaries-list
+index 357a9389a..e69de29bb 100644
+--- a/javahelp/external/binaries-list
++++ b/javahelp/external/binaries-list
+@@ -1 +0,0 @@
+-CA70822C47A67FC3A11670270567C2D01566DAE1 jhall-2.0_05.jar
+diff --git a/jemmy/external/binaries-list b/jemmy/external/binaries-list
+index f3c2082d8..e69de29bb 100644
+--- a/jemmy/external/binaries-list
++++ b/jemmy/external/binaries-list
+@@ -1,3 +0,0 @@
+-D325D3913CBC0F9A8D73A466FABB98EDEEC014AB jemmy-2.3.1.1.jar
+-D06C8980C9025183C044202419EA29E69FBD4B99 jemmy-2.3.1.1-doc.zip
+-49197106637CCA8C337AF16CC01BB5D9DEC7E179 jemmy-2.3.1.1-src.zip
+\ No newline at end of file
+diff --git a/junitlib/external/binaries-list b/junitlib/external/binaries-list
+index bc0a58124..e69de29bb 100644
+--- a/junitlib/external/binaries-list
++++ b/junitlib/external/binaries-list
+@@ -1,2 +0,0 @@
+-A6C32B40BF3D76ECA54E3C601E5D1470C86FCDFA junit-4.12-sources.jar
+-941A8BE4506C65F0A9001C08812FB7DA1E505E21 junit-4.12-javadoc.jar
+diff --git a/libs.antlr3.devel/external/binaries-list b/libs.antlr3.devel/external/binaries-list
+index 87aff1084..e69de29bb 100644
+--- a/libs.antlr3.devel/external/binaries-list
++++ b/libs.antlr3.devel/external/binaries-list
+@@ -1 +0,0 @@
+-5CAB59D859CAA6598E28131D30DD2E89806DB57F antlr-3.4.jar
+diff --git a/libs.asm/external/binaries-list b/libs.asm/external/binaries-list
+index c982df12b..e69de29bb 100644
+--- a/libs.asm/external/binaries-list
++++ b/libs.asm/external/binaries-list
+@@ -1 +0,0 @@
+-2F7553F50B0D14ED811B849C282DA8C1FFC32AAE asm-all-5.0.1.jar
+diff --git a/libs.felix/external/binaries-list b/libs.felix/external/binaries-list
+index 1cac7b8cf..e69de29bb 100644
+--- a/libs.felix/external/binaries-list
++++ b/libs.felix/external/binaries-list
+@@ -1 +0,0 @@
+-1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7 felix-4.2.1.jar
+diff --git a/libs.javafx/external/binaries-list b/libs.javafx/external/binaries-list
+index b01c3197d..e69de29bb 100644
+--- a/libs.javafx/external/binaries-list
++++ b/libs.javafx/external/binaries-list
+@@ -1 +0,0 @@
+-5E40984A55F6FFF704F05D511A119CA5B456DDB1 jfxrt.jar
+diff --git a/libs.jna.platform/external/binaries-list b/libs.jna.platform/external/binaries-list
+index 5ff437e31..e69de29bb 100644
+--- a/libs.jna.platform/external/binaries-list
++++ b/libs.jna.platform/external/binaries-list
+@@ -1 +0,0 @@
+-030FA67B23CF2C0327A02CFAECBEF76A20160E7B jna-platform-4.2.2.jar
+diff --git a/libs.jna/external/binaries-list b/libs.jna/external/binaries-list
+index e9956c07f..e69de29bb 100644
+--- a/libs.jna/external/binaries-list
++++ b/libs.jna/external/binaries-list
+@@ -1 +0,0 @@
+-5012450AEE579C3118FF09461D5CE210E0CDC2A9 jna-4.2.2.jar
+diff --git a/libs.junit4/external/binaries-list b/libs.junit4/external/binaries-list
+index cf7e327a9..e69de29bb 100644
+--- a/libs.junit4/external/binaries-list
++++ b/libs.junit4/external/binaries-list
+@@ -1,2 +0,0 @@
+-2973D150C0DC1FEFE998F834810D68F278EA58EC junit-4.12.jar
+-42A25DC3219429F0E5D060061F71ACB49BF010A0 hamcrest-core-1.3.jar
+diff --git a/libs.osgi/external/binaries-list b/libs.osgi/external/binaries-list
+index c0ac1f0b1..e69de29bb 100644
+--- a/libs.osgi/external/binaries-list
++++ b/libs.osgi/external/binaries-list
+@@ -1,2 +0,0 @@
+-972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD osgi.cmpn-4.2.jar
+-2F2FBFF3FB80F91B159A7FA9F0C42A894BB8BCC5 osgi.core-5.0.0.jar
+diff --git a/libs.testng/external/binaries-list b/libs.testng/external/binaries-list
+index 574feaa70..e69de29bb 100644
+--- a/libs.testng/external/binaries-list
++++ b/libs.testng/external/binaries-list
+@@ -1,2 +0,0 @@
+-AC97B566699146713B3CF0ABC226B5C08EF7CF33 testng-6.8.1-dist.jar
+-AF022CBCACD8CBFCF946816441D1E7568D817745 testng-6.8.1-javadoc.zip
+diff --git a/nbbuild/external/binaries-list b/nbbuild/external/binaries-list
+index 64cf9255d..e69de29bb 100644
+--- a/nbbuild/external/binaries-list
++++ b/nbbuild/external/binaries-list
+@@ -1 +0,0 @@
+-A7674A6D78B7FEA58AF76B357DAE6EA5E3FDFBE9 apitest.jar
+diff --git a/net.java.html.boot.fx/external/binaries-list b/net.java.html.boot.fx/external/binaries-list
+index 1eb90a239..e69de29bb 100644
+--- a/net.java.html.boot.fx/external/binaries-list
++++ b/net.java.html.boot.fx/external/binaries-list
+@@ -1 +0,0 @@
+-5C992BAEC0111EE293BD44173140A9D8EC860765 net.java.html.boot.fx-1.3.jar
+diff --git a/net.java.html.boot.script/external/binaries-list b/net.java.html.boot.script/external/binaries-list
+index cbed82317..e69de29bb 100644
+--- a/net.java.html.boot.script/external/binaries-list
++++ b/net.java.html.boot.script/external/binaries-list
+@@ -1 +0,0 @@
+-BF6C9BB0FFB78A6B846ECAEB880C460D883B4F72 net.java.html.boot.script-1.3.jar
+diff --git a/net.java.html.boot/external/binaries-list b/net.java.html.boot/external/binaries-list
+index 9fc4a4e14..e69de29bb 100644
+--- a/net.java.html.boot/external/binaries-list
++++ b/net.java.html.boot/external/binaries-list
+@@ -1 +0,0 @@
+-7FC91530F4395FA0D58F9539F3B40858E766BFA3 net.java.html.boot-1.3.jar
+diff --git a/net.java.html.geo/external/binaries-list b/net.java.html.geo/external/binaries-list
+index fd5a521b1..e69de29bb 100644
+--- a/net.java.html.geo/external/binaries-list
++++ b/net.java.html.geo/external/binaries-list
+@@ -1 +0,0 @@
+-10E4214A89082C70FCF9F721953001C0932037BA net.java.html.geo-1.3.jar
+diff --git a/net.java.html.json/external/binaries-list b/net.java.html.json/external/binaries-list
+index 33950742e..e69de29bb 100644
+--- a/net.java.html.json/external/binaries-list
++++ b/net.java.html.json/external/binaries-list
+@@ -1 +0,0 @@
+-D97314CE1869DD3B8B8942256A70673E2991C9DD net.java.html.json-1.3.jar
+diff --git a/net.java.html.sound/external/binaries-list b/net.java.html.sound/external/binaries-list
+index 5036b8382..e69de29bb 100644
+--- a/net.java.html.sound/external/binaries-list
++++ b/net.java.html.sound/external/binaries-list
+@@ -1 +0,0 @@
+-6BDCE8349F83CD02F2942D4FBFA86A81A129F42A net.java.html.sound-1.3.jar
+diff --git a/net.java.html/external/binaries-list b/net.java.html/external/binaries-list
+index 1326b9d55..e69de29bb 100644
+--- a/net.java.html/external/binaries-list
++++ b/net.java.html/external/binaries-list
+@@ -1 +0,0 @@
+-A3085BAA78C8EE7F55081E70C79ABE04CA38CE93 net.java.html-1.3.jar
+diff --git a/netbinox/external/binaries-list b/netbinox/external/binaries-list
+index c81a802d3..e69de29bb 100644
+--- a/netbinox/external/binaries-list
++++ b/netbinox/external/binaries-list
+@@ -1 +0,0 @@
+-E5DDC5E827D3D62E7BE9F7E32927CA01F2839971 org.eclipse.osgi_3.9.1.v20140110-1610.jar
+diff --git a/o.jdesktop.layout/external/binaries-list b/o.jdesktop.layout/external/binaries-list
+index 1d6b722d9..e69de29bb 100644
+--- a/o.jdesktop.layout/external/binaries-list
++++ b/o.jdesktop.layout/external/binaries-list
+@@ -1,3 +0,0 @@
+-1C7FE319052EF49126CF07D0DB6953CB7007229E swing-layout-1.0.4-doc.zip
+-69D72835E165439CF7816EFDA65868FD4E0C6E2A swing-layout-1.0.4.jar
+-D2503D2217868ABAE1A5E7480A9CCA1DB3522464 swing-layout-1.0.4-src.zip
+diff --git a/o.n.html.ko4j/external/binaries-list b/o.n.html.ko4j/external/binaries-list
+index 6459050ac..e69de29bb 100644
+--- a/o.n.html.ko4j/external/binaries-list
++++ b/o.n.html.ko4j/external/binaries-list
+@@ -1 +0,0 @@
+-771CDCA0A3F2F3CE818E20CC2D707A3592422485 ko4j-1.3.jar
+diff --git a/o.n.html.xhr4j/external/binaries-list b/o.n.html.xhr4j/external/binaries-list
+index 78f94ebaf..e69de29bb 100644
+--- a/o.n.html.xhr4j/external/binaries-list
++++ b/o.n.html.xhr4j/external/binaries-list
+@@ -1 +0,0 @@
+-CEC2829EC391CB404AD32EB2D08F879C418B745B xhr4j-1.3.jar
diff --git a/debian/patches/netbeans-jemmy.patch b/debian/patches/netbeans-platform-jemmy.patch
similarity index 89%
rename from debian/patches/netbeans-jemmy.patch
rename to debian/patches/netbeans-platform-jemmy.patch
index d34259a..7188f9e 100644
--- a/debian/patches/netbeans-jemmy.patch
+++ b/debian/patches/netbeans-platform-jemmy.patch
@@ -1,6 +1,6 @@
From: Markus Koschany <apo at debian.org>
-Date: Fri, 25 Dec 2015 20:13:03 +0100
-Subject: netbeans jemmy
+Date: Tue, 2 Jun 2015 13:48:04 +0200
+Subject: netbeans platform jemmy
We don't include zips of the jemmy doc or src. Otherwise this would cause a
FTBFS.
@@ -11,7 +11,7 @@ Forwarded: not-needed
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/jemmy/nbproject/project.properties b/jemmy/nbproject/project.properties
-index ab73fe9..f15365d 100644
+index ab73fe935..f15365df6 100644
--- a/jemmy/nbproject/project.properties
+++ b/jemmy/nbproject/project.properties
@@ -43,7 +43,7 @@ is.autoload=true
diff --git a/debian/patches/netbeans-platform-junitlib.patch b/debian/patches/netbeans-platform-junitlib.patch
index df95cf1..2ed9e43 100644
--- a/debian/patches/netbeans-platform-junitlib.patch
+++ b/debian/patches/netbeans-platform-junitlib.patch
@@ -1,5 +1,5 @@
From: Markus Koschany <apo at debian.org>
-Date: Tue, 15 Dec 2015 18:21:48 +0100
+Date: Sun, 23 Oct 2016 21:39:15 +0200
Subject: netbeans platform junitlib
We don't include source or javadoc jars of junit4. This is to prevent a FTBFS.
@@ -10,10 +10,10 @@ Forwarded: not-needed
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/junitlib/nbproject/project.properties b/junitlib/nbproject/project.properties
-index e6f478f..d7ba938 100644
+index 987f66cd1..34ca737cd 100644
--- a/junitlib/nbproject/project.properties
+++ b/junitlib/nbproject/project.properties
-@@ -1,8 +1,8 @@
+@@ -38,8 +38,8 @@
is.autoload=true
javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/debian/patches/netbeans-platform-nbi.patch b/debian/patches/netbeans-platform-nbi.patch
index e063c53..eab5745 100644
--- a/debian/patches/netbeans-platform-nbi.patch
+++ b/debian/patches/netbeans-platform-nbi.patch
@@ -1,18 +1,19 @@
From: Markus Koschany <apo at debian.org>
-Date: Mon, 1 Jun 2015 13:42:24 +0200
-Subject: netbeans platform nbi
+Date: Sun, 23 Oct 2016 21:39:48 +0200
+Subject: netbeans-platform-nbi
+
+Don't build Netbeans' Installer modules.
-Don't build the Netbeans Installer modules.
Forwarded: not-needed
---
nbbuild/cluster.properties | 2 --
1 file changed, 2 deletions(-)
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
-index 36b0988..776c7d4 100644
+index da9364eac..e044d5970 100644
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
-@@ -875,8 +875,6 @@ nb.cluster.harness=\
+@@ -880,8 +880,6 @@ nb.cluster.harness=\
apisupport.harness,\
jellytools.platform,\
jemmy,\
diff --git a/debian/patches/netbeans-platform-nojnabinaries.patch b/debian/patches/netbeans-platform-nojnabinaries.patch
index 7644cee..55d66fa 100644
--- a/debian/patches/netbeans-platform-nojnabinaries.patch
+++ b/debian/patches/netbeans-platform-nojnabinaries.patch
@@ -1,69 +1,57 @@
From: Markus Koschany <apo at debian.org>
-Date: Mon, 1 Jun 2015 14:21:49 +0200
+Date: Thu, 27 Oct 2016 22:45:50 +0200
Subject: netbeans platform nojnabinaries
We don't need to install any JNA binaries, since they're already installed.
+
Forwarded: not-needed
---
- libs.jna.platform/nbproject/project.properties | 2 +-
- libs.jna/nbproject/project.properties | 24 +++++++++++------------
+ libs.jna.platform/nbproject/project.properties | 1 -
+ libs.jna/nbproject/project.properties | 13 -------------
libs.jna/src/org/netbeans/libs/jna/Installer.java | 2 +-
- 3 files changed, 14 insertions(+), 14 deletions(-)
+ 3 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/libs.jna.platform/nbproject/project.properties b/libs.jna.platform/nbproject/project.properties
-index b8afdb4..608ea2b 100644
+index c8688d841..47f49256b 100644
--- a/libs.jna.platform/nbproject/project.properties
+++ b/libs.jna.platform/nbproject/project.properties
-@@ -42,5 +42,5 @@
+@@ -42,5 +42,4 @@
is.autoload=true
javac.source=1.6
--release.external/jna-platform-4.1.0.jar=modules/ext/jna-platform-4.1.0.jar
-+#release.external/jna-platform-4.1.0.jar=modules/ext/jna-platform-4.1.0.jar
+-release.external/jna-platform-4.2.2.jar=modules/ext/jna-platform-4.2.2.jar
sigtest.gen.fail.on.error=false
diff --git a/libs.jna/nbproject/project.properties b/libs.jna/nbproject/project.properties
-index c6de368..0a8e520 100644
+index 280023666..a4ce0d93e 100644
--- a/libs.jna/nbproject/project.properties
+++ b/libs.jna/nbproject/project.properties
-@@ -41,17 +41,17 @@
+@@ -41,17 +41,4 @@
# made subject to such option by the copyright holder.
javac.source=1.6
--release.external/jna-4.1.0.jar=modules/ext/jna-4.1.0.jar
-+#release.external/jna-4.1.0.jar=modules/ext/jna-4.1.0.jar
- # Do not forget to rename native libs being extracted from the JAR when upgrading the JNA library, and patch org.netbeans.libs.jna.Installer as well.
--release.external/jna-4.1.0.jar!/com/sun/jna/darwin/libjnidispatch.jnilib=modules/lib/libjnidispatch-410.jnilib
--release.external/jna-4.1.0.jar!/com/sun/jna/linux-x86-64/libjnidispatch.so=modules/lib/amd64/linux/libjnidispatch-410.so
--release.external/jna-4.1.0.jar!/com/sun/jna/linux-x86/libjnidispatch.so=modules/lib/i386/linux/libjnidispatch-410.so
--release.external/jna-4.1.0.jar!/com/sun/jna/win32-x86-64/jnidispatch.dll=modules/lib/amd64/jnidispatch-410.dll
--release.external/jna-4.1.0.jar!/com/sun/jna/win32-x86/jnidispatch.dll=modules/lib/x86/jnidispatch-410.dll
+-release.external/jna-4.2.2.jar=modules/ext/jna-4.2.2.jar
+-# Do not forget to rename native libs being extracted from the JAR when upgrading the JNA library, and patch org.netbeans.libs.jna.Installer as well.
+-release.external/jna-4.2.2.jar!/com/sun/jna/darwin/libjnidispatch.jnilib=modules/lib/libjnidispatch-422.jnilib
+-release.external/jna-4.2.2.jar!/com/sun/jna/linux-x86-64/libjnidispatch.so=modules/lib/amd64/linux/libjnidispatch-422.so
+-release.external/jna-4.2.2.jar!/com/sun/jna/linux-x86/libjnidispatch.so=modules/lib/i386/linux/libjnidispatch-422.so
+-release.external/jna-4.2.2.jar!/com/sun/jna/win32-x86-64/jnidispatch.dll=modules/lib/amd64/jnidispatch-422.dll
+-release.external/jna-4.2.2.jar!/com/sun/jna/win32-x86/jnidispatch.dll=modules/lib/x86/jnidispatch-422.dll
-jnlp.verify.excludes=\
-- modules/lib/amd64/jnidispatch-410.dll,\
-- modules/lib/amd64/linux/libjnidispatch-410.so,\
-- modules/lib/i386/linux/libjnidispatch-410.so,\
-- modules/lib/x86/jnidispatch-410.dll,\
-- modules/lib/libjnidispatch-410.jnilib
-+#release.external/jna-4.1.0.jar!/com/sun/jna/darwin/libjnidispatch.jnilib=modules/lib/libjnidispatch-410.jnilib
-+#release.external/jna-4.1.0.jar!/com/sun/jna/linux-x86-64/libjnidispatch.so=modules/lib/amd64/linux/libjnidispatch-410.so
-+#release.external/jna-4.1.0.jar!/com/sun/jna/linux-x86/libjnidispatch.so=modules/lib/i386/linux/libjnidispatch-410.so
-+#release.external/jna-4.1.0.jar!/com/sun/jna/win32-x86-64/jnidispatch.dll=modules/lib/amd64/jnidispatch-410.dll
-+#release.external/jna-4.1.0.jar!/com/sun/jna/win32-x86/jnidispatch.dll=modules/lib/x86/jnidispatch-410.dll
-+#jnlp.verify.excludes=\
-+# modules/lib/amd64/jnidispatch-410.dll,\
-+# modules/lib/amd64/linux/libjnidispatch-410.so,\
-+# modules/lib/i386/linux/libjnidispatch-410.so,\
-+# modules/lib/x86/jnidispatch-410.dll,\
-+# modules/lib/libjnidispatch-410.jnilib
+- modules/lib/amd64/jnidispatch-422.dll,\
+- modules/lib/amd64/linux/libjnidispatch-422.so,\
+- modules/lib/i386/linux/libjnidispatch-422.so,\
+- modules/lib/x86/jnidispatch-422.dll,\
+- modules/lib/libjnidispatch-422.jnilib
sigtest.gen.fail.on.error=false
diff --git a/libs.jna/src/org/netbeans/libs/jna/Installer.java b/libs.jna/src/org/netbeans/libs/jna/Installer.java
-index cf306a7..fa3201f 100644
+index 58c0c3538..fa3201f9b 100644
--- a/libs.jna/src/org/netbeans/libs/jna/Installer.java
+++ b/libs.jna/src/org/netbeans/libs/jna/Installer.java
@@ -50,6 +50,6 @@ public class Installer extends ModuleInstall {
public void validate() {
super.validate();
//#211655
-- System.setProperty( "jna.boot.library.name", "jnidispatch-410" ); //NOI18N
+- System.setProperty( "jna.boot.library.name", "jnidispatch-422" ); //NOI18N
+ System.setProperty( "jna.boot.library.name", "jnidispatch" ); //NOI18N
}
}
diff --git a/debian/patches/netbeans-platform-o.n.html.ko4j.patch b/debian/patches/netbeans-platform-o.n.html.ko4j.patch
index 15467a3..4ec6f97 100644
--- a/debian/patches/netbeans-platform-o.n.html.ko4j.patch
+++ b/debian/patches/netbeans-platform-o.n.html.ko4j.patch
@@ -1,8 +1,8 @@
From: Markus Koschany <apo at debian.org>
-Date: Tue, 15 Dec 2015 19:21:45 +0100
+Date: Sun, 23 Oct 2016 22:32:41 +0200
Subject: netbeans platform o.n.html.ko4j
-Disable the o.n.html.ko4j module similar to net.java.html.
+Disable the o.n.html.jo4j module.
Forwarded: not-needed
---
@@ -10,18 +10,18 @@ Forwarded: not-needed
1 file changed, 2 deletions(-)
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
-index 776c7d4..4d3337a 100644
+index e044d5970..05d3f3d77 100644
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
-@@ -251,7 +251,6 @@ nb.cluster.platform=\
+@@ -255,7 +255,6 @@ nb.cluster.platform=\
netbinox,\
o.jdesktop.layout,\
o.n.core,\
- o.n.html.ko4j,\
+ o.n.html.xhr4j,\
o.n.swing.outline,\
o.n.swing.plaf,\
- o.n.swing.tabcontrol,\
-@@ -282,7 +281,6 @@ nb.cluster.platform=\
+@@ -287,7 +286,6 @@ nb.cluster.platform=\
spi.actions,\
spi.quicksearch,\
templates,\
diff --git a/debian/patches/netbeans-platform-properties.patch b/debian/patches/netbeans-platform-properties.patch
index 049aeef..1689fcd 100644
--- a/debian/patches/netbeans-platform-properties.patch
+++ b/debian/patches/netbeans-platform-properties.patch
@@ -1,9 +1,9 @@
From: Markus Koschany <apo at debian.org>
-Date: Fri, 25 Dec 2015 20:03:02 +0100
+Date: Mon, 1 Jun 2015 19:35:45 +0200
Subject: netbeans platform properties
-We don't include the swing layout source zip or testng javadoc.
-Otherwise this would cause a FTBFS.
+We don't include the swing layout source zip. Otherwise this would cause a
+FTBFS.
Forwarded: not-needed
---
@@ -12,7 +12,7 @@ Forwarded: not-needed
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libs.testng/nbproject/project.properties b/libs.testng/nbproject/project.properties
-index 4d3caca..9d9f860 100644
+index 4d3caca2e..9d9f86069 100644
--- a/libs.testng/nbproject/project.properties
+++ b/libs.testng/nbproject/project.properties
@@ -42,7 +42,7 @@
@@ -25,7 +25,7 @@ index 4d3caca..9d9f860 100644
sigtest.fail.on.error=false
jnlp.indirect.jars=\
diff --git a/o.jdesktop.layout/nbproject/project.properties b/o.jdesktop.layout/nbproject/project.properties
-index bf2a43b..015c254 100644
+index bf2a43b9f..015c2542e 100644
--- a/o.jdesktop.layout/nbproject/project.properties
+++ b/o.jdesktop.layout/nbproject/project.properties
@@ -42,6 +42,6 @@
diff --git a/debian/patches/netbeans-platform-windowslauncher.patch b/debian/patches/netbeans-platform-windowslauncher.patch
deleted file mode 100644
index 9ee464f..0000000
--- a/debian/patches/netbeans-platform-windowslauncher.patch
+++ /dev/null
@@ -1,379 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Tue, 15 Dec 2015 01:23:09 +0100
-Subject: netbeans platform windowslauncher
-
-Use mingw32 to build the windows launchers. These are useful if the Netbeans
-platform is used to build another application on Debian which you want to be
-able to run on a Windows system.
-
-Forwarded: not-needed
----
- apisupport.harness/windows-launcher-src/Makefile | 7 ++---
- .../nbproject/Makefile-app.exe.mk | 24 ++++++++---------
- .../nbproject/Makefile-app64.exe.mk | 16 ++++++------
- ide/launcher/windows/nblauncher.cpp | 1 +
- o.n.bootstrap/launcher/windows/Makefile | 18 +++++--------
- .../launcher/windows/nbproject/Makefile-nbexec.mk | 30 +++++++++++-----------
- .../windows/nbproject/Makefile-nbexec64.mk | 26 +++++++++----------
- o.n.bootstrap/launcher/windows/utilsfuncs.cpp | 1 +
- 8 files changed, 61 insertions(+), 62 deletions(-)
-
-diff --git a/apisupport.harness/windows-launcher-src/Makefile b/apisupport.harness/windows-launcher-src/Makefile
-index c7d6f5e..f5499dc 100644
---- a/apisupport.harness/windows-launcher-src/Makefile
-+++ b/apisupport.harness/windows-launcher-src/Makefile
-@@ -17,7 +17,7 @@
- MKDIR=mkdir
- CP=cp
- CCADMIN=CCadmin
--RANLIB=ranlib
-+RANLIB=i686-w64-mingw32-ranlib
-
-
-
-@@ -28,10 +28,10 @@ build: .build-post
- # Add your pre 'build' code here...
-
- .build-pre-app.exe: app.rc
-- windres -oapp.res -Ocoff app.rc
-+ i686-w64-mingw32-windres -oapp.res -Ocoff app.rc
-
- .build-pre-app64.exe: app.rc
-- x86_64-w64-mingw32-windres.exe -oapp64.res -Ocoff app.rc
-+ x86_64-w64-mingw32-windres -oapp64.res -Ocoff app.rc
-
- .build-post: .build-impl
- # Add your post 'build' code here...
-@@ -40,6 +40,7 @@ build: .build-post
-
- # clean
- clean: .clean-post
-+ -rm -f app.res app64.res
-
- .clean-pre:
- # Add your pre 'clean' code here...
-diff --git a/apisupport.harness/windows-launcher-src/nbproject/Makefile-app.exe.mk b/apisupport.harness/windows-launcher-src/nbproject/Makefile-app.exe.mk
-index c96635b..3859387 100644
---- a/apisupport.harness/windows-launcher-src/nbproject/Makefile-app.exe.mk
-+++ b/apisupport.harness/windows-launcher-src/nbproject/Makefile-app.exe.mk
-@@ -13,12 +13,12 @@ CP=cp
- GREP=grep
- NM=nm
- CCADMIN=CCadmin
--RANLIB=ranlib
--CC=gcc.exe
--CCC=g++.exe
--CXX=g++.exe
--FC=gfortran
--AS=as.exe
-+RANLIB=i686-w64-mingw32-ranlib
-+CC=
-+CCC=i686-w64-mingw32-g++
-+CXX=i686-w64-mingw32-g++
-+FC=
-+AS=i686-w64-mingw32-as
-
- # Macros
- CND_PLATFORM=Cygwin-Windows
-@@ -45,8 +45,8 @@ OBJECTFILES= \
- CFLAGS=
-
- # CC Compiler Flags
--CCFLAGS=-m32 -mno-cygwin
--CXXFLAGS=-m32 -mno-cygwin
-+CCFLAGS=-m32
-+CXXFLAGS=-m32
-
- # Fortran Compiler Flags
- FFLAGS=
-@@ -68,22 +68,22 @@ LDLIBSOPTIONS=app.res
- ${OBJECTDIR}/applauncher.o: applauncher.cpp
- ${MKDIR} -p ${OBJECTDIR}
- ${RM} $@.d
-- $(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -MMD -MP -MF $@.d -o ${OBJECTDIR}/applauncher.o applauncher.cpp
-+ $(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/applauncher.o applauncher.cpp
-
- ${OBJECTDIR}/_ext/493252820/utilsfuncs.o: ../../o.n.bootstrap/launcher/windows/utilsfuncs.cpp
- ${MKDIR} -p ${OBJECTDIR}/_ext/493252820
- ${RM} $@.d
-- $(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/493252820/utilsfuncs.o ../../o.n.bootstrap/launcher/windows/utilsfuncs.cpp
-+ $(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/493252820/utilsfuncs.o ../../o.n.bootstrap/launcher/windows/utilsfuncs.cpp
-
- ${OBJECTDIR}/_ext/216238457/nblauncher.o: ../../ide/launcher/windows/nblauncher.cpp
- ${MKDIR} -p ${OBJECTDIR}/_ext/216238457
- ${RM} $@.d
-- $(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/216238457/nblauncher.o ../../ide/launcher/windows/nblauncher.cpp
-+ $(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/216238457/nblauncher.o ../../ide/launcher/windows/nblauncher.cpp
-
- ${OBJECTDIR}/app.o: app.cpp
- ${MKDIR} -p ${OBJECTDIR}
- ${RM} $@.d
-- $(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -MMD -MP -MF $@.d -o ${OBJECTDIR}/app.o app.cpp
-+ $(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/app.o app.cpp
-
- # Subprojects
- .build-subprojects:
-diff --git a/apisupport.harness/windows-launcher-src/nbproject/Makefile-app64.exe.mk b/apisupport.harness/windows-launcher-src/nbproject/Makefile-app64.exe.mk
-index e35d1ac..2922e6a 100644
---- a/apisupport.harness/windows-launcher-src/nbproject/Makefile-app64.exe.mk
-+++ b/apisupport.harness/windows-launcher-src/nbproject/Makefile-app64.exe.mk
-@@ -13,12 +13,12 @@ CP=cp
- GREP=grep
- NM=nm
- CCADMIN=CCadmin
--RANLIB=ranlib
--CC=x86_64-w64-mingw32-gcc.exe
--CCC=x86_64-w64-mingw32-g++.exe
--CXX=x86_64-w64-mingw32-g++.exe
--FC=gfortran
--AS=as.exe
-+RANLIB=x86_64-w64-mingw32-ranlib
-+CC=x86_64-w64-mingw32-gcc
-+CCC=x86_64-w64-mingw32-g++
-+CXX=x86_64-w64-mingw32-g++
-+FC=
-+AS=x86_64-w64-mingw32-as
-
- # Macros
- CND_PLATFORM=Cygwin64-Windows
-@@ -45,8 +45,8 @@ OBJECTFILES= \
- CFLAGS=
-
- # CC Compiler Flags
--CCFLAGS=-m64 -mno-cygwin -static-libgcc -static-libstdc++
--CXXFLAGS=-m64 -mno-cygwin -static-libgcc -static-libstdc++
-+CCFLAGS=-m64 -static-libgcc -static-libstdc++
-+CXXFLAGS=-m64 -static-libgcc -static-libstdc++
-
- # Fortran Compiler Flags
- FFLAGS=
-diff --git a/ide/launcher/windows/nblauncher.cpp b/ide/launcher/windows/nblauncher.cpp
-index 97c15ba..a1a5967 100644
---- a/ide/launcher/windows/nblauncher.cpp
-+++ b/ide/launcher/windows/nblauncher.cpp
-@@ -53,6 +53,7 @@
- #include "../../../o.n.bootstrap/launcher/windows/utilsfuncs.h"
- #include "../../../o.n.bootstrap/launcher/windows/argnames.h"
- #include "../../../o.n.bootstrap/launcher/windows/nbexecloader.h"
-+#include <stdio.h>
-
- using namespace std;
-
-diff --git a/o.n.bootstrap/launcher/windows/Makefile b/o.n.bootstrap/launcher/windows/Makefile
-index 990aafa..2f78df1 100644
---- a/o.n.bootstrap/launcher/windows/Makefile
-+++ b/o.n.bootstrap/launcher/windows/Makefile
-@@ -15,7 +15,7 @@
- MKDIR=mkdir
- CP=cp
- CCADMIN=CCadmin
--RANLIB=ranlib
-+RANLIB=i686-w64-mingw32-ranlib
-
-
-
-@@ -26,16 +26,12 @@ build: .build-post-$(CONF)
- # Add your pre 'build' code here...
-
- .build-post-nbexec: .build-impl nbexecexe.cpp nbexecloader.h utilsfuncs.cpp nbexec_exe.rc
-- windres.exe -Ocoff nbexec_exe.rc nbexec_exe.res
-- g++ -s -mno-cygwin -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-seh -DNBEXEC_DLL=\"nbexec.dll\" nbexecexe.cpp utilsfuncs.cpp nbexec_exe.res -o nbexec.exe
-- cp nbexec.exe ../../../nbbuild/netbeans/platform/lib/
-- cp nbexec.dll ../../../nbbuild/netbeans/platform/lib/
--
-+ i686-w64-mingw32-windres -Ocoff nbexec_exe.rc nbexec_exe.res
-+ i686-w64-mingw32-g++ -s -DNBEXEC_DLL=\"nbexec.dll\" nbexecexe.cpp utilsfuncs.cpp nbexec_exe.res -o nbexec.exe
-+
- .build-post-nbexec64: .build-impl nbexecexe.cpp nbexecloader.h utilsfuncs.cpp nbexec_exe.rc
-- x86_64-w64-mingw32-windres.exe -Ocoff nbexec_exe.rc nbexec_exe64.res
-- x86_64-w64-mingw32-g++.exe -m64 -s -mno-cygwin -Wl,--nxcompat -Wl,--dynamicbase -DNBEXEC_DLL=\"nbexec64.dll\" -static-libgcc -static-libstdc++ nbexecexe.cpp utilsfuncs.cpp nbexec_exe64.res -o nbexec64.exe
-- cp nbexec64.exe ../../../nbbuild/netbeans/platform/lib/
-- cp nbexec64.dll ../../../nbbuild/netbeans/platform/lib/
-+ x86_64-w64-mingw32-windres -Ocoff nbexec_exe.rc nbexec_exe64.res
-+ x86_64-w64-mingw32-g++ -m64 -s -DNBEXEC_DLL=\"nbexec64.dll\" -static-libgcc -static-libstdc++ nbexecexe.cpp utilsfuncs.cpp nbexec_exe64.res -o nbexec64.exe
-
-
-
-@@ -46,7 +42,7 @@ clean: .clean-post-$(CONF)
- # Add your pre 'clean' code here...
-
- .clean-post-nbexec: .clean-impl
-- rm -f nbexec_exe32.res nbexec32.exe
-+ rm -f nbexec_exe32.res nbexec.exe
-
- .clean-post-nbexec64: .clean-impl
- rm -f nbexec_exe64.res nbexec64.exe
-diff --git a/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk b/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk
-index 7b5163b..961e7dc 100644
---- a/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk
-+++ b/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk
-@@ -13,12 +13,12 @@ CP=cp
- GREP=grep
- NM=nm
- CCADMIN=CCadmin
--RANLIB=ranlib
--CC=gcc
--CCC=g++
--CXX=g++
--FC=gfortran
--AS=as
-+RANLIB=i686-w64-mingw32-ranlib
-+CC=
-+CCC=i686-w64-mingw32-g++
-+CXX=i686-w64-mingw32-g++
-+FC=
-+AS=i686-w64-mingw32-as
-
- # Macros
- CND_PLATFORM=Cygwin-Windows
-@@ -46,8 +46,8 @@ OBJECTFILES= \
- CFLAGS=
-
- # CC Compiler Flags
--CCFLAGS=-m32 -mno-cygwin
--CXXFLAGS=-m32 -mno-cygwin
-+CCFLAGS=-m32
-+CXXFLAGS=-m32
-
- # Fortran Compiler Flags
- FFLAGS=
-@@ -65,22 +65,22 @@ LDLIBSOPTIONS=${OBJECTDIR}/nbexec.res
- nbexec.dll: ${OBJECTDIR}/nbexec.res
-
- nbexec.dll: ${OBJECTFILES}
-- ${LINK.cc} -o nbexec.dll ${OBJECTFILES} ${LDLIBSOPTIONS} -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-seh -mno-cygwin -shared
-+ ${LINK.cc} -o nbexec.dll ${OBJECTFILES} ${LDLIBSOPTIONS} -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-seh -shared
-
- ${OBJECTDIR}/jvmlauncher.o: jvmlauncher.cpp
- ${MKDIR} -p ${OBJECTDIR}
- ${RM} "$@.d"
-- $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/jvmlauncher.o jvmlauncher.cpp
-+ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/jvmlauncher.o jvmlauncher.cpp
-
- ${OBJECTDIR}/nbexec.o: nbexec.cpp
- ${MKDIR} -p ${OBJECTDIR}
- ${RM} "$@.d"
-- $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/nbexec.o nbexec.cpp
-+ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/nbexec.o nbexec.cpp
-
- ${OBJECTDIR}/nbexec.res: nbexec.rc version.h
- ${MKDIR} -p ${OBJECTDIR}
- @echo Compiling Resource files...
-- windres.exe -Ocoff nbexec.rc ${OBJECTDIR}/nbexec.res
-+ i686-w64-mingw32-windres -Ocoff nbexec.rc ${OBJECTDIR}/nbexec.res
-
- : nbexec_exe.rc
- @echo
-@@ -89,17 +89,17 @@ ${OBJECTDIR}/nbexec.res: nbexec.rc version.h
- ${OBJECTDIR}/nbexecexe.o: nbexecexe.cpp
- ${MKDIR} -p ${OBJECTDIR}
- ${RM} "$@.d"
-- $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/nbexecexe.o nbexecexe.cpp
-+ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/nbexecexe.o nbexecexe.cpp
-
- ${OBJECTDIR}/platformlauncher.o: platformlauncher.cpp
- ${MKDIR} -p ${OBJECTDIR}
- ${RM} "$@.d"
-- $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/platformlauncher.o platformlauncher.cpp
-+ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/platformlauncher.o platformlauncher.cpp
-
- ${OBJECTDIR}/utilsfuncs.o: utilsfuncs.cpp
- ${MKDIR} -p ${OBJECTDIR}
- ${RM} "$@.d"
-- $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/utilsfuncs.o utilsfuncs.cpp
-+ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/utilsfuncs.o utilsfuncs.cpp
-
- # Subprojects
- .build-subprojects:
-diff --git a/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec64.mk b/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec64.mk
-index 7fb819e..485127e 100644
---- a/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec64.mk
-+++ b/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec64.mk
-@@ -13,12 +13,12 @@ CP=cp
- GREP=grep
- NM=nm
- CCADMIN=CCadmin
--RANLIB=ranlib
--CC=x86_64-w64-mingw32-gcc
-+RANLIB=x86_64-w64-mingw32-ranlib
-+CC=
- CCC=x86_64-w64-mingw32-g++
- CXX=x86_64-w64-mingw32-g++
--FC=gfortran
--AS=as
-+FC=
-+AS=x86_64-w64-mingw32-as
-
- # Macros
- CND_PLATFORM=Cygwin64-Windows
-@@ -46,8 +46,8 @@ OBJECTFILES= \
- CFLAGS=
-
- # CC Compiler Flags
--CCFLAGS=-m64 -mno-cygwin -static-libgcc -static-libstdc++
--CXXFLAGS=-m64 -mno-cygwin -static-libgcc -static-libstdc++
-+CCFLAGS=-m64 -static-libgcc -static-libstdc++
-+CXXFLAGS=-m64 -static-libgcc -static-libstdc++
-
- # Fortran Compiler Flags
- FFLAGS=
-@@ -65,22 +65,22 @@ LDLIBSOPTIONS=${OBJECTDIR}/nbexec64.res
- nbexec64.dll: ${OBJECTDIR}/nbexec64.res
-
- nbexec64.dll: ${OBJECTFILES}
-- ${LINK.cc} -o nbexec64.dll ${OBJECTFILES} ${LDLIBSOPTIONS} -Wl,--nxcompat -Wl,--dynamicbase -mno-cygwin -shared
-+ ${LINK.cc} -o nbexec64.dll ${OBJECTFILES} ${LDLIBSOPTIONS} -Wl,--nxcompat -Wl,--dynamicbase -shared
-
- ${OBJECTDIR}/jvmlauncher.o: jvmlauncher.cpp
- ${MKDIR} -p ${OBJECTDIR}
- ${RM} "$@.d"
-- $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/jvmlauncher.o jvmlauncher.cpp
-+ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/jvmlauncher.o jvmlauncher.cpp
-
- ${OBJECTDIR}/nbexec.o: nbexec.cpp
- ${MKDIR} -p ${OBJECTDIR}
- ${RM} "$@.d"
-- $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/nbexec.o nbexec.cpp
-+ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/nbexec.o nbexec.cpp
-
- ${OBJECTDIR}/nbexec64.res: nbexec.rc version.h
- ${MKDIR} -p ${OBJECTDIR}
- @echo Compiling Resource files...
-- x86_64-w64-mingw32-windres.exe -Ocoff nbexec.rc ${OBJECTDIR}/nbexec64.res
-+ x86_64-w64-mingw32-windres -Ocoff nbexec.rc ${OBJECTDIR}/nbexec64.res
-
- : nbexec_exe.rc
- @echo
-@@ -89,17 +89,17 @@ ${OBJECTDIR}/nbexec64.res: nbexec.rc version.h
- ${OBJECTDIR}/nbexecexe.o: nbexecexe.cpp
- ${MKDIR} -p ${OBJECTDIR}
- ${RM} "$@.d"
-- $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/nbexecexe.o nbexecexe.cpp
-+ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/nbexecexe.o nbexecexe.cpp
-
- ${OBJECTDIR}/platformlauncher.o: platformlauncher.cpp
- ${MKDIR} -p ${OBJECTDIR}
- ${RM} "$@.d"
-- $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/platformlauncher.o platformlauncher.cpp
-+ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/platformlauncher.o platformlauncher.cpp
-
- ${OBJECTDIR}/utilsfuncs.o: utilsfuncs.cpp
- ${MKDIR} -p ${OBJECTDIR}
- ${RM} "$@.d"
-- $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/utilsfuncs.o utilsfuncs.cpp
-+ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/utilsfuncs.o utilsfuncs.cpp
-
- # Subprojects
- .build-subprojects:
-diff --git a/o.n.bootstrap/launcher/windows/utilsfuncs.cpp b/o.n.bootstrap/launcher/windows/utilsfuncs.cpp
-index 21f947f..0193220 100644
---- a/o.n.bootstrap/launcher/windows/utilsfuncs.cpp
-+++ b/o.n.bootstrap/launcher/windows/utilsfuncs.cpp
-@@ -52,6 +52,7 @@
- #include "argnames.h"
- #include <tlhelp32.h>
- #include <windows.h>
-+#include <stdio.h>
-
- using namespace std;
-
diff --git a/debian/patches/netbeans-slf4j.dummy.patch b/debian/patches/netbeans-slf4j.dummy.patch
index 4e173f7..bd3b127 100644
--- a/debian/patches/netbeans-slf4j.dummy.patch
+++ b/debian/patches/netbeans-slf4j.dummy.patch
@@ -1,11 +1,11 @@
From: Markus Koschany <apo at debian.org>
-Date: Sun, 27 Dec 2015 01:05:12 +0100
-Subject: netbeans slf4j.dummy
+Date: Thu, 8 Dec 2016 00:13:29 +0100
+Subject: netbeans-slf4j.dummy
Fix a runtime error when loading the o.eclipse.jgit module. The bundle expects
the org.slf4j package but it is not exported by other packages. Hence we have
-to create a dummy package similar to javaewah.dummy in 8.0.2. Other methods like
-symlinking slf4j to the same directory or the ext/ directory did not work.
+to create a dummy package similar to javaewah.dummy in 8.0.2. Other methods
+like symlinking slf4j to the same directory or the ext/ directory did not work.
Another solution would be to remove org.slf4j from the MANIFEST.MF file of the
o.eclipse.jgit module. The slf4j-dummy.jar in /usr/share/netbeans/ide/modules/
is later replaced by a symlink to Debian's system package of slf4j.
@@ -22,10 +22,10 @@ Forwarded: not-needed
create mode 100644 slf4j.dummy/nbproject/project.xml
diff --git a/o.eclipse.jgit/nbproject/project.xml b/o.eclipse.jgit/nbproject/project.xml
-index f31a978..0925156 100644
+index 382b4060c..00107979a 100644
--- a/o.eclipse.jgit/nbproject/project.xml
+++ b/o.eclipse.jgit/nbproject/project.xml
-@@ -17,6 +17,11 @@
+@@ -56,6 +56,11 @@ Contributor(s):
<specification-version>0.6.12</specification-version>
</run-dependency>
</dependency>
@@ -39,7 +39,7 @@ index f31a978..0925156 100644
<class-path-extension>
diff --git a/slf4j.dummy/build.xml b/slf4j.dummy/build.xml
new file mode 100644
-index 0000000..34be746
+index 000000000..b7663bc2f
--- /dev/null
+++ b/slf4j.dummy/build.xml
@@ -0,0 +1,12 @@
@@ -57,14 +57,14 @@ index 0000000..34be746
+</project>
diff --git a/slf4j.dummy/manifest.mf b/slf4j.dummy/manifest.mf
new file mode 100644
-index 0000000..74571ad
+index 000000000..74571ada4
--- /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
+index 000000000..53962c81e
--- /dev/null
+++ b/slf4j.dummy/nbproject/project.xml
@@ -0,0 +1,15 @@
diff --git a/debian/patches/netbeans-small-ide.patch b/debian/patches/netbeans-small-ide.patch
index fb3594f..65618de 100644
--- a/debian/patches/netbeans-small-ide.patch
+++ b/debian/patches/netbeans-small-ide.patch
@@ -1,23 +1,23 @@
From: Markus Koschany <apo at debian.org>
-Date: Fri, 25 Dec 2015 23:47:02 +0100
-Subject: netbeans small ide
+Date: Thu, 8 Dec 2016 00:15:34 +0100
+Subject: netbeans-small-ide
Don't include all modules in the build but only those which we can support.
Forwarded: not-needed
---
apisupport.kit/nbproject/project.xml | 4 ++--
- editor.kit/nbproject/project.xml | 8 ++++----
+ editor.kit/nbproject/project.xml | 4 ++--
ide.kit/nbproject/project.xml | 4 ++--
java.kit/nbproject/project.xml | 4 ++--
xsl/nbproject/project.xml | 4 ++--
- 5 files changed, 12 insertions(+), 12 deletions(-)
+ 5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/apisupport.kit/nbproject/project.xml b/apisupport.kit/nbproject/project.xml
-index a2f9bc8..8c29310 100644
+index 9032ba2b6..cd6ecbeab 100644
--- a/apisupport.kit/nbproject/project.xml
+++ b/apisupport.kit/nbproject/project.xml
-@@ -17,7 +17,7 @@
+@@ -56,7 +56,7 @@ Contributor(s):
<specification-version>1.0</specification-version>
</run-dependency>
</dependency>
@@ -26,7 +26,7 @@ index a2f9bc8..8c29310 100644
<code-name-base>org.netbeans.modules.apisupport.feedreader</code-name-base>
<run-dependency>
<release-version>1</release-version>
-@@ -35,7 +35,7 @@
+@@ -74,7 +74,7 @@ Contributor(s):
<run-dependency>
<specification-version>1.0</specification-version>
</run-dependency>
@@ -36,10 +36,10 @@ index a2f9bc8..8c29310 100644
<code-name-base>org.netbeans.modules.apisupport.osgidemo</code-name-base>
<run-dependency>
diff --git a/editor.kit/nbproject/project.xml b/editor.kit/nbproject/project.xml
-index ca4a1bd..2d42be1 100644
+index a68b4d8de..f8e158256 100644
--- a/editor.kit/nbproject/project.xml
+++ b/editor.kit/nbproject/project.xml
-@@ -46,13 +46,13 @@
+@@ -85,13 +85,13 @@ Contributor(s):
<specification-version>1.1</specification-version>
</run-dependency>
</dependency>
@@ -55,27 +55,11 @@ index ca4a1bd..2d42be1 100644
<dependency>
<code-name-base>org.netbeans.modules.image</code-name-base>
<run-dependency>
-@@ -60,13 +60,13 @@
- <specification-version>1.19</specification-version>
- </run-dependency>
- </dependency>
-- <dependency>
-+ <!--<dependency>
- <code-name-base>org.netbeans.modules.javascript2.kit</code-name-base>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>0.1</specification-version>
- </run-dependency>
-- </dependency>
-+ </dependency>-->
- <dependency>
- <code-name-base>org.netbeans.modules.languages.diff</code-name-base>
- <run-dependency>
diff --git a/ide.kit/nbproject/project.xml b/ide.kit/nbproject/project.xml
-index 16d140e..e48c62b 100644
+index 4d54a6478..d4fbcd95b 100644
--- a/ide.kit/nbproject/project.xml
+++ b/ide.kit/nbproject/project.xml
-@@ -160,13 +160,13 @@
+@@ -199,13 +199,13 @@ Contributor(s):
<specification-version>1.11</specification-version>
</run-dependency>
</dependency>
@@ -92,7 +76,7 @@ index 16d140e..e48c62b 100644
<code-name-base>org.netbeans.modules.jumpto</code-name-base>
<run-dependency>
diff --git a/java.kit/nbproject/project.xml b/java.kit/nbproject/project.xml
-index e2acd54..69e9be8 100644
+index e2acd547d..69e9be83c 100644
--- a/java.kit/nbproject/project.xml
+++ b/java.kit/nbproject/project.xml
@@ -275,7 +275,7 @@ made subject to such option by the copyright holder.
@@ -114,7 +98,7 @@ index e2acd54..69e9be8 100644
<code-name-base>org.netbeans.modules.xml.jaxb</code-name-base>
<run-dependency>
diff --git a/xsl/nbproject/project.xml b/xsl/nbproject/project.xml
-index 16e1d5f..cba4bd1 100644
+index 16e1d5f03..cba4bd19d 100644
--- a/xsl/nbproject/project.xml
+++ b/xsl/nbproject/project.xml
@@ -249,11 +249,11 @@ made subject to such option by the copyright holder.
diff --git a/debian/patches/netbeans-spi.java.hints.patch b/debian/patches/netbeans-spi.java.hints.patch
index a0eb7a9..133146e 100644
--- a/debian/patches/netbeans-spi.java.hints.patch
+++ b/debian/patches/netbeans-spi.java.hints.patch
@@ -1,6 +1,6 @@
From: Markus Koschany <apo at debian.org>
-Date: Tue, 9 Jun 2015 20:16:52 +0200
-Subject: netbeans spi.java.hints
+Date: Thu, 8 Dec 2016 00:19:05 +0100
+Subject: netbeans-spi.java.hints
Fix another FTBFS
@@ -10,10 +10,10 @@ Forwarded: not-needed
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/Utilities.java b/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/Utilities.java
-index 8b98f4f..3248033 100644
+index 4861fb07c..ef23abdb9 100644
--- a/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/Utilities.java
+++ b/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/Utilities.java
-@@ -1575,9 +1575,9 @@ public class Utilities {
+@@ -1582,9 +1582,9 @@ public class Utilities {
@Override public int getEndPos(JCTree tree) {
return (int) sp.getEndPosition(null, tree);
}
diff --git a/debian/patches/netbeans-svnclientadapter.patch b/debian/patches/netbeans-svnclientadapter.patch
index 4b005af..2659a1b 100644
--- a/debian/patches/netbeans-svnclientadapter.patch
+++ b/debian/patches/netbeans-svnclientadapter.patch
@@ -1,13 +1,14 @@
From: Markus Koschany <apo at debian.org>
-Date: Mon, 22 Feb 2016 15:02:33 +0100
+Date: Sun, 11 Dec 2016 17:04:52 +0100
Subject: netbeans svnclientadapter
+Forwarded: not-needed
---
.../libs/svnclientadapter/svnkit/SvnKitClientAdapterFactory.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libs.svnClientAdapter.svnkit/src/org/netbeans/libs/svnclientadapter/svnkit/SvnKitClientAdapterFactory.java b/libs.svnClientAdapter.svnkit/src/org/netbeans/libs/svnclientadapter/svnkit/SvnKitClientAdapterFactory.java
-index 5fdbd4c..ade5a32 100644
+index 5fdbd4c7d..ade5a322d 100644
--- a/libs.svnClientAdapter.svnkit/src/org/netbeans/libs/svnclientadapter/svnkit/SvnKitClientAdapterFactory.java
+++ b/libs.svnClientAdapter.svnkit/src/org/netbeans/libs/svnclientadapter/svnkit/SvnKitClientAdapterFactory.java
@@ -85,8 +85,8 @@ public class SvnKitClientAdapterFactory extends SvnClientAdapterFactory {
diff --git a/debian/patches/netbeans-updatecenters.patch b/debian/patches/netbeans-updatecenters.patch
index cabc8f7..1d56e6f 100644
--- a/debian/patches/netbeans-updatecenters.patch
+++ b/debian/patches/netbeans-updatecenters.patch
@@ -1,6 +1,6 @@
From: Markus Koschany <apo at debian.org>
-Date: Fri, 12 Jun 2015 22:44:34 +0200
-Subject: netbeans updatecenters
+Date: Thu, 8 Dec 2016 00:19:40 +0100
+Subject: netbeans-updatecenters
Disable the updatecenters by default. Let users opt-in if they want to download
and update plugins.
@@ -11,7 +11,7 @@ Forwarded: not-needed
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml b/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml
-index 6ea6ac0..63b4a60 100644
+index 80cd10ad9..a18cdec3e 100644
--- a/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml
+++ b/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml
@@ -55,7 +55,7 @@ made subject to such option by the copyright holder.
diff --git a/debian/patches/netbeans-wildUpperBound.patch b/debian/patches/netbeans-wildUpperBound.patch
index 6df3585..522a8b0 100644
--- a/debian/patches/netbeans-wildUpperBound.patch
+++ b/debian/patches/netbeans-wildUpperBound.patch
@@ -1,6 +1,6 @@
From: Markus Koschany <apo at debian.org>
-Date: Sat, 26 Dec 2015 19:47:10 +0100
-Subject: netbeans wildUpperBound
+Date: Thu, 8 Dec 2016 00:19:58 +0100
+Subject: netbeans-wildUpperBound
Fix a FTBFS due to missing method wildUpperBound.
@@ -10,10 +10,10 @@ Forwarded: not-needed
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/java.source.base/src/org/netbeans/api/java/source/SourceUtils.java b/java.source.base/src/org/netbeans/api/java/source/SourceUtils.java
-index 66ed321..e666f42 100644
+index 7aa939115..7cc5de6e7 100644
--- a/java.source.base/src/org/netbeans/api/java/source/SourceUtils.java
+++ b/java.source.base/src/org/netbeans/api/java/source/SourceUtils.java
-@@ -188,9 +188,9 @@ public class SourceUtils {
+@@ -191,9 +191,9 @@ public class SourceUtils {
return info.getTypes().isAssignable(t.getUpperBound(), to)
|| info.getTypes().isAssignable(to, t.getUpperBound());
}
diff --git a/debian/patches/netbeans-xml.jaxb.api.patch b/debian/patches/netbeans-xml.jaxb.api.patch
index 62226c6..bbc89ff 100644
--- a/debian/patches/netbeans-xml.jaxb.api.patch
+++ b/debian/patches/netbeans-xml.jaxb.api.patch
@@ -1,6 +1,6 @@
From: Markus Koschany <apo at debian.org>
-Date: Wed, 10 Jun 2015 12:34:04 +0200
-Subject: netbeans xml.jaxb.api
+Date: Thu, 8 Dec 2016 00:20:15 +0100
+Subject: netbeans-xml.jaxb.api
Fix another FTBFS. activation.jar and jsr173_1.0_api.jar are not required on
Debian systems because we support Java7 already.
@@ -11,7 +11,7 @@ Forwarded: not-needed
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/xml.jaxb.api/nbproject/project.properties b/xml.jaxb.api/nbproject/project.properties
-index 4356623..74e65d3 100644
+index 435662351..74e65d37f 100644
--- a/xml.jaxb.api/nbproject/project.properties
+++ b/xml.jaxb.api/nbproject/project.properties
@@ -47,8 +47,8 @@ jnlp.indirect.jars=\
diff --git a/debian/patches/netbeans-xsl-httpserver.patch b/debian/patches/netbeans-xsl-httpserver.patch
index 13c73db..c26c2a3 100644
--- a/debian/patches/netbeans-xsl-httpserver.patch
+++ b/debian/patches/netbeans-xsl-httpserver.patch
@@ -1,6 +1,6 @@
From: Markus Koschany <apo at debian.org>
-Date: Sun, 27 Dec 2015 00:33:38 +0100
-Subject: netbeans xsl httpserver
+Date: Thu, 8 Dec 2016 00:20:33 +0100
+Subject: netbeans-xsl-httpserver
Do not require the httpserver module since it is disabled.
Fixes a runtime error. Without this patch most base modules cannot be loaded.
@@ -11,7 +11,7 @@ Forwarded: not-needed
1 file changed, 1 deletion(-)
diff --git a/xsl/manifest.mf b/xsl/manifest.mf
-index 640b690..30b312f 100644
+index b2339a3be..558bf6a12 100644
--- a/xsl/manifest.mf
+++ b/xsl/manifest.mf
@@ -2,6 +2,5 @@ Manifest-Version: 1.0
@@ -20,4 +20,4 @@ index 640b690..30b312f 100644
OpenIDE-Module-Layer: org/netbeans/modules/xsl/resources/mf-layer.xml
-OpenIDE-Module-Requires: org.openide.util.HttpServer$Impl
AutoUpdate-Show-In-Client: false
- OpenIDE-Module-Specification-Version: 1.42.1
+ OpenIDE-Module-Specification-Version: 1.43.1
diff --git a/debian/patches/osgi-update.patch b/debian/patches/osgi-update.patch
index d429140..bbea4af 100644
--- a/debian/patches/osgi-update.patch
+++ b/debian/patches/osgi-update.patch
@@ -1,6 +1,6 @@
From: Markus Koschany <apo at debian.org>
-Date: Mon, 1 Jun 2015 20:52:04 +0200
-Subject: osgi update
+Date: Thu, 8 Dec 2016 14:52:00 +0100
+Subject: osgi-update
Implement missing methods or correct parameter changes due to the latest OSGi
upgrade. It may be possible to drop this patch in the future, when upstream
@@ -13,7 +13,7 @@ Forwarded: not-needed
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/netbinox/src/org/netbeans/modules/netbinox/JarBundleFile.java b/netbinox/src/org/netbeans/modules/netbinox/JarBundleFile.java
-index d97a2cd..37846b0 100644
+index 8d71aefc4..0d8aa8b29 100644
--- a/netbinox/src/org/netbeans/modules/netbinox/JarBundleFile.java
+++ b/netbinox/src/org/netbeans/modules/netbinox/JarBundleFile.java
@@ -128,7 +128,7 @@ final class JarBundleFile extends BundleFile implements BundleContent {
@@ -26,7 +26,7 @@ index d97a2cd..37846b0 100644
} catch (IOException dirEx) {
NetbinoxFactory.LOG.log(Level.WARNING,
diff --git a/netbinox/src/org/netbeans/modules/netbinox/Netbinox.java b/netbinox/src/org/netbeans/modules/netbinox/Netbinox.java
-index 89c1357..77a70d3 100644
+index 64bfcd4ec..83e49ff02 100644
--- a/netbinox/src/org/netbeans/modules/netbinox/Netbinox.java
+++ b/netbinox/src/org/netbeans/modules/netbinox/Netbinox.java
@@ -61,6 +61,8 @@ import org.osgi.framework.InvalidSyntaxException;
diff --git a/debian/patches/reproducible-build.patch b/debian/patches/reproducible-build.patch
index 5685639..e82a633 100644
--- a/debian/patches/reproducible-build.patch
+++ b/debian/patches/reproducible-build.patch
@@ -1,5 +1,5 @@
From: Markus Koschany <apo at debian.org>
-Date: Sat, 20 Jun 2015 18:47:58 +0200
+Date: Thu, 8 Dec 2016 14:52:12 +0100
Subject: reproducible build
Make the build reproducible by using a fixed value for install_time.
@@ -10,7 +10,7 @@ Forwarded: not-needed
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/UpdateTracking.java b/nbbuild/antsrc/org/netbeans/nbbuild/UpdateTracking.java
-index 30b0f0a..fdb836d 100644
+index 30b0f0a81..fdb836deb 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/UpdateTracking.java
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/UpdateTracking.java
@@ -526,7 +526,7 @@ class UpdateTracking {
diff --git a/debian/patches/series b/debian/patches/series
index ead1990..a34d693 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,35 +1,36 @@
netbeans-platform-disable-net.java-modules.patch
-netbeans-empty-binaries-list.patch
+netbeans-platform-empty-binaries-list.patch
+netbeans-platform-jemmy.patch
netbeans-platform-junitlib.patch
netbeans-platform-nbi.patch
netbeans-platform-nojnabinaries.patch
netbeans-platform-o.n.html.ko4j.patch
-netbeans-platform-windowslauncher.patch
-osgi-update.patch
-netbeans-javacc.patch
-netbeans-commons-net.patch
-netbeans-o.apache.tools.ant.module.patch
-netbeans-spi.java.hints.patch
-netbeans-libs.jaxb.patch
-netbeans-xml.jaxb.api.patch
-netbeans-build.patch
-netbeans-updatecenters.patch
-reproducible-build.patch
-netbeans-cluster-properties.patch
-netbeans-o.n.bootstrap.patch
netbeans-platform-properties.patch
-netbeans-jemmy.patch
+netbeans-empty-binaries-list.patch
antlr-3.5.2.patch
-netbeans-nocopy.patch
db.dataview-setRowFilter-method.patch
-netbeans-small-ide.patch
-netbeans-dlight.nativeexecution.patch
-netbeans-extexecution.impl.patch
javaewah-version.patch
-netbeans-wildUpperBound.patch
-netbeans-com.sun.tools.hc.patch
+netbeans-build.patch
+netbeans-cluster-properties.patch
netbeans-CommandLineParser.patch
+netbeans-commons-net.patch
+netbeans-com.sun.tools.hc.patch
+netbeans-dlight.nativeexecution.patch
netbeans-ide-launcher.patch
+netbeans-javacc.patch
+netbeans-libs.jaxb.patch
+netbeans-nocopy.patch
+netbeans-o.apache.tools.ant.module.patch
+netbeans-o.n.bootstrap.patch
+netbeans-slf4j.dummy.patch
+netbeans-small-ide.patch
+netbeans-spi.java.hints.patch
+netbeans-updatecenters.patch
+netbeans-wildUpperBound.patch
+netbeans-xml.jaxb.api.patch
netbeans-xsl-httpserver.patch
+osgi-update.patch
+reproducible-build.patch
+netbeans-extexecution.patch
netbeans-svnclientadapter.patch
-netbeans-slf4j.dummy.patch
+netbeans-lib.nbjavac.patch
diff --git a/debian/rules b/debian/rules
index 4020e32..9216cb6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,7 +44,7 @@ define symlink
endef
%:
- dh $@ --parallel --with javahelper
+ dh $@ --with javahelper
override_dh_auto_build:
--
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