[netbeans] 19/49: Drop netbeans-slf4j.dummy.patch

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository netbeans.

commit 824e3c081e0736a32cf3ef4b90e04043d35c7c7c
Author: Markus Koschany <apo at debian.org>
Date:   Thu Dec 17 01:44:53 2015 +0100

    Drop netbeans-slf4j.dummy.patch
---
 debian/patches/netbeans-slf4j.dummy.patch | 108 ------------------------------
 debian/patches/series                     |   1 -
 2 files changed, 109 deletions(-)

diff --git a/debian/patches/netbeans-slf4j.dummy.patch b/debian/patches/netbeans-slf4j.dummy.patch
deleted file mode 100644
index a7337ac..0000000
--- a/debian/patches/netbeans-slf4j.dummy.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Sun, 14 Jun 2015 02:44:00 +0200
-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. 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.properties |  1 +
- slf4j.dummy/nbproject/project.xml        | 15 +++++++++++++++
- 6 files changed, 35 insertions(+)
- create mode 100644 slf4j.dummy/build.xml
- create mode 100644 slf4j.dummy/manifest.mf
- create mode 100644 slf4j.dummy/nbproject/project.properties
- create mode 100644 slf4j.dummy/nbproject/project.xml
-
-diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
-index 1da0278..910581e 100644
---- a/nbbuild/cluster.properties
-+++ b/nbbuild/cluster.properties
-@@ -341,6 +341,7 @@ nb.cluster.ide=\
-         ide.kit,\
-         image,\
-         javaewah.dummy,\
-+        slf4j.dummy,\
-         javascript2.debug,\
-         jellytools.ide,\
-         jumpto,\
-diff --git a/o.eclipse.jgit/nbproject/project.xml b/o.eclipse.jgit/nbproject/project.xml
-index f4a1600..3158761 100644
---- a/o.eclipse.jgit/nbproject/project.xml
-+++ b/o.eclipse.jgit/nbproject/project.xml
-@@ -17,6 +17,11 @@
-                         <specification-version>0.7.9</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..e24f661
---- /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.properties b/slf4j.dummy/nbproject/project.properties
-new file mode 100644
-index 0000000..c4a287a
---- /dev/null
-+++ b/slf4j.dummy/nbproject/project.properties
-@@ -0,0 +1 @@
-+is.autoload=true
-diff --git a/slf4j.dummy/nbproject/project.xml b/slf4j.dummy/nbproject/project.xml
-new file mode 100644
-index 0000000..8f009eb
---- /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 ad38660..943613a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,7 +14,6 @@ netbeans-libs.jaxb.patch
 netbeans-xml.jaxb.api.patch
 netbeans-build.patch
 netbeans-updatecenters.patch
-netbeans-slf4j.dummy.patch
 netbeans-include-junit.patch
 reproducible-build.patch
 antlr-3.5.2.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netbeans.git