[SCM] eclipse - Powerful IDE written in java - Debian package. branch, upstream-3.6, updated. af305acc40a0047c79328ed367998e92517319eb

[Benjamin Drung]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "eclipse - Powerful IDE written in java - Debian package.".

The branch, upstream-3.6 has been updated
       via  af305acc40a0047c79328ed367998e92517319eb (commit)
      from  5dc98a6fe8e928c8a11e307cfdb2d23ca7537089 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 ChangeLog              |    5 +++++
 build.xml              |    1 +
 patches/bz318912.patch |   20 ++++++++++++++++++++
 3 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 10ab39e..81e1313 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-08  Alexander Kurtakov  <akurtako at redhat.com>
+
+	* patches/bz318912.patch: New file.
+	* build.xml: Apply the new patch.
+
 2010-07-07  Alexander Kurtakov  <akurtako at redhat.com>
 
 	* build.xml: Fix strip of the patch.
diff --git a/build.xml b/build.xml
index 8439fa3..18657e6 100644
--- a/build.xml
+++ b/build.xml
@@ -282,6 +282,7 @@
 		<patch patchfile="${basedir}/patches/eclipse-nosourcebundlesfordependencies.patch" dir="${buildDirectory}" strip="1" />
 		<patch patchfile="${basedir}/patches/eclipse-use-newer-commons-codec.patch" dir="${buildDirectory}"  strip="1" />
 		<patch patchfile="${basedir}/patches/junit4-nochecksum.patch" dir="${buildDirectory}"  strip="0" />
+		<patch patchfile="${basedir}/patches/bz318912.patch" dir="${buildDirectory}"  strip="0" />
 		<patch patchfile="${basedir}/patches/osgi-util.patch" dir="${buildDirectory}" strip="1" />
 		<replace file="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build/build.properties" token="/usr/share/eclipse" value="/usr/${libDir}/eclipse" />
 		<chmod dir="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build" includes="*.sh" perm="a+x" />
diff --git a/patches/bz318912.patch b/patches/bz318912.patch
new file mode 100644
index 0000000..1d344c9
--- /dev/null
+++ b/patches/bz318912.patch
@@ -0,0 +1,20 @@
+### Eclipse Workspace Patch 1.0
+#P org.eclipse.help.base
+Index: META-INF/MANIFEST.MF
+===================================================================
+RCS file: /cvsroot/eclipse/org.eclipse.help.base/META-INF/MANIFEST.MF,v
+retrieving revision 1.45
+diff -u -r1.45 MANIFEST.MF
+--- plugins/org.eclipse.help.base/META-INF/MANIFEST.MF	24 Jun 2010 18:38:49 -0000	1.45
++++ plugins/org.eclipse.help.baseMETA-INF/MANIFEST.MF	7 Jul 2010 23:16:48 -0000
+@@ -39,8 +39,8 @@
+  org.eclipse.help.search,
+  org.eclipse.help.server,
+  org.eclipse.help.standalone
+-Require-Bundle: org.apache.lucene;bundle-version="[1.9.1,2.0.0)";visibility:=reexport,
+- org.apache.lucene.analysis;bundle-version="[1.9.1,2.0.0)";visibility:=reexport,
++Require-Bundle: org.apache.lucene;bundle-version="[1.9.1,3.0.0)";visibility:=reexport,
++ org.apache.lucene.analysis;bundle-version="[1.9.1,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,


hooks/post-receive
-- 
eclipse - Powerful IDE written in java - Debian package.