[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. debian/3.7.2-1-2-ge90b394

[Jakub Adam]

The following commit has been merged in the master branch:
commit cb7bec8e9145eaf72dc7d54f499261d2680082bc
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Tue Apr 17 19:08:11 2012 +0200

    Fix generation of Eclipse Help search index

diff --git a/debian/changelog b/debian/changelog
index 4c340d5..e73afe9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+eclipse (3.7.2-2) UNRELEASED; urgency=low
+
+  * Fix generation of Eclipse Help search index (Closes: #669000).
+
+ -- Jakub Adam <jakub.adam at ktknet.cz>  Tue, 17 Apr 2012 19:04:43 +0200
+
 eclipse (3.7.2-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/remove-org-apache-lucene.patch b/debian/patches/remove-org-apache-lucene.patch
index 57ee674..ece8d8a 100644
--- a/debian/patches/remove-org-apache-lucene.patch
+++ b/debian/patches/remove-org-apache-lucene.patch
@@ -7,8 +7,9 @@ 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 +--
+ .../eclipse/help/internal/search/SearchIndex.java  |    2 +-
  pdebuild.xml                                       |    3 +--
- 4 files changed, 4 insertions(+), 7 deletions(-)
+ 5 files changed, 5 insertions(+), 8 deletions(-)
 
 diff --git a/bootstrap/configuration/config.ini b/bootstrap/configuration/config.ini
 index 8164013..5fabf9f 100644
@@ -42,7 +43,7 @@ index 4318c86..ea68f6e 100644
     <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
+index 7aa8223..9969713 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,
@@ -55,6 +56,19 @@ index 139dd1c..4f01137 100644
   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/eclipse/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java b/eclipse/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java
+index 50930c7..7a03e63 100644
+--- a/eclipse/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java
++++ b/eclipse/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java
+@@ -106,7 +106,7 @@ public class SearchIndex implements ISearchIndex, IHelpSearchIndex {
+ 
+ 	public static final String DEPENDENCIES_KEY_ANALYZER = "analyzer"; //$NON-NLS-1$
+ 
+-	private static final String LUCENE_BUNDLE_ID = "org.apache.lucene"; //$NON-NLS-1$
++	private static final String LUCENE_BUNDLE_ID = "org.apache.lucene.core"; //$NON-NLS-1$
+ 
+ 	private static final String FIELD_NAME = "name"; //$NON-NLS-1$
+ 
 diff --git a/pdebuild.xml b/pdebuild.xml
 index cafda11..431eaf6 100644
 --- a/pdebuild.xml
@@ -69,4 +83,3 @@ index cafda11..431eaf6 100644
  		<!--
  		<file name="org.eclipse.help" />
  		<file name="org.eclipse.help.base" />
--- 

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