This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository netbeans.
commit d6e88ab90eb1ff7c66b0b64da0a4664c4dd9f0e6 Author: Markus Koschany <[email protected]> Date: Wed Dec 30 15:05:49 2015 +0100 Update DEP-3 header. --- debian/patches/antlr-3.5.2.patch | 3 +++ debian/patches/db.dataview-setRowFilter-method.patch | 3 +++ debian/patches/javaewah-version.patch | 4 ++++ debian/patches/netbeans-core.browser.webview.patch | 4 ++++ debian/patches/netbeans-dlight.nativeexecution.patch | 3 +++ debian/patches/netbeans-extexecution.impl.patch | 3 +++ debian/patches/netbeans-ide-launcher.patch | 5 +++++ debian/patches/netbeans-nocopy.patch | 4 ++++ debian/patches/netbeans-slf4j.dummy.patch | 3 +-- 9 files changed, 30 insertions(+), 2 deletions(-) diff --git a/debian/patches/antlr-3.5.2.patch b/debian/patches/antlr-3.5.2.patch index 230e4c5..e364c6d 100644 --- a/debian/patches/antlr-3.5.2.patch +++ b/debian/patches/antlr-3.5.2.patch @@ -2,6 +2,9 @@ From: Markus Koschany <[email protected]> Date: Fri, 25 Dec 2015 22:56:09 +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/debian/patches/db.dataview-setRowFilter-method.patch b/debian/patches/db.dataview-setRowFilter-method.patch index 5655c26..c970b6f 100644 --- a/debian/patches/db.dataview-setRowFilter-method.patch +++ b/debian/patches/db.dataview-setRowFilter-method.patch @@ -2,6 +2,9 @@ From: Markus Koschany <[email protected]> Date: Fri, 25 Dec 2015 23:20:55 +0100 Subject: db.dataview setRowFilter method +Fix for another compilation failure due to missing symbols. + +Forwarded: not-needed --- .../netbeans/modules/db/dataview/output/DataViewTableUI.java | 1 - .../org/netbeans/modules/db/dataview/output/DataViewUI.java | 1 - diff --git a/debian/patches/javaewah-version.patch b/debian/patches/javaewah-version.patch index 78d2ff7..da5855e 100644 --- a/debian/patches/javaewah-version.patch +++ b/debian/patches/javaewah-version.patch @@ -2,6 +2,10 @@ From: Markus Koschany <[email protected]> Date: Sat, 26 Dec 2015 19:27:27 +0100 Subject: javaewah version +Debian's javaewah package is currently outdated, so adjust the version +accordingly to avoid another FTBFS. + +Forwarded: not-needed --- o.eclipse.jgit/nbproject/project.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/patches/netbeans-core.browser.webview.patch b/debian/patches/netbeans-core.browser.webview.patch index 24eb7df..a0a48fb 100644 --- a/debian/patches/netbeans-core.browser.webview.patch +++ b/debian/patches/netbeans-core.browser.webview.patch @@ -2,6 +2,10 @@ From: Markus Koschany <[email protected]> Date: Fri, 25 Dec 2015 21:56:27 +0100 Subject: netbeans-core.browser.webview +Disable core.browser.webview because it depends on other unsupported modules +and would cause a FTBFS otherwise. + +Forwarded: not-needed --- nbbuild/cluster.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/patches/netbeans-dlight.nativeexecution.patch b/debian/patches/netbeans-dlight.nativeexecution.patch index 9caba87..7195942 100644 --- a/debian/patches/netbeans-dlight.nativeexecution.patch +++ b/debian/patches/netbeans-dlight.nativeexecution.patch @@ -2,6 +2,9 @@ From: Markus Koschany <[email protected]> Date: Sat, 26 Dec 2015 00:00:02 +0100 Subject: netbeans dlight.nativeexecution +Fix another FTBFS since we don't build the nativeexecution module. + +Forwarded: not-needed --- .../nbproject/project.properties | 77 ---------------------- 1 file changed, 77 deletions(-) diff --git a/debian/patches/netbeans-extexecution.impl.patch b/debian/patches/netbeans-extexecution.impl.patch index 31931ff..caf0818 100644 --- a/debian/patches/netbeans-extexecution.impl.patch +++ b/debian/patches/netbeans-extexecution.impl.patch @@ -2,6 +2,9 @@ From: Markus Koschany <[email protected]> Date: Sat, 26 Dec 2015 00:11:06 +0100 Subject: netbeans extexecution.impl +We don't build the extexecution.impl module. + +Forwarded: not-needed --- extexecution.process/nbproject/project.properties | 6 +++--- extexecution.process/nbproject/project.xml | 4 ++-- diff --git a/debian/patches/netbeans-ide-launcher.patch b/debian/patches/netbeans-ide-launcher.patch index 4f24ece..73a9645 100644 --- a/debian/patches/netbeans-ide-launcher.patch +++ b/debian/patches/netbeans-ide-launcher.patch @@ -2,6 +2,11 @@ From: Markus Koschany <[email protected]> Date: Sun, 27 Dec 2015 00:06:16 +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 +Debian. + +Forwarded: not-needed --- ide/launcher/netbeans.conf | 3 +-- ide/launcher/unix/netbeans | 10 ++++------ diff --git a/debian/patches/netbeans-nocopy.patch b/debian/patches/netbeans-nocopy.patch index 91c52fb..c7904cd 100644 --- a/debian/patches/netbeans-nocopy.patch +++ b/debian/patches/netbeans-nocopy.patch @@ -2,6 +2,10 @@ From: Markus Koschany <[email protected]> Date: Fri, 25 Dec 2015 23:09:59 +0100 Subject: netbeans nocopy +Fix a FTBFS. Do not copy files which we don't use or are replaced by system jar +files. + +Forwarded: not-needed --- css.editor/nbproject/project.properties | 4 ++-- db.drivers/nbproject/project.properties | 4 ++-- diff --git a/debian/patches/netbeans-slf4j.dummy.patch b/debian/patches/netbeans-slf4j.dummy.patch index 3bdf5fb..068dcd7 100644 --- a/debian/patches/netbeans-slf4j.dummy.patch +++ b/debian/patches/netbeans-slf4j.dummy.patch @@ -8,8 +8,7 @@ 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. A bit -complicated but at least it works. +is later replaced by a symlink to Debian's system package of slf4j. Forwarded: not-needed --- -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netbeans.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
