[tika] 08/23: Drop 05-osgi-compatibility.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 tika.

commit 4bf5f650bd6e00feb5253e66e5c469ac1a1cdd20
Author: Markus Koschany <apo at debian.org>
Date:   Mon Nov 30 15:49:30 2015 +0000

    Drop 05-osgi-compatibility.patch
---
 debian/patches/05-osgi-compatibility.patch | 23 -----------------------
 debian/patches/series                      |  1 -
 2 files changed, 24 deletions(-)

diff --git a/debian/patches/05-osgi-compatibility.patch b/debian/patches/05-osgi-compatibility.patch
deleted file mode 100644
index 3fd627c..0000000
--- a/debian/patches/05-osgi-compatibility.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Ensure the compatibility with the version of osgi-core in Debian
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: not-needed
---- a/tika-parsers/src/main/java/org/apache/tika/parser/internal/Activator.java
-+++ b/tika-parsers/src/main/java/org/apache/tika/parser/internal/Activator.java
-@@ -34,13 +34,13 @@
- 
-     public void start(BundleContext context) throws Exception {
-         detectorService = context.registerService(
--                Detector.class.getName(),
-+                Detector.class,
-                 new DefaultDetector(Activator.class.getClassLoader()),
--                new Properties());
-+                new java.util.Hashtable<String,String>());
-         parserService = context.registerService(
--                Parser.class.getName(),
-+                Parser.class,
-                 new DefaultParser(Activator.class.getClassLoader()),
--                new Properties());
-+                new java.util.Hashtable<String,String>());
-     }
- 
-     public void stop(BundleContext context) throws Exception {
diff --git a/debian/patches/series b/debian/patches/series
index 21b7949..8551c41 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 01-jar-packaging.patch
-05-osgi-compatibility.patch
 06-optional-parser-dependencies.patch

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