[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.6, updated. eclipse-ppa/maverick-108-g86453f3
Benjamin Drung
bdrung-guest at alioth.debian.org
Thu Jul 8 09:07:52 UTC 2010
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, master-3.6 has been updated
via 86453f336af5185e252c18a8e5dd105f4d64c58e (commit)
via b8dd057bb7a11a1397a711986a1d46e72dadfaf2 (commit)
via 453df6310e0ba2a47c8e72425cd8983115d7d14c (commit)
via af305acc40a0047c79328ed367998e92517319eb (commit)
from 16bf758c7765c6d78e2a05d728d80e23dfe049e3 (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 -----------------------------------------------------------------
commit 86453f336af5185e252c18a8e5dd105f4d64c58e
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Thu Jul 8 11:07:31 2010 +0200
Refresh patches.
commit b8dd057bb7a11a1397a711986a1d46e72dadfaf2
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Thu Jul 8 11:06:09 2010 +0200
Drop lucene.patch.
commit 453df6310e0ba2a47c8e72425cd8983115d7d14c
Merge: 16bf758 af305ac
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Thu Jul 8 11:05:14 2010 +0200
Merge branch 'upstream-3.6' into master-3.6
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++
build.xml | 1 +
debian/patches/compile-IPluginDescriptor.patch | 2 +-
debian/patches/compile-jarinjarloader.patch | 2 +-
debian/patches/eclipse-manpage.patch | 2 +-
debian/patches/osgi-services-symlink-javax.patch | 2 +-
debian/patches/osgi-services.patch | 4 +-
debian/patches/series | 1 -
debian/patches/swt-compile-xpt.patch | 4 +-
.../patches/lucene.patch => patches/bz318912.patch | 37 +++++++++++---------
10 files changed, 34 insertions(+), 26 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/debian/patches/compile-IPluginDescriptor.patch b/debian/patches/compile-IPluginDescriptor.patch
index 95441a4..f982f21 100644
--- a/debian/patches/compile-IPluginDescriptor.patch
+++ b/debian/patches/compile-IPluginDescriptor.patch
@@ -4,7 +4,7 @@ Forwarded: no
--- a/build.xml
+++ b/build.xml
-@@ -364,6 +364,32 @@
+@@ -365,6 +365,32 @@
<zip destfile="${buildDirectory}/plugins/org.eclipse.jdt.ui/jar-in-jar-loader.zip"
basedir="${basedir}/temp/"/>
<delete dir="${basedir}/temp/"/>
diff --git a/debian/patches/compile-jarinjarloader.patch b/debian/patches/compile-jarinjarloader.patch
index cb40afd..057a957 100644
--- a/debian/patches/compile-jarinjarloader.patch
+++ b/debian/patches/compile-jarinjarloader.patch
@@ -12,7 +12,7 @@ Forwarded: no
<uptodate property="testspatch.complete" srcfile="testsunpack-stamp" targetfile="testspatch-stamp" />
<uptodate property="compilelibs.complete" srcfile="unpack-stamp" targetfile="compilelibs-stamp" />
<uptodate property="build.complete" srcfile="patch-stamp" targetfile="build-stamp" />
-@@ -350,7 +351,24 @@
+@@ -351,7 +352,24 @@
<echo file="symlinks-stamp" />
</target>
diff --git a/debian/patches/eclipse-manpage.patch b/debian/patches/eclipse-manpage.patch
index 1ea1b37..36f128e 100644
--- a/debian/patches/eclipse-manpage.patch
+++ b/debian/patches/eclipse-manpage.patch
@@ -624,7 +624,7 @@ Bug-Ubuntu: https://launchpad.net/bugs/494065
+</refentry>
--- a/build.xml
+++ b/build.xml
-@@ -779,6 +779,12 @@
+@@ -780,6 +780,12 @@
<!-- eclipse binary -->
<mkdir dir="${destDir}${prefix}/bin" />
<symlink link="${destDir}${prefix}/bin/eclipse" resource="../${libDir}/eclipse/eclipse" />
diff --git a/debian/patches/osgi-services-symlink-javax.patch b/debian/patches/osgi-services-symlink-javax.patch
index aec2226..a2c69c5 100644
--- a/debian/patches/osgi-services-symlink-javax.patch
+++ b/debian/patches/osgi-services-symlink-javax.patch
@@ -4,7 +4,7 @@ Forwarded: No
--- a/build.xml
+++ b/build.xml
-@@ -285,6 +285,7 @@
+@@ -286,6 +286,7 @@
<patch patchfile="${basedir}/patches/osgi-util.patch" dir="${buildDirectory}" strip="1" />
<patch patchfile="${basedir}/patches/eclipse-swt-compile-xpt.patch" dir="${buildDirectory}" strip="1" />
<patch patchfile="${basedir}/patches/osgi-services-build.patch" dir="${buildDirectory}" strip="1" />
diff --git a/debian/patches/osgi-services.patch b/debian/patches/osgi-services.patch
index 0134fdf..0ed1ecf 100644
--- a/debian/patches/osgi-services.patch
+++ b/debian/patches/osgi-services.patch
@@ -5,8 +5,8 @@ Applied-Upstream: no
--- a/build.xml
+++ b/build.xml
-@@ -284,6 +284,7 @@
- <patch patchfile="${basedir}/patches/junit4-nochecksum.patch" dir="${buildDirectory}" strip="0" />
+@@ -285,6 +285,7 @@
+ <patch patchfile="${basedir}/patches/bz318912.patch" dir="${buildDirectory}" strip="0" />
<patch patchfile="${basedir}/patches/osgi-util.patch" dir="${buildDirectory}" strip="1" />
<patch patchfile="${basedir}/patches/eclipse-swt-compile-xpt.patch" dir="${buildDirectory}" strip="1" />
+ <patch patchfile="${basedir}/patches/osgi-services-build.patch" dir="${buildDirectory}" strip="1" />
diff --git a/debian/patches/series b/debian/patches/series
index 96e5136..d16f00a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,7 +6,6 @@ fix-bashism.patch
compile-jarinjarloader.patch
compile-IPluginDescriptor.patch
use-stable-xulrunner.patch
-lucene.patch
add-o.e.equinox.concurrent.patch
ecj-gccmain-java.patch
eclipse-build-generatedScripts.patch
diff --git a/debian/patches/swt-compile-xpt.patch b/debian/patches/swt-compile-xpt.patch
index 457ff45..d9d40ec 100644
--- a/debian/patches/swt-compile-xpt.patch
+++ b/debian/patches/swt-compile-xpt.patch
@@ -4,9 +4,9 @@ Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=304112
--- a/build.xml
+++ b/build.xml
-@@ -283,6 +283,7 @@
- <patch patchfile="${basedir}/patches/eclipse-use-newer-commons-codec.patch" dir="${buildDirectory}" strip="1" />
+@@ -284,6 +284,7 @@
<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" />
+ <patch patchfile="${basedir}/patches/eclipse-swt-compile-xpt.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" />
diff --git a/debian/patches/lucene.patch b/patches/bz318912.patch
similarity index 57%
rename from debian/patches/lucene.patch
rename to patches/bz318912.patch
index 87fbb3e..1d344c9 100644
--- a/debian/patches/lucene.patch
+++ b/patches/bz318912.patch
@@ -1,17 +1,20 @@
-Description: Removed expected version for lucene2, since our version is "too new".
-Author: Niels Thykier <niels at thykier.net>
-Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=318912
-
---- 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,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,
+### 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.
More information about the pkg-java-commits
mailing list