This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository netbeans.
commit a14d02594d6365dce0788b51e3da0222342f9d86 Author: Markus Koschany <[email protected]> Date: Sun Dec 27 01:06:49 2015 +0100 Refresh netbeans-slf4j.dummy.patch --- debian/patches/netbeans-slf4j.dummy.patch | 99 +++++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 100 insertions(+) diff --git a/debian/patches/netbeans-slf4j.dummy.patch b/debian/patches/netbeans-slf4j.dummy.patch new file mode 100644 index 0000000..5eac909 --- /dev/null +++ b/debian/patches/netbeans-slf4j.dummy.patch @@ -0,0 +1,99 @@ +From: Markus Koschany <[email protected]> +Date: Sun, 27 Dec 2015 01:05:12 +0100 +Subject: netbeans slf4j.dummy + +Fix a runtime error when loading the o.eclipse.jgit module. The bundle expects +the org.slf4j package but it is not exported by other packages. Hence we have +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. + +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(+) + 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 9a44d57..019f825 100644 +--- a/nbbuild/cluster.properties ++++ b/nbbuild/cluster.properties +@@ -444,6 +444,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 ++++ b/o.eclipse.jgit/nbproject/project.xml +@@ -17,6 +17,11 @@ + <specification-version>0.6.12</specification-version> + </run-dependency> + </dependency> ++ <dependency> ++ <code-name-base>slf4j.dummy</code-name-base> ++ <compile-dependency/> ++ <run-dependency/> ++ </dependency> + </module-dependencies> + <public-packages/> + <class-path-extension> +diff --git a/slf4j.dummy/build.xml b/slf4j.dummy/build.xml +new file mode 100644 +index 0000000..34be746 +--- /dev/null ++++ b/slf4j.dummy/build.xml +@@ -0,0 +1,12 @@ ++<?xml version="1.0" encoding="UTF-8"?> ++<project name="slf4j.dummy" default="netbeans" basedir="."> ++ <import file="../nbbuild/templates/projectized.xml"/> ++ <target name="jar"> ++ <jar jarfile="${cluster}/${module.jar}"> ++ <manifest> ++ <attribute name="Bundle-SymbolicName" value="slf4j.dummy;singleton:=true"/> ++ <attribute name="Export-Package" value="org.slf4j;version=1.7.12"/> ++ </manifest> ++ </jar> ++ </target> ++</project> +diff --git a/slf4j.dummy/manifest.mf b/slf4j.dummy/manifest.mf +new file mode 100644 +index 0000000..74571ad +--- /dev/null ++++ b/slf4j.dummy/manifest.mf +@@ -0,0 +1 @@ ++OpenIDE-Module: slf4j.dummy +diff --git a/slf4j.dummy/nbproject/project.xml b/slf4j.dummy/nbproject/project.xml +new file mode 100644 +index 0000000..53962c8 +--- /dev/null ++++ b/slf4j.dummy/nbproject/project.xml +@@ -0,0 +1,15 @@ ++<?xml version="1.0" encoding="UTF-8"?> ++<project xmlns="http://www.netbeans.org/ns/project/1";> ++ <type>org.netbeans.modules.apisupport.project</type> ++ <configuration> ++ <data xmlns="http://www.netbeans.org/ns/nb-module-project/2";> ++ <code-name-base>slf4j.dummy</code-name-base> ++ <module-dependencies/> ++ <public-packages/> ++ <class-path-extension> ++ <runtime-relative-path>slf4j-dummy.jar</runtime-relative-path> ++ <binary-origin>external/slf4j-dummy.jar</binary-origin> ++ </class-path-extension> ++ </data> ++ </configuration> ++</project> diff --git a/debian/patches/series b/debian/patches/series index ccc6790..4296dbe 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -33,3 +33,4 @@ netbeans-com.sun.tools.hc.patch netbeans-CommandLineParser.patch netbeans-ide-launcher.patch netbeans-xsl-httpserver.patch +netbeans-slf4j.dummy.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
