[libnb-platform-java] 04/23: Update debian dir. Rebase patches.
Markus Koschany
apo-guest at moszumanska.debian.org
Tue Jun 2 13:46:02 UTC 2015
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository libnb-platform-java.
commit ab86c5cb308d597b42b2f4d0b6eacc8c7e4ae152
Author: Markus Koschany <apo at gambaru.de>
Date: Mon Jun 1 18:48:21 2015 +0200
Update debian dir. Rebase patches.
---
debian/changelog | 6 +
debian/control | 150 +++++---
debian/copyright | 58 +--
.../netbeans-platform-empty-binaries-list.patch | 118 ++++++
debian/patches/netbeans-platform-nbi.patch | 21 ++
.../patches/netbeans-platform-nojnabinaries.patch | 52 +++
.../netbeans-platform-windowslauncher.patch | 401 +++++++++++++++++++++
.../netbeans-platform~classfile-version.patch | 13 -
.../netbeans-platform~empty-binaries-list.patch | 67 ----
.../patches/netbeans-platform~include-extras.patch | 48 ---
debian/patches/netbeans-platform~jemmy.patch | 14 -
debian/patches/netbeans-platform~launcher.patch | 13 -
debian/patches/netbeans-platform~nbi.patch | 13 -
.../patches/netbeans-platform~nojnabinaries.patch | 41 ---
debian/patches/netbeans-platform~properties.patch | 24 --
debian/patches/netbeans-platform~suitebuild.patch | 14 -
.../netbeans-platform~windowslauncher.patch | 341 ------------------
debian/patches/series | 14 +-
debian/rules | 4 +-
19 files changed, 735 insertions(+), 677 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index febaeb0..a24040c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libnb-platform18-java (8.0.2+dfsg1-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+
+ -- Markus Koschany <apo at gambaru.de> Mon, 01 Jun 2015 03:48:02 +0200
+
libnb-platform18-java (7.4+dfsg1-2) unstable; urgency=medium
* Team upload.
diff --git a/debian/control b/debian/control
index ec0e0bf..ff6c2bf 100644
--- a/debian/control
+++ b/debian/control
@@ -2,95 +2,149 @@ Source: libnb-platform18-java
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Andrew Ross <ubuntu at rossfamily.co.uk>
-Build-Depends: debhelper (>= 7.0.50~), javahelper, ant (>= 1.7.0),
- ant-optional (>= 1.7.0), default-jdk, java7-jdk,
- g++-mingw-w64-i686, g++-mingw-w64-x86-64,
- maven-repo-helper, w3c-dtd-xhtml, javacc,
- libjemmy2-java, javahelp2, libbindex-java,
- libswing-layout-java (>= 1.0.3), libjna-platform-java,
- libfelix-framework-java, libfelix-main-java, libosgi-core-java,
- libosgi-compendium-java, antlr3 (>= 3.2), libstringtemplate-java,
- junit4 (>= 4.6), libhamcrest-java, junit, libequinox-osgi-java,
- testng (>=6.8), libjnlp-servlet-java
-Standards-Version: 3.9.5
+Uploaders:
+ Andrew Ross <ubuntu at rossfamily.co.uk>
+Build-Depends:
+ ant (>= 1.7.0),
+ ant-optional (>= 1.7.0),
+ antlr3 (>= 3.2),
+ debhelper (>= 7.0.50~),
+ default-jdk,
+ g++-mingw-w64-i686,
+ g++-mingw-w64-x86-64,
+ javacc,
+ javahelp2,
+ javahelper,
+ junit,
+ junit4 (>= 4.6),
+ libbindex-java,
+ libequinox-osgi-java,
+ libfelix-framework-java,
+ libfelix-main-java,
+ libhamcrest-java,
+ libjemmy2-java,
+ libjna-platform-java,
+ libjnlp-servlet-java,
+ libosgi-compendium-java,
+ libosgi-core-java,
+ libstringtemplate-java,
+ libswing-layout-java (>= 1.0.3),
+ maven-repo-helper,
+ testng (>=6.8),
+ w3c-dtd-xhtml
+Standards-Version: 3.9.6
Homepage: http://netbeans.org/
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/libnb-platform-java.git
+Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/libnb-platform-java.git
Vcs-Git: git://anonscm.debian.org/pkg-java/libnb-platform-java.git
Package: libnb-platform18-java
Architecture: all
-Depends: ${misc:Depends}, ${java:Depends}, javahelp2,
- libswing-layout-java (>= 1.0.3), libjna-platform-java, junit4 (>= 4.6),
- libfelix-framework-java, libfelix-main-java, libosgi-core-java,
- libosgi-compendium-java, libnb-org-openide-util-java (>= ${source:Version}),
- antlr3 (>= 3.2), libequinox-osgi-java, testng,
- libnb-org-openide-util-lookup-java (>= ${source:Version}),
- libnb-org-openide-modules-java (>= ${source:Version})
-Suggests: libnb-platform16-java-doc
+Depends:
+ antlr3 (>= 3.2),
+ javahelp2,
+ junit4 (>= 4.6),
+ libequinox-osgi-java,
+ libfelix-framework-java,
+ libfelix-main-java,
+ libjna-platform-java,
+ libnb-org-openide-modules-java (>= ${source:Version}),
+ libnb-org-openide-util-java (>= ${source:Version}),
+ libnb-org-openide-util-lookup-java (>= ${source:Version}),
+ libosgi-compendium-java,
+ libosgi-core-java,
+ libswing-layout-java (>= 1.0.3),
+ testng,
+ ${java:Depends},
+ ${misc:Depends}
+Suggests:
+ libnb-platform16-java-doc
Description: NetBeans Platform for building rich desktop applications in Java
The NetBeans Platform is a framework for building rich desktop applications
- in Java. It provides the code that is required to connect actions to menu
- items, toolbar items, keyboard shortcuts and more. It is the core of the
+ in Java. It provides the code that is required to connect actions to menu
+ items, toolbar items, keyboard shortcuts and more. It is the core of the
NetBeans IDE.
.
This package provides the platform itself.
Package: libnb-platform-devel-java
Architecture: all
-Depends: ${misc:Depends}, ${java:Depends}, libnb-platform18-java,
- ant, libjemmy2-java, javahelp2, libbindex-java, libjnlp-servlet-java,
-Replaces: libnb-platform8-devel-java, libnb-platform7-devel-java
-Conflicts: libnb-platform8-devel-java, libnb-platform7-devel-java
+Depends:
+ ant,
+ javahelp2,
+ libbindex-java,
+ libjemmy2-java,
+ libjnlp-servlet-java,
+ libnb-platform18-java,
+ ${java:Depends},
+ ${misc:Depends}
+Replaces:
+ libnb-platform7-devel-java,
+ libnb-platform8-devel-java
+Conflicts:
+ libnb-platform7-devel-java,
+ libnb-platform8-devel-java
Description: Build harness for NetBeans Platform
The NetBeans Platform is a framework for building rich desktop applications
- in Java. It provides the code that is required to connect actions to menu
- items, toolbar items, keyboard shortcuts and more. It is the core of the
+ in Java. It provides the code that is required to connect actions to menu
+ items, toolbar items, keyboard shortcuts and more. It is the core of the
NetBeans IDE.
.
- This package contains the NetBeans Platform Harness containing the build
- scripts and ant tasks required to build an application on top of NetBeans
+ This package contains the NetBeans Platform Harness containing the build
+ scripts and ant tasks required to build an application on top of NetBeans
Platform.
Package: libnb-platform18-java-doc
Architecture: all
Section: doc
-Depends: ${misc:Depends}
-Recommends: ${java:Recommends}
-Suggests: libnb-platform18-java
-Enhances: libnb-platform18-java
-Description: NetBeans Platform javadoc
+Depends:
+ ${misc:Depends}
+Recommends:
+ ${java:Recommends}
+Suggests:
+ libnb-platform18-java
+Enhances:
+ libnb-platform18-java
+Description: NetBeans Platform javadoc
NetBeans Platform is a set of modules, each providing their own APIs
and working together or in a standalone mode. This package provides
one master javadoc to all of them.
Package: libnb-org-openide-util-java
Architecture: all
-Depends: ${misc:Depends}, ${java:Depends},
- libnb-org-openide-util-lookup-java (>= ${source:Version})
-Provides: libopenide-util-java
-Replaces: libopenide-util-java
-Conflicts: libopenide-util-java
+Depends:
+ libnb-org-openide-util-lookup-java (>= ${source:Version}),
+ ${java:Depends},
+ ${misc:Depends}
+Provides:
+ libopenide-util-java
+Replaces:
+ libopenide-util-java
+Conflicts:
+ libopenide-util-java
Description: Utility classes from the NetBeans Platform
- The NetBeans Platform is a set of modules, each providing their own
+ The NetBeans Platform is a set of modules, each providing their own
APIs and working together or in a standalone mode. This package provides
some utility functions used by the modules that make up the platform.
Package: libnb-org-openide-util-lookup-java
Architecture: all
-Depends: ${misc:Depends}, ${java:Depends}
+Depends:
+ ${java:Depends},
+ ${misc:Depends}
Description: Utility lookup classes from the NetBeans Platform
- The NetBeans Platform is a set of modules, each providing their own
+ The NetBeans Platform is a set of modules, each providing their own
APIs and working together or in a standalone mode. This package provides
- some utility functions for lookups and is used by the modules that make
+ some utility functions for lookups and is used by the modules that make
up the platform.
Package: libnb-org-openide-modules-java
Architecture: all
-Depends: ${misc:Depends}, ${java:Depends},
+Depends:
libnb-org-openide-util-java (>= ${source:Version}),
- libnb-org-openide-util-lookup-java (>= ${source:Version})
+ libnb-org-openide-util-lookup-java (>= ${source:Version}),
+ ${java:Depends},
+ ${misc:Depends}
Description: Utility classes for modules from the NetBeans Platform
- The NetBeans Platform is a set of modules, each providing their own
+ The NetBeans Platform is a set of modules, each providing their own
APIs and working together or in a standalone mode. This package provides
some utility functions for managing NetBeans modules.
diff --git a/debian/copyright b/debian/copyright
index 4cf7e10..ab365e5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,7 +2,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Source: http://dlc.sun.com.edgesuite.net/netbeans/
Files: *
-Copyright: Copyright 1997-2013 Oracle and/or its affiliates.
+Copyright: Copyright 1997-2013 Oracle and/or its affiliates.
Portions Copyrighted 1997-2009 Sun Microsystems, Inc.
License: CDDL-1 or GPL-2 with CLASSPATH exception
@@ -25,7 +25,7 @@ License: CDDL-1 or GPL-2 with CLASSPATH exception
Files: ./core.windows/test/unit/src/org/netbeans/core/windows/view/ui/CustomMenuBarTest.java
./core.startup/test/unit/src/org/netbeans/core/startup/layers/CustomWritableSystemFileSystemTest.java
-Copyright: Copyright 1997-2013 Oracle and/or its affiliates.
+Copyright: Copyright 1997-2013 Oracle and/or its affiliates.
Portions Copyrighted 2007 Nokia Siemens Networks Oy
License: CDDL-1 or GPL-2 with CLASSPATH exception
@@ -39,7 +39,7 @@ License: MPL-1.1 or GPL-2 or LGPL-2.1
License: GPL-2
- On Debian systems the full text of the GNU General Public
+ On Debian systems the full text of the GNU General Public
License can be found in the `/usr/share/common-licenses/GPL-2'
file.
@@ -58,18 +58,18 @@ License: GPL-2 with CLASSPATH exception
in the particular source file's header the words "Oracle
designates this particular file as subject to the
"Classpath" exception as provided by Oracle in the License
- file that accompanied this code."
+ file that accompanied this code."
.
Linking this library statically or dynamically with other
modules is making a combined work based on this library.
Thus, the terms and conditions of the GNU General Public
- License Version 2 cover the whole combination.
+ License Version 2 cover the whole combination.
.
As a special exception, the copyright holders of this
library give you permission to link this library with
independent modules to produce an executable, regardless of
the license terms of these independent modules, and to copy
- and distribute the resulting executable under terms of your
+ and distribute the resulting executable under terms of your
choice, provided that you also meet, for each linked
independent module, the terms and conditions of the license
of that module. An independent module is a module which is
@@ -79,12 +79,12 @@ License: GPL-2 with CLASSPATH exception
do not wish to do so, delete this exception statement from
your version.
.
- On Debian systems the full text of the GNU General Public
+ On Debian systems the full text of the GNU General Public
License can be found in the `/usr/share/common-licenses/GPL-2'
file.
License: LGPL-2.1
- On Debian systems the full text of the GNU General Public
+ On Debian systems the full text of the GNU General Public
License can be found in the `/usr/share/common-licenses/LGPL-2.1'
file.
@@ -579,10 +579,10 @@ License: CDDL-1
Modifications, in each case including portions thereof.
.
1.4. "Executable" means the Covered Software in any form
- other than Source Code.
+ other than Source Code.
.
1.5. "Initial Developer" means the individual or entity that
- first makes Original Software available under this License.
+ first makes Original Software available under this License.
.
1.6. "Larger Work" means a work which combines Covered
Software or portions thereof with code not governed by the
@@ -600,22 +600,22 @@ License: CDDL-1
.
A. Any file that results from an addition to, deletion from
or modification of the contents of a file containing
- Original Software or previous Modifications;
+ Original Software or previous Modifications;
.
B. Any new file that contains any part of the Original
- Software or previous Modification; or
+ Software or previous Modification; or
.
C. Any new file that is contributed or otherwise made
available under the terms of this License.
.
1.10. "Original Software" means the Source Code and
Executable form of computer software code that is originally
- released under this License.
+ released under this License.
.
1.11. "Patent Claims" means any patent claim(s), now owned
or hereafter acquired, including without limitation, method,
process, and apparatus claims, in any patent Licensable by
- grantor.
+ grantor.
.
1.12. "Source Code" means (a) the common form of computer
software code in which modifications are made and (b)
@@ -632,37 +632,37 @@ License: CDDL-1
of more than fifty percent (50%) of the outstanding shares
or beneficial ownership of such entity.
.
- 2. License Grants.
+ 2. License Grants.
.
2.1. The Initial Developer Grant. Conditioned upon Your
compliance with Section 3.1 below and subject to third party
intellectual property claims, the Initial Developer hereby
grants You a world-wide, royalty-free, non-exclusive
- license:
+ license:
.
(a) under intellectual property rights (other than patent or
trademark) Licensable by Initial Developer, to use,
reproduce, modify, display, perform, sublicense and
distribute the Original Software (or portions thereof), with
or without Modifications, and/or as part of a Larger Work;
- and
+ and
.
(b) under Patent Claims infringed by the making, using or
selling of Original Software, to make, have made, use,
practice, sell, and offer for sale, and/or otherwise dispose
- of the Original Software (or portions thereof).
+ of the Original Software (or portions thereof).
.
(c) The licenses granted in Sections 2.1(a) and (b) are
effective on the date Initial Developer first distributes or
otherwise makes the Original Software available to a third
- party under the terms of this License.
+ party under the terms of this License.
.
(d) Notwithstanding Section 2.1(b) above, no patent license
is granted: (1) for code that You delete from the Original
Software, or (2) for infringements caused by: (i) the
modification of the Original Software, or (ii) the
combination of the Original Software with other software or
- devices.
+ devices.
.
2.2. Contributor Grant. Conditioned upon Your compliance
with Section 3.1 below and subject to third party
@@ -685,12 +685,12 @@ License: CDDL-1
Modifications made by that Contributor (or portions
thereof); and (2) the combination of Modifications made by
that Contributor with its Contributor Version (or portions
- of such combination).
+ of such combination).
.
(c) The licenses granted in Sections 2.2(a) and 2.2(b) are
effective on the date Contributor first distributes or
otherwise makes the Modifications available to a third
- party.
+ party.
.
(d) Notwithstanding Section 2.2(b) above, no patent license
is granted: (1) for any code that Contributor has deleted
@@ -700,7 +700,7 @@ License: CDDL-1
Contributor with other software (except as part of the
Contributor Version) or other devices; or (3) under Patent
Claims infringed by Covered Software in the absence of
- Modifications made by that Contributor.
+ Modifications made by that Contributor.
.
3. Distribution Obligations.
.
@@ -776,9 +776,9 @@ License: CDDL-1
with other code not governed by the terms of this License
and distribute the Larger Work as a single product. In such
a case, You must make sure the requirements of this License
- are fulfilled for the Covered Software.
+ are fulfilled for the Covered Software.
.
- 4. Versions of the License.
+ 4. Versions of the License.
.
4.1. New Versions.
.
@@ -786,7 +786,7 @@ License: CDDL-1
revised and/or new versions of this License from time to
time. Each version will be given a distinguishing version
number. Except as provided in Section 4.3, no one other than
- the license steward has the right to modify this License.
+ the license steward has the right to modify this License.
.
4.2. Effect of New Versions.
.
@@ -802,7 +802,7 @@ License: CDDL-1
Software. Otherwise, You may also choose to use, distribute
or otherwise make the Covered Software available under the
terms of any subsequent version of the License published by
- the license steward.
+ the license steward.
.
4.3. Modified Versions.
.
@@ -828,9 +828,9 @@ License: CDDL-1
REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY
CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY
COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
- DISCLAIMER.
+ DISCLAIMER.
.
- 6. TERMINATION.
+ 6. TERMINATION.
.
6.1. This License and the rights granted hereunder will
terminate automatically if You fail to comply with terms
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..5b41d65
--- /dev/null
+++ b/debian/patches/netbeans-platform-empty-binaries-list.patch
@@ -0,0 +1,118 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Mon, 1 Jun 2015 13:38:55 +0200
+Subject: netbeans platform~empty binaries list
+
+---
+ apisupport.harness/external/binaries-list | 3 ---
+ javahelp/external/binaries-list | 1 -
+ jemmy/external/binaries-list | 3 ---
+ libs.antlr3.devel/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 | 1 -
+ libs.osgi/external/binaries-list | 2 --
+ libs.testng/external/binaries-list | 2 --
+ nbbuild/external/binaries-list | 1 -
+ netbinox/external/binaries-list | 1 -
+ o.jdesktop.layout/external/binaries-list | 3 ---
+ 14 files changed, 22 deletions(-)
+
+diff --git a/apisupport.harness/external/binaries-list b/apisupport.harness/external/binaries-list
+index fb7dd1e..8b13789 100644
+--- a/apisupport.harness/external/binaries-list
++++ b/apisupport.harness/external/binaries-list
+@@ -1,4 +1 @@
+-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 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/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/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.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.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.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.junit4/external/binaries-list b/libs.junit4/external/binaries-list
+index 9d7f22f..e69de29 100644
+--- a/libs.junit4/external/binaries-list
++++ b/libs.junit4/external/binaries-list
+@@ -1 +0,0 @@
+-E4F1766CE7404A08F45D859FB9C226FC9E41A861 junit-4.10.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
+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/nbbuild/external/binaries-list b/nbbuild/external/binaries-list
+index 3b388fb..8b13789 100644
+--- a/nbbuild/external/binaries-list
++++ b/nbbuild/external/binaries-list
+@@ -1,2 +1 @@
+-EAE299D9D3B1C6E2F8B030DCD3BCF0B05517FBA9 apitest.jar
+
+diff --git a/netbinox/external/binaries-list b/netbinox/external/binaries-list
+index a246e5c..8b13789 100644
+--- a/netbinox/external/binaries-list
++++ b/netbinox/external/binaries-list
+@@ -1,2 +1 @@
+-B27F1304F18FEDE876F940AEFA6C9EB5632619D7 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 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/debian/patches/netbeans-platform-nbi.patch b/debian/patches/netbeans-platform-nbi.patch
new file mode 100644
index 0000000..fe66613
--- /dev/null
+++ b/debian/patches/netbeans-platform-nbi.patch
@@ -0,0 +1,21 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Mon, 1 Jun 2015 13:42:24 +0200
+Subject: netbeans platform~nbi
+
+---
+ nbbuild/cluster.properties | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
+index 9a7b984..27fb4ec 100644
+--- a/nbbuild/cluster.properties
++++ b/nbbuild/cluster.properties
+@@ -804,8 +804,6 @@ nb.cluster.harness=\
+ apisupport.harness,\
+ jellytools.platform,\
+ jemmy,\
+- libs.nbi.ant,\
+- libs.nbi.engine,\
+ nbjunit,\
+ o.n.insane
+
diff --git a/debian/patches/netbeans-platform-nojnabinaries.patch b/debian/patches/netbeans-platform-nojnabinaries.patch
new file mode 100644
index 0000000..f914de8
--- /dev/null
+++ b/debian/patches/netbeans-platform-nojnabinaries.patch
@@ -0,0 +1,52 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Mon, 1 Jun 2015 14:21:49 +0200
+Subject: netbeans platform~nojnabinaries
+
+---
+ libs.jna/nbproject/project.properties | 22 +++++++++++-----------
+ libs.jna/src/org/netbeans/libs/jna/Installer.java | 2 +-
+ 2 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/libs.jna/nbproject/project.properties b/libs.jna/nbproject/project.properties
+index c6de368..afbc880 100644
+--- a/libs.jna/nbproject/project.properties
++++ b/libs.jna/nbproject/project.properties
+@@ -43,15 +43,15 @@
+ javac.source=1.6
+ 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
+-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
+ 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
+--- 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" ); //NOI18N
+ }
+ }
diff --git a/debian/patches/netbeans-platform-windowslauncher.patch b/debian/patches/netbeans-platform-windowslauncher.patch
new file mode 100644
index 0000000..4de4083
--- /dev/null
+++ b/debian/patches/netbeans-platform-windowslauncher.patch
@@ -0,0 +1,401 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Mon, 1 Jun 2015 15:29:10 +0200
+Subject: netbeans platform~windowslauncher
+
+---
+ apisupport.harness/windows-launcher-src/Makefile | 7 ++---
+ .../nbproject/Makefile-app.exe.mk | 24 ++++++++---------
+ .../nbproject/Makefile-app64.exe.mk | 24 ++++++++---------
+ 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, 65 insertions(+), 66 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..c4d073d 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=
++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=
+@@ -68,22 +68,22 @@ LDLIBSOPTIONS=app64.res
+ ${OBJECTDIR}/applauncher.o: applauncher.cpp
+ ${MKDIR} -p ${OBJECTDIR}
+ ${RM} $@.d
+- $(COMPILE.cc) -O2 -DARCHITECTURE=64 -DNBEXEC_DLL=\"/lib/nbexec64.dll\" -MMD -MP -MF $@.d -o ${OBJECTDIR}/applauncher.o applauncher.cpp
++ $(COMPILE.cc) -O2 -DARCHITECTURE=64 -DNBEXEC_DLL=\"/lib/nbexec64.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=64 -DNBEXEC_DLL=\"/lib/nbexec64.dll\" -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/493252820/utilsfuncs.o ../../o.n.bootstrap/launcher/windows/utilsfuncs.cpp
++ $(COMPILE.cc) -O2 -DARCHITECTURE=64 -DNBEXEC_DLL=\"/lib/nbexec64.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=64 -DNBEXEC_DLL=\"/lib/nbexec64.dll\" -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/216238457/nblauncher.o ../../ide/launcher/windows/nblauncher.cpp
++ $(COMPILE.cc) -O2 -DARCHITECTURE=64 -DNBEXEC_DLL=\"/lib/nbexec64.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=64 -DNBEXEC_DLL=\"/lib/nbexec64.dll\" -MMD -MP -MF $@.d -o ${OBJECTDIR}/app.o app.cpp
++ $(COMPILE.cc) -O2 -DARCHITECTURE=64 -DNBEXEC_DLL=\"/lib/nbexec64.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/app.o app.cpp
+
+ # Subprojects
+ .build-subprojects:
+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 3ae2f5c..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_45/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_45/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_45/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_45/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_45/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_45/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_45/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_45/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_45/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_45/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 15ed384..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_45/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_45/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_45/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_45/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_45/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_45/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_45/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_45/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_45/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_45/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-platform~classfile-version.patch b/debian/patches/netbeans-platform~classfile-version.patch
deleted file mode 100644
index 0a47b1e..0000000
--- a/debian/patches/netbeans-platform~classfile-version.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Where possible, use version 1.6 for our classfiles.
-
---- a/openide.util/nbproject/project.properties
-+++ b/openide.util/nbproject/project.properties
-@@ -42,7 +42,7 @@
-
- javac.compilerargs=-Xlint -Xlint:-serial -Xlint:-processing
- javac.source=1.6
--javac.target=1.7
-+javac.target=1.6
- module.jar.dir=lib
-
-
diff --git a/debian/patches/netbeans-platform~empty-binaries-list.patch b/debian/patches/netbeans-platform~empty-binaries-list.patch
deleted file mode 100644
index 24b632a..0000000
--- a/debian/patches/netbeans-platform~empty-binaries-list.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Empty all the binaries-list files so nothing gets downloaded.
-
---- a/apisupport.harness/external/binaries-list
-+++ /dev/null
-@@ -1,4 +0,0 @@
--D4EF66C1CC8A5B3C97E0CC7C210227AAEC1F1086 jsearch-2.0_05.jar
--A806D99716C5E9441BFD8B401176FDDEFC673022 bindex-2.2.jar
--20D826CC819A5A969CF3F7204E2E26CB6263EC43 jnlp-servlet.jar
--
---- a/javahelp/external/binaries-list
-+++ /dev/null
-@@ -1 +0,0 @@
--CA70822C47A67FC3A11670270567C2D01566DAE1 jhall-2.0_05.jar
---- a/o.jdesktop.layout/external/binaries-list
-+++ /dev/null
-@@ -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
---- a/libs.felix/external/binaries-list
-+++ /dev/null
-@@ -1,2 +0,0 @@
--14F630EDF137F54188636B5139432986D5FB19B7 felix-4.0.2.jar
--
---- a/libs.junit4/external/binaries-list
-+++ /dev/null
-@@ -1 +0,0 @@
--E4F1766CE7404A08F45D859FB9C226FC9E41A861 junit-4.10.jar
---- a/nbbuild/external/binaries-list
-+++ b/nbbuild/external/binaries-list
-@@ -1,2 +1 @@
--EAE299D9D3B1C6E2F8B030DCD3BCF0B05517FBA9 apitest.jar
-
---- a/libs.jna/external/binaries-list
-+++ /dev/null
-@@ -1 +0,0 @@
--F4E1672A22B63E37A5D929603CB67E093E3729D5 jna-3.4.0.jar
---- a/netbinox/external/binaries-list
-+++ /dev/null
-@@ -1 +0,0 @@
--B54E470D47DF378B9DCE9423F919CCF4C7A60138 org.eclipse.osgi_3.8.0.v20120529-1548.jar
-\ No newline at end of file
---- a/jemmy/external/binaries-list
-+++ /dev/null
-@@ -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
---- a/libs.osgi/external/binaries-list
-+++ /dev/null
-@@ -1,2 +0,0 @@
--972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD osgi.cmpn-4.2.jar
--2F2FBFF3FB80F91B159A7FA9F0C42A894BB8BCC5 osgi.core-5.0.0.jar
---- a/libs.antlr3.devel/external/binaries-list
-+++ /dev/null
-@@ -1 +0,0 @@
--5CAB59D859CAA6598E28131D30DD2E89806DB57F antlr-3.4.jar
---- a/libs.jna.platform/external/binaries-list
-+++ /dev/null
-@@ -1 +0,0 @@
--4B58AF397FD3156D700AD5016BCDD307A7A62EF5 platform-3.4.0.jar
---- a/libs.testng/external/binaries-list
-+++ /dev/null
-@@ -1,2 +0,0 @@
--AC97B566699146713B3CF0ABC226B5C08EF7CF33 testng-6.8.1-dist.jar
--AF022CBCACD8CBFCF946816441D1E7568D817745 testng-6.8.1-javadoc.zip
diff --git a/debian/patches/netbeans-platform~include-extras.patch b/debian/patches/netbeans-platform~include-extras.patch
deleted file mode 100644
index 266fb20..0000000
--- a/debian/patches/netbeans-platform~include-extras.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Include the extra modules libs.junit4 and libs.antlr3.devel.
-
---- a/libs.junit4/nbproject/project.xml
-+++ b/libs.junit4/nbproject/project.xml
-@@ -64,6 +64,10 @@
- <package>org.junit.runners.model</package>
- </public-packages>
- <class-path-extension>
-+ <runtime-relative-path>ext/hamcrest-core.jar</runtime-relative-path>
-+ <binary-origin>external/hamcrest-core.jar</binary-origin>
-+ </class-path-extension>
-+ <class-path-extension>
- <runtime-relative-path>ext/junit-4.10.jar</runtime-relative-path>
- <binary-origin>external/junit-4.10.jar</binary-origin>
- </class-path-extension>
---- a/nbbuild/cluster.properties
-+++ b/nbbuild/cluster.properties
-@@ -181,10 +181,12 @@
- keyring.fallback,\
- keyring.impl,\
- lib.uihandler,\
-+ libs.antlr3.devel,\
- libs.felix,\
- libs.jna,\
- libs.jna.platform,\
- libs.jsr223,\
-+ libs.junit4,\
- libs.osgi,\
- libs.testng,\
- masterfs,\
-@@ -1021,7 +1023,6 @@
- kenai.ui,\
- lib.cvsclient,\
- libs.findbugs,\
-- libs.junit4,\
- libs.oracle.cloud,\
- loadgenerator,\
- maven.util,\
---- a/libs.junit4/nbproject/project.properties
-+++ b/libs.junit4/nbproject/project.properties
-@@ -42,6 +42,7 @@
-
- is.autoload=true
- release.external/junit-4.10.jar=modules/ext/junit-4.10.jar
-+release.external/hamcrest-core.jar=modules/ext/hamcrest-core.jar
- nbm.target.cluster=platform
- sigtest.skip.check=true
-
diff --git a/debian/patches/netbeans-platform~jemmy.patch b/debian/patches/netbeans-platform~jemmy.patch
deleted file mode 100644
index 0d7e384..0000000
--- a/debian/patches/netbeans-platform~jemmy.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-We don't include zips of the jemmy doc or src.
-
---- a/jemmy/nbproject/project.properties
-+++ b/jemmy/nbproject/project.properties
-@@ -43,7 +43,7 @@
- javac.compilerargs=-Xlint -Xlint:-serial
- javac.source=1.6
- release.external/jemmy-2.3.1.1.jar=modules/ext/jemmy-2.3.1.1.jar
--release.external/jemmy-2.3.1.1-doc.zip=docs/jemmy-2.3.1.1-doc.zip
--release.external/jemmy-2.3.1.1-src.zip=docs/jemmy-2.3.1.1-src.zip
-+#release.external/jemmy-2.3.1.1-doc.zip=docs/jemmy-2.3.1.1-doc.zip
-+#release.external/jemmy-2.3.1.1-src.zip=docs/jemmy-2.3.1.1-src.zip
- sigtest.gen.fail.on.error=false
-
diff --git a/debian/patches/netbeans-platform~launcher.patch b/debian/patches/netbeans-platform~launcher.patch
deleted file mode 100644
index 64f10ea..0000000
--- a/debian/patches/netbeans-platform~launcher.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Include the jni path /usr/lib/jni on the library search path.
-
---- a/o.n.bootstrap/launcher/unix/nbexec
-+++ b/o.n.bootstrap/launcher/unix/nbexec
-@@ -454,7 +454,7 @@
- #
- delete_new_clusters_file
- rm -f "${restart_file}"
-- eval ${_NB_PROFILE_CMD} "\"${jdkhome}/bin/java\"" -Djdk.home="\"${jdkhome}\"" -classpath "\"$cp\"" \
-+ eval ${_NB_PROFILE_CMD} "\"${jdkhome}/bin/java\"" -Djdk.home="\"${jdkhome}\"" -Djava.library.path="/usr/lib/jni" -classpath "\"$cp\"" \
- "$jargs" org.netbeans.Main "$args" '<&0' '&'
- PID=$!
- trap "kill $PID" EXIT
diff --git a/debian/patches/netbeans-platform~nbi.patch b/debian/patches/netbeans-platform~nbi.patch
deleted file mode 100644
index 32deddb..0000000
--- a/debian/patches/netbeans-platform~nbi.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Don't build the Netbeans Installer modules.
-
---- a/nbbuild/cluster.properties
-+++ b/nbbuild/cluster.properties
-@@ -758,8 +758,6 @@
- apisupport.harness,\
- jellytools.platform,\
- jemmy,\
-- libs.nbi.ant,\
-- libs.nbi.engine,\
- nbjunit,\
- o.n.insane
-
diff --git a/debian/patches/netbeans-platform~nojnabinaries.patch b/debian/patches/netbeans-platform~nojnabinaries.patch
deleted file mode 100644
index 6601888..0000000
--- a/debian/patches/netbeans-platform~nojnabinaries.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-We don't need to install any JNA binaries, since they're already installed.
-
---- a/libs.jna/nbproject/project.properties
-+++ b/libs.jna/nbproject/project.properties
-@@ -43,15 +43,15 @@
- javac.source=1.6
- release.external/jna-3.4.0.jar=modules/ext/jna-3.4.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-3.4.0.jar!/com/sun/jna/darwin/libjnidispatch.jnilib=modules/lib/libjnidispatch-340.jnilib
--release.external/jna-3.4.0.jar!/com/sun/jna/linux-amd64/libjnidispatch.so=modules/lib/amd64/linux/libjnidispatch-340.so
--release.external/jna-3.4.0.jar!/com/sun/jna/linux-i386/libjnidispatch.so=modules/lib/i386/linux/libjnidispatch-340.so
--release.external/jna-3.4.0.jar!/com/sun/jna/win32-amd64/jnidispatch.dll=modules/lib/amd64/jnidispatch-340.dll
--release.external/jna-3.4.0.jar!/com/sun/jna/win32-x86/jnidispatch.dll=modules/lib/x86/jnidispatch-340.dll
--jnlp.verify.excludes=\
-- modules/lib/amd64/jnidispatch-340.dll,\
-- modules/lib/amd64/linux/libjnidispatch-340.so,\
-- modules/lib/i386/linux/libjnidispatch-340.so,\
-- modules/lib/x86/jnidispatch-340.dll,\
-- modules/lib/libjnidispatch-340.jnilib
-+#release.external/jna-3.4.0.jar!/com/sun/jna/darwin/libjnidispatch.jnilib=modules/lib/libjnidispatch-340.jnilib
-+#release.external/jna-3.4.0.jar!/com/sun/jna/linux-amd64/libjnidispatch.so=modules/lib/amd64/linux/libjnidispatch-340.so
-+#release.external/jna-3.4.0.jar!/com/sun/jna/linux-i386/libjnidispatch.so=modules/lib/i386/linux/libjnidispatch-340.so
-+#release.external/jna-3.4.0.jar!/com/sun/jna/win32-amd64/jnidispatch.dll=modules/lib/amd64/jnidispatch-340.dll
-+#release.external/jna-3.4.0.jar!/com/sun/jna/win32-x86/jnidispatch.dll=modules/lib/x86/jnidispatch-340.dll
-+#jnlp.verify.excludes=\
-+# modules/lib/amd64/jnidispatch-340.dll,\
-+# modules/lib/amd64/linux/libjnidispatch-340.so,\
-+# modules/lib/i386/linux/libjnidispatch-340.so,\
-+# modules/lib/x86/jnidispatch-340.dll,\
-+# modules/lib/libjnidispatch-340.jnilib
- sigtest.gen.fail.on.error=false
---- 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 void validate() {
- super.validate();
- //#211655
-- System.setProperty( "jna.boot.library.name", "jnidispatch-340" ); //NOI18N
-+ System.setProperty( "jna.boot.library.name", "jnidispatch" ); //NOI18N
- }
- }
diff --git a/debian/patches/netbeans-platform~properties.patch b/debian/patches/netbeans-platform~properties.patch
deleted file mode 100644
index 1d7c4f4..0000000
--- a/debian/patches/netbeans-platform~properties.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-We don't include the swing layout source zip.
-
---- a/o.jdesktop.layout/nbproject/project.properties
-+++ b/o.jdesktop.layout/nbproject/project.properties
-@@ -42,6 +42,6 @@
-
- is.autoload=true
- release.external/swing-layout-1.0.4.jar=modules/ext/swing-layout-1.0.4.jar
--release.external/swing-layout-1.0.4-doc.zip=docs/swing-layout-1.0.4-doc.zip
--release.external/swing-layout-1.0.4-src.zip=docs/swing-layout-1.0.4-src.zip
-+#release.external/swing-layout-1.0.4-doc.zip=docs/swing-layout-1.0.4-doc.zip
-+#release.external/swing-layout-1.0.4-src.zip=docs/swing-layout-1.0.4-src.zip
- jnlp.indirect.jars=docs/swing-layout-1.0.4-doc.zip, docs/swing-layout-1.0.4-src.zip
---- a/libs.testng/nbproject/project.properties
-+++ b/libs.testng/nbproject/project.properties
-@@ -42,7 +42,7 @@
-
- is.autoload=true
- release.external/testng-6.8.1-dist.jar=modules/ext/testng-6.8.1-dist.jar
--release.external/testng-6.8.1-javadoc.zip=docs/testng-6.8.1-javadoc.zip
-+#release.external/testng-6.8.1-javadoc.zip=docs/testng-6.8.1-javadoc.zip
- sigtest.skip.check=true
- sigtest.fail.on.error=false
- jnlp.indirect.jars=\
diff --git a/debian/patches/netbeans-platform~suitebuild.patch b/debian/patches/netbeans-platform~suitebuild.patch
deleted file mode 100644
index d9c6fbc..0000000
--- a/debian/patches/netbeans-platform~suitebuild.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Don't fail if we can't find the Windows exe launcher. This lets us build for older netbeans platforms where the
-package didn't contain Windows launchers.
-
---- a/apisupport.harness/release/suite.xml
-+++ b/apisupport.harness/release/suite.xml
-@@ -327,7 +327,7 @@
- <condition property="app.exe.prefix" value="" else="pre7_">
- <isset property="nbexec.dll.found"/>
- </condition>
-- <copy file="${harness.dir}/launchers/${app.exe.prefix}app.exe" tofile="${build.launcher.dir}/bin/${app.name}.exe" overwrite="true"/>
-+ <copy file="${harness.dir}/launchers/${app.exe.prefix}app.exe" tofile="${build.launcher.dir}/bin/${app.name}.exe" failonerror="false" overwrite="true"/>
- <copy file="${harness.dir}/launchers/${app.exe.prefix}app64.exe" tofile="${build.launcher.dir}/bin/${app.name}64.exe" failonerror="false" overwrite="true"/>
- <copy file="${harness.dir}/launchers/${app.exe.prefix}app_w.exe" tofile="${build.launcher.dir}/bin/${app.name}_w.exe" failonerror="false" overwrite="true"/>
-
diff --git a/debian/patches/netbeans-platform~windowslauncher.patch b/debian/patches/netbeans-platform~windowslauncher.patch
deleted file mode 100644
index dbb4b7c..0000000
--- a/debian/patches/netbeans-platform~windowslauncher.patch
+++ /dev/null
@@ -1,341 +0,0 @@
-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.
-
---- 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 @@
- # 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 -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 -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 @@
- # Add your pre 'clean' code here...
-
- .clean-post-nbexec: .clean-impl
-- rm -f nbexec_exe32.res nbexec32.exe
-+ rm -f nbexec_exe.res nbexec.exe
-
- .clean-post-nbexec64: .clean-impl
- rm -f nbexec_exe64.res nbexec64.exe
---- 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 @@
- # 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 @@
-
- # clean
- clean: .clean-post
-+ rm -f app.res app64.res
-
- .clean-pre:
- # Add your pre 'clean' code here...
---- a/o.n.bootstrap/launcher/windows/jvmlauncher.h
-+++ b/o.n.bootstrap/launcher/windows/jvmlauncher.h
-@@ -50,6 +50,18 @@
- #include <windows.h>
- #include <string>
- #include <list>
-+
-+// Use the definitions below rather than the linux jdk ones
-+#define _JAVASOFT_JNI_MD_H_
-+// imports, exports, and calling conventions need to match those used in a dll
-+#define JNIEXPORT __declspec(dllexport)
-+#define JNIIMPORT __declspec(dllimport)
-+#define JNICALL __stdcall
-+// Correct types for the windows platform
-+typedef long jint;
-+typedef __int64 jlong;
-+typedef signed char jbyte;
-+
- #include "jni.h"
- #include "utilsfuncs.h"
-
---- a/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk
-+++ b/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk
-@@ -13,12 +13,12 @@
- 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
-@@ -46,8 +46,8 @@
- CFLAGS=
-
- # CC Compiler Flags
--CCFLAGS=-m32 -mno-cygwin
--CXXFLAGS=-m32 -mno-cygwin
-+CCFLAGS=-m32
-+CXXFLAGS=-m32
-
- # Fortran Compiler Flags
- FFLAGS=
-@@ -65,12 +65,12 @@
- nbexec.dll: ${OBJECTDIR}/nbexec.res
-
- nbexec.dll: ${OBJECTFILES}
-- ${LINK.cc} -mno-cygwin -shared -o nbexec.dll ${OBJECTFILES} ${LDLIBSOPTIONS}
-+ ${LINK.cc} -shared -o nbexec.dll ${OBJECTFILES} ${LDLIBSOPTIONS}
-
- ${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_17/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_17/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
-
- : nbexec_exe.rc
- @echo
-@@ -79,27 +79,27 @@
- ${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
-
- ${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_17/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_17/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}/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_17/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_17/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}/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_17/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_17/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
-
- ${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_17/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_17/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
-
- # Subprojects
- .build-subprojects:
---- 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;
-
---- 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 @@
- 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 @@
- CFLAGS=
-
- # CC Compiler Flags
--CCFLAGS=-m32 -mno-cygwin
--CXXFLAGS=-m32 -mno-cygwin
-+CCFLAGS=-m32
-+CXXFLAGS=-m32
-
- # Fortran Compiler Flags
- FFLAGS=
---- 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;
-
---- a/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec64.mk
-+++ b/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec64.mk
-@@ -13,12 +13,12 @@
- 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=
-+CCC=x86_64-w64-mingw32-g++
-+CXX=x86_64-w64-mingw32-g++
-+FC=
-+AS=x86_64-w64-mingw32-as
-
- # Macros
- CND_PLATFORM=Cygwin64-Windows
-@@ -46,8 +46,8 @@
- 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,12 +65,12 @@
- nbexec64.dll: ${OBJECTDIR}/nbexec64.res
-
- nbexec64.dll: ${OBJECTFILES}
-- ${LINK.cc} -mno-cygwin -shared -o nbexec64.dll ${OBJECTFILES} ${LDLIBSOPTIONS}
-+ ${LINK.cc} -shared -o nbexec64.dll ${OBJECTFILES} ${LDLIBSOPTIONS}
-
- ${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_17/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_17/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
-
- : nbexec_exe.rc
- @echo
-@@ -79,27 +79,27 @@
- ${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
-
- ${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_17/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_17/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}/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_17/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_17/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}/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_17/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_17/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
-
- ${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_17/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_17/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
-
- # Subprojects
- .build-subprojects:
---- 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 @@
- 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 @@
- 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/debian/patches/series b/debian/patches/series
index 812a1a4..7ec6f91 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1,4 @@
-netbeans-platform~empty-binaries-list.patch
-netbeans-platform~launcher.patch
-netbeans-platform~nojnabinaries.patch
-netbeans-platform~windowslauncher.patch
-netbeans-platform~include-extras.patch
-netbeans-platform~nbi.patch
-netbeans-platform~properties.patch
-netbeans-platform~suitebuild.patch
-netbeans-platform~jemmy.patch
-netbeans-platform~classfile-version.patch
+netbeans-platform-empty-binaries-list.patch
+netbeans-platform-nbi.patch
+netbeans-platform-nojnabinaries.patch
+netbeans-platform-windowslauncher.patch
diff --git a/debian/rules b/debian/rules
index d7b9963..02075d6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -152,8 +152,8 @@ override_dh_auto_clean:
-rm -f nbbuild/nbproject/private/scan-cache-standard.ser
override_jh_depends:
- # Skipping jh_depends run - since we use symlinks to /usr/share/java then
+ # Skipping jh_depends run - since we use symlinks to /usr/share/java then
# jh_depends gets it wrong.
get-orig-source:
- uscan --download-version $(subst +dfsg\d*,,$(DEB_UPSTREAM_VERSION)) --force-download
+ uscan --download-current-version --force-download --no-symlink
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libnb-platform-java.git
More information about the pkg-java-commits
mailing list