[netbeans] 15/33: Revert "Remove slf4j-dummy.jar"
Markus Koschany
apo-guest at moszumanska.debian.org
Wed Feb 24 19:39:51 GMT 2016
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository netbeans.
commit 496c8a89dd9dea7a463020ab441167380e286528
Author: Markus Koschany <apo at debian.org>
Date: Tue Feb 23 15:52:53 2016 +0100
Revert "Remove slf4j-dummy.jar"
This reverts commit 35fa132dcebb9b468cc99504fbd3a3c5fc1f5863.
---
debian/patches/netbeans-cluster-properties.patch | 47 +++++++++++++-----------
debian/rules | 2 +
2 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/debian/patches/netbeans-cluster-properties.patch b/debian/patches/netbeans-cluster-properties.patch
index b873e02..188fec1 100644
--- a/debian/patches/netbeans-cluster-properties.patch
+++ b/debian/patches/netbeans-cluster-properties.patch
@@ -9,11 +9,11 @@ For slf4j.dummy see also netbeans-slf4j.dummy.patch.
Forwarded: not-needed
---
- nbbuild/cluster.properties | 103 +--------------------------------------------
- 1 file changed, 2 insertions(+), 101 deletions(-)
+ nbbuild/cluster.properties | 104 ++-------------------------------------------
+ 1 file changed, 3 insertions(+), 101 deletions(-)
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
-index 4d3337a..5ed0a92 100644
+index 4d3337a..a552b65 100644
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
@@ -107,10 +107,8 @@ clusters.config.java.list=\
@@ -131,7 +131,12 @@ index 4d3337a..5ed0a92 100644
o.n.swing.dirchooser,\
o.openidex.util,\
options.editor,\
-@@ -495,7 +450,6 @@ nb.cluster.ide=\
+@@ -491,11 +446,11 @@ nb.cluster.ide=\
+ selenium2.server,\
+ server,\
+ servletapi,\
++ slf4j.dummy,\
+ spellchecker,\
spellchecker.apimodule,\
spellchecker.bindings.htmlxml,\
spellchecker.bindings.properties,\
@@ -139,7 +144,7 @@ index 4d3337a..5ed0a92 100644
spellchecker.kit,\
spi.debugger.ui,\
spi.editor.hints,\
-@@ -554,7 +508,6 @@ nb.cluster.java.depends=\
+@@ -554,7 +509,6 @@ nb.cluster.java.depends=\
nb.cluster.ide,\
nb.cluster.extide,\
nb.cluster.platform,\
@@ -147,7 +152,7 @@ index 4d3337a..5ed0a92 100644
nb.cluster.harness
nb.cluster.java=\
ant.browsetask,\
-@@ -564,7 +517,6 @@ nb.cluster.java=\
+@@ -564,7 +518,6 @@ nb.cluster.java=\
ant.kit,\
api.debugger.jpda,\
api.java,\
@@ -155,7 +160,7 @@ index 4d3337a..5ed0a92 100644
beans,\
classfile,\
dbschema,\
-@@ -583,21 +535,15 @@ nb.cluster.java=\
+@@ -583,21 +536,15 @@ nb.cluster.java=\
form.kit,\
form.nb,\
form.refactoring,\
@@ -177,7 +182,7 @@ index 4d3337a..5ed0a92 100644
j2ee.persistenceapi,\
java.api.common,\
java.completion,\
-@@ -650,26 +596,6 @@ nb.cluster.java=\
+@@ -650,26 +597,6 @@ nb.cluster.java=\
libs.cglib,\
libs.javacapi,\
libs.javacimpl,\
@@ -204,7 +209,7 @@ index 4d3337a..5ed0a92 100644
nashorn.execution,\
o.jdesktop.beansbinding,\
performance,\
-@@ -678,18 +604,12 @@ nb.cluster.java=\
+@@ -678,18 +605,12 @@ nb.cluster.java=\
projectimport.eclipse.j2se,\
refactoring.java,\
selenium2.java,\
@@ -223,7 +228,7 @@ index 4d3337a..5ed0a92 100644
whitelist,\
xml.jaxb,\
xml.tools.java
-@@ -707,16 +627,12 @@ nb.cluster.apisupport.depends=\
+@@ -707,16 +628,12 @@ nb.cluster.apisupport.depends=\
nb.cluster.apisupport=\
apisupport.ant,\
apisupport.crudsample,\
@@ -241,7 +246,7 @@ index 4d3337a..5ed0a92 100644
nb.cluster.enterprise.dir=enterprise
nb.cluster.enterprise.depends=\
-@@ -730,7 +646,6 @@ nb.cluster.enterprise.depends=\
+@@ -730,7 +647,6 @@ nb.cluster.enterprise.depends=\
nb.cluster.harness
nb.cluster.enterprise=\
api.web.webmodule,\
@@ -249,7 +254,7 @@ index 4d3337a..5ed0a92 100644
cloud.amazon,\
cloud.common,\
el.lexer,\
-@@ -778,9 +693,6 @@ nb.cluster.enterprise=\
+@@ -778,9 +694,6 @@ nb.cluster.enterprise=\
libs.elimpl,\
libs.glassfish_logging,\
libs.jstl,\
@@ -259,7 +264,7 @@ index 4d3337a..5ed0a92 100644
performance.javaee,\
performance.scripting,\
performance.web,\
-@@ -858,7 +770,6 @@ nb.cluster.nb.depends=\
+@@ -858,7 +771,6 @@ nb.cluster.nb.depends=\
nb.cluster.harness
nb.cluster.nb=\
autoupdate.pluginimporter,\
@@ -267,7 +272,7 @@ index 4d3337a..5ed0a92 100644
deadlock.detector,\
ide.branding,\
ide.branding.kit,\
-@@ -888,7 +799,6 @@ nb.cluster.profiler=\
+@@ -888,7 +800,6 @@ nb.cluster.profiler=\
lib.profiler.charts,\
lib.profiler.common,\
lib.profiler.ui,\
@@ -275,7 +280,7 @@ index 4d3337a..5ed0a92 100644
profiler,\
profiler.api,\
profiler.attach,\
-@@ -972,9 +882,7 @@ nb.cluster.groovy=\
+@@ -972,9 +883,7 @@ nb.cluster.groovy=\
groovy.kit,\
groovy.refactoring,\
groovy.samples,\
@@ -286,7 +291,7 @@ index 4d3337a..5ed0a92 100644
nb.cluster.mobility.dir=mobility
nb.cluster.mobility.depends=\
-@@ -1068,7 +976,6 @@ nb.cluster.cnd=\
+@@ -1068,7 +977,6 @@ nb.cluster.cnd=\
cnd.toolchain,\
cnd.utils,\
jellytools.cnd,\
@@ -294,7 +299,7 @@ index 4d3337a..5ed0a92 100644
validation.nb.cluster.cnd=\
cnd.kit
-@@ -1121,8 +1028,6 @@ nb.cluster.jira=\
+@@ -1121,8 +1029,6 @@ nb.cluster.jira=\
o.apache.axis,\
o.apache.commons.discovery,\
o.codehaus.jettison,\
@@ -303,7 +308,7 @@ index 4d3337a..5ed0a92 100644
o.joda.time
nb.cluster.team.dir=extra
-@@ -1131,7 +1036,6 @@ nb.cluster.team.depends=\
+@@ -1131,7 +1037,6 @@ nb.cluster.team.depends=\
nb.cluster.platform,\
nb.cluster.ide
nb.cluster.team=\
@@ -311,7 +316,7 @@ index 4d3337a..5ed0a92 100644
c.tasktop.c2c.server.cloud.api,\
c.tasktop.c2c.server.common.api,\
c.tasktop.c2c.server.profile.api,\
-@@ -1140,7 +1044,6 @@ nb.cluster.team=\
+@@ -1140,7 +1045,6 @@ nb.cluster.team=\
c.tasktop.c2c.server.wiki.api,\
kenai,\
kenai.kit,\
@@ -319,7 +324,7 @@ index 4d3337a..5ed0a92 100644
kenai.ui,\
lib.cvsclient,\
o.codehaus.jackson.core,\
-@@ -1194,7 +1097,6 @@ nb.cluster.stableuc=\
+@@ -1194,7 +1098,6 @@ nb.cluster.stableuc=\
libs.oracle.cloud,\
libs.ppawtlayout,\
loadgenerator,\
@@ -327,7 +332,7 @@ index 4d3337a..5ed0a92 100644
mobility.antext,\
mobility.cldcplatform.catalog,\
mobility.deployment.ftpscp,\
-@@ -1267,7 +1169,6 @@ nb.cluster.betauc=\
+@@ -1267,7 +1170,6 @@ nb.cluster.betauc=\
contrib/modulemanager,\
contrib/quickfilechooser,\
contrib/selenium,\
diff --git a/debian/rules b/debian/rules
index 42fbdd8..08e28ee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -89,6 +89,8 @@ override_dh_auto_install:
$(INSTALL)$(pkg-ide) nbbuild/netbeans/ide/* $(NB_INSTALL_DIR)/$(base-ide)
$(INSTALL)$(pkg-ide) nbbuild/netbeans/ide/.noautoupdate $(NB_INSTALL_DIR)/$(base-ide)
$(INSTALL)$(pkg-ide) nbbuild/netbeans/ide/.lastModified $(NB_INSTALL_DIR)/$(base-ide)
+ # See netbeans-slf4j.dummy.patch for further information
+ $(LINK)$(pkg-ide) usr/share/java/slf4j-api.jar $(NB_INSTALL_DIR)/$(base-ide)/modules/slf4j-dummy.jar
# Symlink IDE modules to corresponding system jar files
#$(LINK)$(pkg-ide) usr/share/java/org.eclipse.jgit.jar $(NB_INSTALL_DIR)/$(base-ide)/modules/org-eclipse-jgit.jar
#$(LINK)$(pkg-ide) usr/share/java/org.eclipse.jgit.java7.jar $(NB_INSTALL_DIR)/$(base-ide)/modules/org-eclipse-jgit-java7.jar
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netbeans.git
More information about the pkg-java-commits
mailing list