[Git][java-team/netbeans][master] 2 commits: Import Debian changes 8.1+dfsg3-5
Markus Koschany
gitlab at salsa.debian.org
Thu Jun 7 11:21:01 BST 2018
Markus Koschany pushed to branch master at Debian Java Maintainers / netbeans
Commits:
c9d20fa2 by Markus Koschany at 2018-06-07T12:16:06+02:00
Import Debian changes 8.1+dfsg3-5
netbeans (8.1+dfsg3-5) unstable; urgency=medium
* Update osgi-update.patch and sync it with the latest version of
libequinox-osgi-java. (Closes: #891957)
* Build-depend and depend on openjdk-8-jdk, otherwise Netbeans will not work.
* Build-conflict against OpenJDK 10 and OpenJDK 11.
* Declare compliance with Debian Policy 4.1.4.
* Switch to compat level 11.
- - - - -
acf973b8 by Markus Koschany at 2018-06-07T12:20:23+02:00
Import Debian changes 8.1+dfsg3-5
netbeans (8.1+dfsg3-5) unstable; urgency=medium
* Update osgi-update.patch and sync it with the latest version of
libequinox-osgi-java. (Closes: #891957)
* Build-depend and depend on openjdk-8-jdk, otherwise Netbeans will not work.
* Build-conflict against OpenJDK 10 and OpenJDK 11.
* Declare compliance with Debian Policy 4.1.4.
* Switch to compat level 11.
- - - - -
9 changed files:
- debian/changelog
- debian/compat
- debian/control
- + debian/patches/ant-10.patch
- debian/patches/db.dataview-setRowFilter-method.patch
- debian/patches/jna-4.4.0-compatibility.patch
- debian/patches/osgi-update.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+netbeans (8.1+dfsg3-5) unstable; urgency=medium
+
+ * Update osgi-update.patch and sync it with the latest version of
+ libequinox-osgi-java. (Closes: #891957)
+ * Build-depend and depend on openjdk-8-jdk, otherwise Netbeans will not work.
+ * Build-conflict against OpenJDK 10 and OpenJDK 11.
+ * Declare compliance with Debian Policy 4.1.4.
+ * Switch to compat level 11.
+
+ -- Markus Koschany <apo at debian.org> Wed, 06 Jun 2018 11:04:58 +0200
+
netbeans (8.1+dfsg3-4) unstable; urgency=medium
* Really update jna-4.4.0-compatibility.patch and fix FTBFS with JNA 4.4.0.
=====================================
debian/compat
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -9,8 +9,8 @@ Build-Depends:
ant,
ant-optional,
antlr3 (>= 3.5.2),
- debhelper (>= 10),
- default-jdk,
+ debhelper (>= 11),
+ openjdk-8-jdk,
icnsutils,
javacc,
javahelp2,
@@ -73,7 +73,13 @@ Build-Depends:
maven-repo-helper,
testng,
w3c-sgml-lib
-Standards-Version: 4.0.0
+Build-Conflicts:
+ openjdk-10-jdk,
+ openjdk-10-jdk-headless,
+ openjdk-11-jdk,
+ openjdk-11-jdk-headless,
+ default-jdk
+Standards-Version: 4.1.4
Homepage: http://netbeans.org/
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/netbeans.git
Vcs-Git: https://anonscm.debian.org/git/pkg-java/netbeans.git
@@ -173,7 +179,7 @@ Description: Common Java Related Libraries for NetBeans
Package: netbeans
Architecture: all
Depends:
- default-jdk (>= 2:1.8) | java8-sdk,
+ openjdk-8-jdk | java8-sdk,
libnb-apisupport3-java (= ${binary:Version}),
libnb-ide14-java (= ${binary:Version}),
libnb-java5-java (= ${binary:Version}),
=====================================
debian/patches/ant-10.patch
=====================================
--- /dev/null
+++ b/debian/patches/ant-10.patch
@@ -0,0 +1,56 @@
+From: Markus Koschany <apo at debian.org>
+Date: Tue, 24 Apr 2018 16:08:39 +0200
+Subject: ant 10
+
+Fix FTBFS with Ant 1.10.
+---
+ nbbuild/antsrc/org/netbeans/nbbuild/ModuleSelector.java | 5 +++++
+ nbbuild/antsrc/org/netbeans/nbbuild/ModuleStateSelector.java | 5 +++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/ModuleSelector.java b/nbbuild/antsrc/org/netbeans/nbbuild/ModuleSelector.java
+index 85c4da0..d5b407b 100644
+--- a/nbbuild/antsrc/org/netbeans/nbbuild/ModuleSelector.java
++++ b/nbbuild/antsrc/org/netbeans/nbbuild/ModuleSelector.java
+@@ -61,6 +61,7 @@ import org.apache.tools.ant.BuildException;
+ import org.apache.tools.ant.Project;
+ import org.apache.tools.ant.types.Parameter;
+ import org.apache.tools.ant.types.selectors.BaseExtendSelector;
++import org.apache.tools.ant.types.Resource;
+ import org.xml.sax.Attributes;
+ import org.xml.sax.SAXException;
+ import org.xml.sax.helpers.DefaultHandler;
+@@ -80,6 +81,10 @@ public final class ModuleSelector extends BaseExtendSelector {
+ public ModuleSelector() {
+ }
+
++ public boolean isSelected(Resource r) {
++ return false;
++ }
++
+ public boolean isSelected(File dir, String filename, File file) throws BuildException {
+ validate();
+
+diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/ModuleStateSelector.java b/nbbuild/antsrc/org/netbeans/nbbuild/ModuleStateSelector.java
+index 288e22f..0cfaef0 100644
+--- a/nbbuild/antsrc/org/netbeans/nbbuild/ModuleStateSelector.java
++++ b/nbbuild/antsrc/org/netbeans/nbbuild/ModuleStateSelector.java
+@@ -58,6 +58,7 @@ import org.apache.tools.ant.BuildException;
+ import org.apache.tools.ant.Project;
+ import org.apache.tools.ant.types.Parameter;
+ import org.apache.tools.ant.types.selectors.BaseExtendSelector;
++import org.apache.tools.ant.types.Resource;
+ import org.xml.sax.Attributes;
+ import org.xml.sax.EntityResolver;
+ import org.xml.sax.InputSource;
+@@ -79,6 +80,10 @@ public final class ModuleStateSelector extends BaseExtendSelector {
+ public ModuleStateSelector() {
+ }
+
++ public boolean isSelected(Resource r) {
++ return false;
++ }
++
+ public boolean isSelected(File dir, String filename, File file) throws BuildException {
+ validate();
+
=====================================
debian/patches/db.dataview-setRowFilter-method.patch
=====================================
--- a/debian/patches/db.dataview-setRowFilter-method.patch
+++ b/debian/patches/db.dataview-setRowFilter-method.patch
@@ -39,10 +39,11 @@ diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetJXT
index 88a9b3a..e1dd566 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 {
+@@ -160,16 +160,6 @@ public class ResultSetJXTable extends JXTableDecorator {
+ return new ResultSetTableModel(new DBColumn[0]);
}
- @Override
+- @Override
- @SuppressWarnings("unchecked")
- public <R extends TableModel> void setRowFilter(RowFilter<? super R, ? super Integer> filter) {
- if(getRowSorter() instanceof DefaultRowSorter) {
@@ -52,7 +53,6 @@ index 88a9b3a..e1dd566 100644
- }
- }
-
-- @Override
+ @Override
public void setModel(TableModel dataModel) {
if(! (dataModel instanceof ResultSetTableModel)) {
- throw new IllegalArgumentException(
=====================================
debian/patches/jna-4.4.0-compatibility.patch
=====================================
--- a/debian/patches/jna-4.4.0-compatibility.patch
+++ b/debian/patches/jna-4.4.0-compatibility.patch
@@ -12,7 +12,7 @@ Forwarded: no
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/support/Win32APISupport.java b/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/support/Win32APISupport.java
-index 5654ce6..3f3846f 100644
+index 5654ce6..17415ef 100644
--- a/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/support/Win32APISupport.java
+++ b/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/support/Win32APISupport.java
@@ -56,14 +56,14 @@ import java.util.Map;
=====================================
debian/patches/osgi-update.patch
=====================================
--- a/debian/patches/osgi-update.patch
+++ b/debian/patches/osgi-update.patch
@@ -8,23 +8,9 @@ catches up.
Forwarded: not-needed
---
- netbinox/src/org/netbeans/modules/netbinox/JarBundleFile.java | 2 +-
- netbinox/src/org/netbeans/modules/netbinox/Netbinox.java | 8 ++++++++
- 2 files changed, 9 insertions(+), 1 deletion(-)
+ netbinox/src/org/netbeans/modules/netbinox/Netbinox.java | 8 ++++++++
+ 1 file changed, 8 insertions(+)
-diff --git a/netbinox/src/org/netbeans/modules/netbinox/JarBundleFile.java b/netbinox/src/org/netbeans/modules/netbinox/JarBundleFile.java
-index d97a2cd..37846b0 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 {
- final File bf = new File(getBaseFile().getPath());
- if (bf.isDirectory()) {
- try {
-- delegate = new DirBundleFile(bf, false);
-+ delegate = new DirBundleFile(bf);
- return false;
- } 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
--- a/netbinox/src/org/netbeans/modules/netbinox/Netbinox.java
=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -34,3 +34,4 @@ netbeans-xsl-httpserver.patch
netbeans-svnclientadapter.patch
netbeans-slf4j.dummy.patch
jna-4.4.0-compatibility.patch
+ant-10.patch
=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-export JAVA_HOME=/usr/lib/jvm/default-java
+export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/
export TZ=UTC
# Included clusters
View it on GitLab: https://salsa.debian.org/java-team/netbeans/compare/6091d48a98ca1f50d075fda9722cea30663c2ee0...acf973b843a112700d12cdde33ef9b9420b15c39
--
View it on GitLab: https://salsa.debian.org/java-team/netbeans/compare/6091d48a98ca1f50d075fda9722cea30663c2ee0...acf973b843a112700d12cdde33ef9b9420b15c39
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20180607/9794658d/attachment.html>
More information about the pkg-java-commits
mailing list