[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. debian/3.7_exp-5-52-gb9d9b98

[Jakub Adam]

The following commit has been merged in the master branch:
commit aab122c6a8195b3f1816dc5c77d3a540d63af7db
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Thu Dec 29 03:29:19 2011 +0100

    Remove org.apache.lucene

diff --git a/debian/patches/remove-org-apache-lucene.patch b/debian/patches/remove-org-apache-lucene.patch
new file mode 100644
index 0000000..57ee674
--- /dev/null
+++ b/debian/patches/remove-org-apache-lucene.patch
@@ -0,0 +1,72 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Wed, 28 Dec 2011 01:45:51 +0100
+Subject: remove-org-apache-lucene
+
+org.apache.lucene was removed and is not required.
+---
+ bootstrap/configuration/config.ini                 |    1 -
+ eclipse/features/org.eclipse.help/feature.xml      |    4 ++--
+ .../org.eclipse.help.base/META-INF/MANIFEST.MF     |    3 +--
+ pdebuild.xml                                       |    3 +--
+ 4 files changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/bootstrap/configuration/config.ini b/bootstrap/configuration/config.ini
+index 8164013..5fabf9f 100644
+--- a/bootstrap/configuration/config.ini
++++ b/bootstrap/configuration/config.ini
+@@ -54,7 +54,6 @@ osgi.bundles=com.ibm.icu,\
+              org.eclipse.help,\
+              org.apache.lucene.core,\
+              org.apache.lucene.analysis,\
+-             org.apache.lucene,\
+              org.mortbay.jetty.util,\
+              org.mortbay.jetty.server,\
+              org.eclipse.equinox.http.servlet,\
+diff --git a/eclipse/features/org.eclipse.help/feature.xml b/eclipse/features/org.eclipse.help/feature.xml
+index 4318c86..ea68f6e 100644
+--- a/eclipse/features/org.eclipse.help/feature.xml
++++ b/eclipse/features/org.eclipse.help/feature.xml
+@@ -56,12 +56,12 @@
+          version="0.0.0"
+          unpack="false"/>
+ 
+-   <plugin
++   <!--plugin
+          id="org.apache.lucene"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+-         unpack="false"/>
++         unpack="false"/-->
+ 
+    <plugin
+          id="org.apache.lucene.analysis"
+diff --git a/eclipse/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF
+index 139dd1c..4f01137 100644
+--- a/eclipse/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF
++++ b/eclipse/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF
+@@ -39,8 +39,7 @@ Export-Package: org.apache.lucene.demo.html;x-internal:=true,
+  org.eclipse.help.search,
+  org.eclipse.help.server,
+  org.eclipse.help.standalone
+-Require-Bundle: org.apache.lucene;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
+- org.apache.lucene.analysis;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
++Require-Bundle: org.apache.lucene.analysis;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
+  org.eclipse.ant.core;bundle-version="3.2.200";resolution:=optional,
+  org.eclipse.core.runtime;bundle-version="3.6.0",
+  org.eclipse.help;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
+diff --git a/pdebuild.xml b/pdebuild.xml
+index cafda11..431eaf6 100644
+--- a/pdebuild.xml
++++ b/pdebuild.xml
+@@ -73,8 +73,7 @@
+ 		       org.eclipse.core.expressions
+ 		       org.eclipse.equinox.http.servlet
+ 		       org.eclipse.equinox.p2.touchpoint.eclipse
+-		       org.eclipse.equinox.p2.touchpoint.natives
+-		       org.apache.lucene" />
++		       org.eclipse.equinox.p2.touchpoint.natives" />
+ 		<!--
+ 		<file name="org.eclipse.help" />
+ 		<file name="org.eclipse.help.base" />
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 83cd352..f8a370e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,3 +17,4 @@ gnomeproxy-makefile.patch
 find-newer-servlet-api.patch
 eclipse-build-additionalArchs.patch
 fix-org-eclipse-swt-gtk-linux.patch
+remove-org-apache-lucene.patch

-- 
eclipse - Powerful IDE written in java - Debian package.