[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.6, updated. eclipse-ppa/maverick-13-g448af37

Benjamin Drung bdrung-guest at alioth.debian.org
Thu Jun 10 17:12:55 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  448af370585bf2c3a772bfda2d50bae40d0f3ca1 (commit)
      from  dc0b10278cfcc27d0ae3c51d242b891edadcb6ca (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 448af370585bf2c3a772bfda2d50bae40d0f3ca1
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Thu Jun 10 19:12:37 2010 +0200

    Remove patches that are applied upstream.

-----------------------------------------------------------------------

Summary of changes:
 debian/patches/osgi-util.patch                     |   38 --------
 debian/patches/series                              |    2 -
 debian/patches/upstream-eclipse-build-repack.patch |   93 --------------------
 3 files changed, 0 insertions(+), 133 deletions(-)

diff --git a/debian/patches/osgi-util.patch b/debian/patches/osgi-util.patch
deleted file mode 100644
index 80edf18..0000000
--- a/debian/patches/osgi-util.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Description: Updates o.e.osgi.util's build properties so it builds from source.
-Author: Niels Thykier <niels at thykier.net>
-Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=305244
-Applied-Upstream: no
-
---- /dev/null
-+++ b/patches/osgi-util.patch
-@@ -0,0 +1,20 @@
-+diff --git a/eclipse/plugins/org.eclipse.osgi.util/build.properties b/eclipse/plugins/org.eclipse.osgi.util/build.properties
-+index 2a015f5..270afcd 100644
-+--- a/plugins/org.eclipse.osgi.util/build.properties
-++++ b/plugins/org.eclipse.osgi.util/build.properties
-+@@ -12,10 +12,10 @@ bin.includes = plugin.properties,\
-+                org/,\
-+                about.html,\
-+                META-INF/,\
-++               about_files/,\
-++               .
-++src.includes = about.html,\
-+                about_files/
-+-src.includes = src.zip,\
-+-               about.html,\
-+-               about_files/
-+-source.. = .
-++source.. = src/
-+ output.. = .
-+-customBuildCallbacks=customBuildCallbacks.xml
-++#customBuildCallbacks=customBuildCallbacks.xml
---- a/build.xml
-+++ b/build.xml
-@@ -257,6 +257,7 @@
- 		<patch patchfile="${basedir}/patches/eclipse-use-newer-commons-codec.patch" dir="${buildDirectory}"  strip="0" />
- 		<patch patchfile="${basedir}/patches/addEcfQualifiers.patch" dir="${buildDirectory}"  strip="0" />
- 		<patch patchfile="${basedir}/patches/droppluginversions.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" />
- 		<!-- end eclipse-build-only patches -->
diff --git a/debian/patches/series b/debian/patches/series
index a9df4b5..27f2dff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-upstream-eclipse-build-repack.patch
-osgi-util.patch
 osgi-services.patch
 fix-shell-script-perm.patch
 lucene.patch
diff --git a/debian/patches/upstream-eclipse-build-repack.patch b/debian/patches/upstream-eclipse-build-repack.patch
deleted file mode 100644
index 6f69342..0000000
--- a/debian/patches/upstream-eclipse-build-repack.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-Description: This patch contains the diff between the first version and the
- updated version eclipse-build 0.5.0
-Origin: upstream
-
---- a/build.xml
-+++ b/build.xml
-@@ -256,6 +256,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="0" />
- 		<patch patchfile="${basedir}/patches/addEcfQualifiers.patch" dir="${buildDirectory}"  strip="0" />
-+		<patch patchfile="${basedir}/patches/droppluginversions.patch" dir="${buildDirectory}"  strip="0" />
- 		<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" />
- 		<!-- end eclipse-build-only patches -->
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,8 @@
-+2010-03-18  Alexander Kurtakov  <akurtako at redhat.com>
-+
-+	* patches/droppluginversions.patch: New file.
-+	* build.xml: Apply patch to match upstream qualifiers.
-+
- 2010-03-12  Andrew Overholt  <overholt at redhat.com>
- 
- 	* build.xml: Remove unnecessary copying of test result XML files.
---- /dev/null
-+++ b/patches/droppluginversions.patch
-@@ -0,0 +1,65 @@
-+--- pluginVersions.properties.sav	2010-03-18 13:10:05.000000000 +0200
-++++ pluginVersions.properties	2010-03-18 13:14:44.477528467 +0200
-+@@ -27,7 +27,7 @@ org.eclipse.equinox.simpleconfigurator.m
-+ org.eclipse.pde.api.tools.ui,0.0.0=v20090820
-+ org.eclipse.jdt.debug,0.0.0=v20090526
-+ org.eclipse.sdk.examples,0.0.0=v20080612
-+-org.eclipse.pde,0.0.0=v20090527
-++org.eclipse.pde,0.0.0=v201002111343
-+ org.eclipse.compare.core,0.0.0=I20090430-0408
-+ org.eclipse.equinox.p2.engine,0.0.0=R35x_v20091117
-+ org.eclipse.equinox.launcher.motif.hpux.ia64_32,0.0.0=v20090519
-+@@ -38,7 +38,7 @@ org.eclipse.equinox.p2.ui.admin,0.0.0=v2
-+ org.eclipse.equinox.transforms.xslt,0.0.0=R35x_v20100209
-+ org.eclipse.jface.databinding,0.0.0=M20090826-0800
-+ org.eclipse.equinox.p2.touchpoint.eclipse,0.0.0=R35x_20090820-1821
-+-org.eclipse.help.base,0.0.0=v20090526
-++org.eclipse.help.base,0.0.0=v201002111343
-+ org.eclipse.ui.presentations.r21,0.0.0=M20091015-0930
-+ org.eclipse.equinox.frameworkadmin,0.0.0=v20090520-1905
-+ org.eclipse.ui.intro,0.0.0=v20100111_35x
-+@@ -76,7 +76,7 @@ org.eclipse.team.ui,0.0.0=I20090430-0408
-+ org.eclipse.equinox.p2.metadata,0.0.0=R35x_v20100112
-+ org.eclipse.swt.cocoa.macosx.x86_64,0.0.0=v3557f
-+ org.eclipse.jdt.compiler.tool,0.0.0=v_981_R35x
-+-org.eclipse.platform,0.0.0=R35x_v20100121
-++org.eclipse.platform,0.0.0=v201002111343
-+ org.eclipse.core.databinding.observable,0.0.0=M20090902-0800
-+ org.eclipse.team.examples.filesystem,0.0.0=I20090210-0800
-+ org.eclipse.pde.core,0.0.0=v20100104
-+@@ -191,7 +191,7 @@ org.eclipse.pde.api.tools.ee.javase16,0.
-+ org.eclipse.compare.win32,0.0.0=I20090430-0408
-+ org.eclipse.equinox.p2.installer,0.0.0=R35x_v20090717
-+ org.eclipse.debug.examples.core,0.0.0=v20090504
-+-org.eclipse.rcp,0.0.0=R35x_v20100119
-++org.eclipse.rcp,0.0.0=v201002111343
-+ org.eclipse.pde.ds.core,0.0.0=v20100118
-+ org.eclipse.equinox.registry,0.0.0=v20090520-1800
-+ org.eclipse.ui.examples.readmetool,0.0.0=I20090526-2000
-+@@ -233,7 +233,7 @@ org.eclipse.update.configurator,0.0.0=v2
-+ org.eclipse.core.filesystem.win32.x86,0.0.0=v20080604-1400
-+ org.eclipse.equinox.p2.core,0.0.0=R35x_v20090819
-+ org.eclipse.swt.examples,0.0.0=v3557f
-+-org.eclipse.cvs,0.0.0=R35x_v20100119
-++org.eclipse.cvs,0.0.0=v201002111343
-+ org.eclipse.swt.gtk.linux.x86,0.0.0=v3557f
-+ org.eclipse.equinox.log,0.0.0=v20090520-1800
-+ org.eclipse.equinox.jmx.client,0.0.0=v20070515
-+@@ -250,7 +250,7 @@ org.eclipse.platform.doc.user,0.0.0=r352
-+ org.eclipse.equinox.security.macosx,0.0.0=v20090520-1800
-+ org.eclipse.equinox.supplement,0.0.0=v20090518
-+ org.eclipse.team.cvs.ssh,0.0.0=I20090508-2000
-+-org.eclipse.sdk,0.0.0=R35x_v20100204
-++org.eclipse.sdk,0.0.0=v201002111343
-+ org.eclipse.jsch.ui,0.0.0=r35x_20100210-1114
-+ org.eclipse.core.filesystem.win32.x86_64,0.0.0=v20090316-0910
-+ org.eclipse.equinox.security.win32.x86,0.0.0=v20090520-1800
-+@@ -289,7 +289,7 @@ org.eclipse.equinox.p2.ui.sdk.scheduler,
-+ org.eclipse.ui.editors,0.0.0=v20090527-2000
-+ org.eclipse.core.filebuffers,0.0.0=v20090526-2000
-+ org.eclipse.equinox.ip,0.0.0=R35x_v20090803
-+-org.eclipse.jdt,0.0.0=r352_v20100106-0800
-++org.eclipse.jdt,0.0.0=v201002111343
-+ org.eclipse.ecf,0.0.0=v20090831-1906
-+ org.eclipse.ecf.filetransfer,0.0.0=v20090831-1906
-+ org.eclipse.ecf.identity,0.0.0=v20090831-1906


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

More information about the pkg-java-commits mailing list