This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository netbeans.
commit 3b03f73c3e25c226d3c517db6c4e2a6b34c25f8c Author: Markus Koschany <[email protected]> Date: Mon Jan 4 08:13:06 2016 +0100 Delete netbeans-core.browser.webview.patch and merge the changes into netbeans-cluster-properties.patch. Add slf4j.dummy module with netbeans-cluster-properties.patch to avoid needless rebasing of netbeans-slf4j.dummy.patch --- debian/patches/netbeans-cluster-properties.patch | 31 +++++++++++++++------- debian/patches/netbeans-core.browser.webview.patch | 24 ----------------- debian/patches/netbeans-slf4j.dummy.patch | 15 +---------- debian/patches/series | 1 - 4 files changed, 22 insertions(+), 49 deletions(-) diff --git a/debian/patches/netbeans-cluster-properties.patch b/debian/patches/netbeans-cluster-properties.patch index 66b75c1..750e187 100644 --- a/debian/patches/netbeans-cluster-properties.patch +++ b/debian/patches/netbeans-cluster-properties.patch @@ -7,11 +7,11 @@ are not in Debian yet or cause other build failures. Forwarded: not-needed --- - nbbuild/cluster.properties | 101 +-------------------------------------------- - 1 file changed, 2 insertions(+), 99 deletions(-) + nbbuild/cluster.properties | 103 ++------------------------------------------- + 1 file changed, 3 insertions(+), 100 deletions(-) diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties -index 4d3337a..550c4e6 100644 +index 4d3337a..5ddb3a8 100644 --- a/nbbuild/cluster.properties +++ b/nbbuild/cluster.properties @@ -107,10 +107,8 @@ clusters.config.java.list=\ @@ -25,7 +25,7 @@ index 4d3337a..550c4e6 100644 nb.cluster.nb clusters.config.enterprise.list=\ -@@ -297,10 +295,6 @@ nb.cluster.ide=\ +@@ -297,16 +295,11 @@ nb.cluster.ide=\ api.knockout,\ api.xml,\ api.xml.ui,\ @@ -36,7 +36,13 @@ index 4d3337a..550c4e6 100644 c.googlecode.javaewah.JavaEWAH,\ c.jcraft.jsch,\ c.jcraft.jzlib,\ -@@ -364,7 +358,6 @@ nb.cluster.ide=\ + code.analysis,\ + core.browser,\ +- core.browser.webview,\ + core.ide,\ + core.multitabs.project,\ + csl.api,\ +@@ -364,7 +357,6 @@ nb.cluster.ide=\ extbrowser,\ extexecution,\ extexecution.base,\ @@ -44,7 +50,7 @@ index 4d3337a..550c4e6 100644 extexecution.process,\ git,\ gototest,\ -@@ -372,15 +365,12 @@ nb.cluster.ide=\ +@@ -372,15 +364,12 @@ nb.cluster.ide=\ gsf.testrunner,\ gsf.testrunner.ui,\ html,\ @@ -60,7 +66,7 @@ index 4d3337a..550c4e6 100644 hudson,\ hudson.git,\ hudson.mercurial,\ -@@ -390,15 +380,6 @@ nb.cluster.ide=\ +@@ -390,15 +379,6 @@ nb.cluster.ide=\ ide.kit,\ image,\ javascript2.debug,\ @@ -76,7 +82,7 @@ index 4d3337a..550c4e6 100644 jellytools.ide,\ jumpto,\ languages,\ -@@ -419,17 +400,13 @@ nb.cluster.ide=\ +@@ -419,17 +399,13 @@ nb.cluster.ide=\ libs.json_simple,\ libs.jvyamlb,\ libs.lucene,\ @@ -94,7 +100,7 @@ index 4d3337a..550c4e6 100644 notifications,\ o.apache.commons.codec,\ o.apache.commons.httpclient,\ -@@ -438,28 +415,8 @@ nb.cluster.ide=\ +@@ -438,28 +414,8 @@ nb.cluster.ide=\ o.apache.commons.logging,\ o.apache.ws.commons.util,\ o.apache.xml.resolver,\ @@ -123,7 +129,12 @@ index 4d3337a..550c4e6 100644 o.n.swing.dirchooser,\ o.openidex.util,\ options.editor,\ -@@ -495,7 +452,6 @@ nb.cluster.ide=\ +@@ -491,11 +447,11 @@ nb.cluster.ide=\ + selenium2.server,\ + server,\ + servletapi,\ ++ slf4j.dummy,\ + spellchecker,\ spellchecker.apimodule,\ spellchecker.bindings.htmlxml,\ spellchecker.bindings.properties,\ diff --git a/debian/patches/netbeans-core.browser.webview.patch b/debian/patches/netbeans-core.browser.webview.patch deleted file mode 100644 index 8d1ab9e..0000000 --- a/debian/patches/netbeans-core.browser.webview.patch +++ /dev/null @@ -1,24 +0,0 @@ -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/nbbuild/cluster.properties b/nbbuild/cluster.properties -index 550c4e6..3af7929 100644 ---- a/nbbuild/cluster.properties -+++ b/nbbuild/cluster.properties -@@ -300,7 +300,6 @@ nb.cluster.ide=\ - c.jcraft.jzlib,\ - code.analysis,\ - core.browser,\ -- core.browser.webview,\ - core.ide,\ - core.multitabs.project,\ - csl.api,\ diff --git a/debian/patches/netbeans-slf4j.dummy.patch b/debian/patches/netbeans-slf4j.dummy.patch index 61ab20f..08acab9 100644 --- a/debian/patches/netbeans-slf4j.dummy.patch +++ b/debian/patches/netbeans-slf4j.dummy.patch @@ -12,28 +12,15 @@ is later replaced by a symlink to Debian's system package of slf4j. Forwarded: not-needed --- - nbbuild/cluster.properties | 1 + o.eclipse.jgit/nbproject/project.xml | 5 +++++ slf4j.dummy/build.xml | 12 ++++++++++++ slf4j.dummy/manifest.mf | 1 + slf4j.dummy/nbproject/project.xml | 15 +++++++++++++++ - 5 files changed, 34 insertions(+) + 4 files changed, 33 insertions(+) create mode 100644 slf4j.dummy/build.xml create mode 100644 slf4j.dummy/manifest.mf create mode 100644 slf4j.dummy/nbproject/project.xml -diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties -index 3af7929..4b9bc84 100644 ---- a/nbbuild/cluster.properties -+++ b/nbbuild/cluster.properties -@@ -447,6 +447,7 @@ nb.cluster.ide=\ - selenium2.server,\ - server,\ - servletapi,\ -+ slf4j.dummy, \ - spellchecker,\ - spellchecker.apimodule,\ - spellchecker.bindings.htmlxml,\ diff --git a/o.eclipse.jgit/nbproject/project.xml b/o.eclipse.jgit/nbproject/project.xml index f31a978..0925156 100644 --- a/o.eclipse.jgit/nbproject/project.xml diff --git a/debian/patches/series b/debian/patches/series index ef40719..3ec25e8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -19,7 +19,6 @@ netbeans-cluster-properties.patch netbeans-o.n.bootstrap.patch netbeans-platform-properties.patch netbeans-jemmy.patch -netbeans-core.browser.webview.patch antlr-3.5.2.patch netbeans-nocopy.patch db.dataview-setRowFilter-method.patch -- 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
