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

Sat May 7 18:37:29 UTC 2011

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  abaa4f42637e7bf0c8bc4604935915c3f23f6f5e (commit)
       via  c84ecd1c5e414b7a3b8eddc4f8e58e69093f49c7 (commit)
       via  9d3a8cb25fbdbbea82c864a58815f614b905a3ef (commit)
       via  f4cd0b23f5e955c7e52df35314d7f3508bd62328 (commit)
       via  651ee494f83cbb7660ae02d26b2037e023e26cd9 (commit)
      from  8d24cb77f3cc24a0fce30a8a23dd46eb48207096 (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 abaa4f42637e7bf0c8bc4604935915c3f23f6f5e
Author: Niels Thykier <niels at thykier.net>
Date:   Fri Apr 1 14:39:40 2011 +0200

    Removed unused entries from d/p/series

commit c84ecd1c5e414b7a3b8eddc4f8e58e69093f49c7
Author: Niels Thykier <niels at thykier.net>
Date:   Fri Apr 1 12:44:21 2011 +0200

    Removed broken patch

commit 9d3a8cb25fbdbbea82c864a58815f614b905a3ef
Author: Niels Thykier <niels at thykier.net>
Date:   Fri Apr 1 12:42:32 2011 +0200

    Updated eclipse-platform{,-data}.install

commit f4cd0b23f5e955c7e52df35314d7f3508bd62328
Author: Niels Thykier <niels at thykier.net>
Date:   Fri Apr 1 09:37:56 2011 +0200

    Updated generated build scripts and reactivated related patch

commit 651ee494f83cbb7660ae02d26b2037e023e26cd9
Author: Niels Thykier <niels at thykier.net>
Date:   Fri Apr 1 09:19:59 2011 +0200

    Updated osgi-services.patch

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

Summary of changes:
 debian/eclipse-build-generatedScripts.tar.bz2 |  Bin 14285 -> 14324 bytes
 debian/eclipse-platform-data.install          |   20 +++---
 debian/eclipse-platform.install               |    2 -
 debian/patches/osgi-services.patch            |   74 ++++++++-----------------
 debian/patches/series                         |    6 +-
 5 files changed, 36 insertions(+), 66 deletions(-)

diff --git a/debian/eclipse-build-generatedScripts.tar.bz2 b/debian/eclipse-build-generatedScripts.tar.bz2
index 43455e8..00ba26c 100644
Binary files a/debian/eclipse-build-generatedScripts.tar.bz2 and b/debian/eclipse-build-generatedScripts.tar.bz2 differ
diff --git a/debian/eclipse-platform-data.install b/debian/eclipse-platform-data.install
index 5a152cd..6320d14 100644
--- a/debian/eclipse-platform-data.install
+++ b/debian/eclipse-platform-data.install
@@ -1,14 +1,14 @@
 usr/lib/eclipse/plugins/org.eclipse.ant.core.source_*.jar
-usr/lib/eclipse/plugins/org.eclipse.ant.launching.source_1.0.0.v20100427.jar
-usr/lib/eclipse/plugins/org.eclipse.ant.launching_1.0.0.v20100427.jar
+usr/lib/eclipse/plugins/org.eclipse.ant.launching.source_*.jar
+usr/lib/eclipse/plugins/org.eclipse.ant.launching_*.jar
 usr/lib/eclipse/plugins/org.eclipse.ant.ui.source_*.jar
 usr/lib/eclipse/plugins/org.eclipse.compare.core.source_*.jar
 usr/lib/eclipse/plugins/org.eclipse.compare.core_*.jar
 usr/lib/eclipse/plugins/org.eclipse.compare.source_*.jar
 usr/lib/eclipse/plugins/org.eclipse.compare_*.jar
 usr/lib/eclipse/plugins/org.eclipse.core.boot_*.jar
-usr/lib/eclipse/plugins/org.eclipse.core.externaltools.source_1.0.0.v20100505.jar
-usr/lib/eclipse/plugins/org.eclipse.core.externaltools_1.0.0.v20100505.jar
+usr/lib/eclipse/plugins/org.eclipse.core.externaltools.source_*.jar
+usr/lib/eclipse/plugins/org.eclipse.core.externaltools_*.jar
 usr/lib/eclipse/plugins/org.eclipse.core.filebuffers.source_*.jar
 usr/lib/eclipse/plugins/org.eclipse.core.filebuffers_*.jar
 usr/lib/eclipse/plugins/org.eclipse.core.filesystem.source_*.jar
@@ -44,8 +44,8 @@ usr/lib/eclipse/plugins/org.eclipse.ecf.ssl_*.jar
 usr/lib/eclipse/plugins/org.eclipse.ecf_*.jar
 usr/lib/eclipse/plugins/org.eclipse.equinox.concurrent.source_*.jar
 usr/lib/eclipse/plugins/org.eclipse.equinox.concurrent_*.jar
-usr/lib/eclipse/plugins/org.eclipse.equinox.event.source_1.2.0.v20100503.jar
-usr/lib/eclipse/plugins/org.eclipse.equinox.event_1.2.0.v20100503.jar
+usr/lib/eclipse/plugins/org.eclipse.equinox.event.source_*.jar
+usr/lib/eclipse/plugins/org.eclipse.equinox.event_*.jar
 usr/lib/eclipse/plugins/org.eclipse.equinox.frameworkadmin.equinox.source_*.jar
 usr/lib/eclipse/plugins/org.eclipse.equinox.frameworkadmin.equinox_*.jar
 usr/lib/eclipse/plugins/org.eclipse.equinox.frameworkadmin.source_*.jar
@@ -82,11 +82,11 @@ usr/lib/eclipse/plugins/org.eclipse.equinox.p2.metadata.generator.source_*.jar
 usr/lib/eclipse/plugins/org.eclipse.equinox.p2.metadata.repository.source_*.jar
 usr/lib/eclipse/plugins/org.eclipse.equinox.p2.metadata.source_*.jar
 usr/lib/eclipse/plugins/org.eclipse.equinox.p2.metadata_*.jar
-usr/lib/eclipse/plugins/org.eclipse.equinox.p2.operations.source_2.0.0.v20100510.jar
-usr/lib/eclipse/plugins/org.eclipse.equinox.p2.operations_2.0.0.v20100510.jar
+usr/lib/eclipse/plugins/org.eclipse.equinox.p2.operations.source_*.jar
+usr/lib/eclipse/plugins/org.eclipse.equinox.p2.operations_*.jar
 usr/lib/eclipse/plugins/org.eclipse.equinox.p2.publisher.source_*.jar
-usr/lib/eclipse/plugins/org.eclipse.equinox.p2.ql.source_2.0.0.v20100503a.jar
-usr/lib/eclipse/plugins/org.eclipse.equinox.p2.ql_2.0.0.v20100503a.jar
+usr/lib/eclipse/plugins/org.eclipse.equinox.p2.ql.source_*.jar
+usr/lib/eclipse/plugins/org.eclipse.equinox.p2.ql_*.jar
 usr/lib/eclipse/plugins/org.eclipse.equinox.p2.reconciler.dropins.source_*.jar
 usr/lib/eclipse/plugins/org.eclipse.equinox.p2.reconciler.dropins_*.jar
 usr/lib/eclipse/plugins/org.eclipse.equinox.p2.repository.source_*.jar
diff --git a/debian/eclipse-platform.install b/debian/eclipse-platform.install
index 6201c8e..89cfd22 100644
--- a/debian/eclipse-platform.install
+++ b/debian/eclipse-platform.install
@@ -7,7 +7,6 @@ usr/lib/eclipse/artifacts.xml
 usr/lib/eclipse/configuration/config.ini
 usr/lib/eclipse/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
 usr/lib/eclipse/configuration/org.eclipse.equinox.source
-usr/lib/eclipse/configuration/org.eclipse.update/
 usr/lib/eclipse/eclipse
 usr/lib/eclipse/eclipse.ini
 usr/lib/eclipse/features/org.eclipse.equinox.p2.user.ui.source_*
@@ -17,7 +16,6 @@ usr/lib/eclipse/features/org.eclipse.help_*
 usr/lib/eclipse/features/org.eclipse.platform.source_*
 usr/lib/eclipse/features/org.eclipse.platform_*
 usr/lib/eclipse/features/org.eclipse.sdk_*
-usr/lib/eclipse/metadata/*.xml
 usr/lib/eclipse/p2/
 usr/lib/eclipse/plugins/com.jcraft.jsch_*.jar
 usr/lib/eclipse/plugins/javax.servlet.jsp_*.jar
diff --git a/debian/patches/osgi-services.patch b/debian/patches/osgi-services.patch
index 20258f9..5d6c689 100644
--- a/debian/patches/osgi-services.patch
+++ b/debian/patches/osgi-services.patch
@@ -3,16 +3,6 @@ From: Niels Thykier <niels at thykier.net>
 Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=304710
 Applied-Upstream: no
 
---- a/build.xml
-+++ b/build.xml
-@@ -309,6 +309,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" />
- 		<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/pdebuild.xml
 +++ b/pdebuild.xml
 @@ -30,6 +30,8 @@
@@ -34,12 +24,12 @@ Applied-Upstream: no
  		<file name="org.eclipse.update.core" />
 --- /dev/null
 +++ b/patches/osgi-services-build.patch
-@@ -0,0 +1,58 @@
+@@ -0,0 +1,21 @@
 +diff --git a/eclipse/plugins/org.eclipse.osgi.services/build.properties b/eclipse/plugins/org.eclipse.osgi.services/build.properties
 +index 7962dc5..ca55afb 100644
 +--- a/plugins/org.eclipse.osgi.services/build.properties
 ++++ b/plugins/org.eclipse.osgi.services/build.properties
-+@@ -11,11 +11,11 @@
++@@ -11,11 +11,10 @@
 + bin.includes = plugin.properties,\
 +                about.html,\
 +                META-INF/,\
@@ -55,41 +45,25 @@ Applied-Upstream: no
 +-source.. = .
 ++source.. = src/
 + output.. = .
-+ customBuildCallbacks=customBuildCallbacks.xml
-+diff --git a/eclipse/plugins/org.eclipse.osgi.services/customBuildCallbacks.xml b/eclipse/plugins/org.eclipse.osgi.services/customBuildCallbacks.xml
-+index 9187112..dbd6075 100644
-+--- a/plugins/org.eclipse.osgi.services/customBuildCallbacks.xml
-++++ b/plugins/org.eclipse.osgi.services/customBuildCallbacks.xml
-+@@ -104,6 +104,7 @@
-+ 	<!--   target.folder - destination folder                                  -->
-+ 	<!-- ===================================================================== -->
-+ 	<target name="post.gather.bin.parts">
-++	  <delete dir="${target.folder}/javax" />
-+ 	</target>
-+ 
-+ 	<!-- ===================================================================== -->
-+@@ -120,8 +121,7 @@
-+ 	<!--   destination.temp.folder - destination folder                        -->
-+ 	<!-- ===================================================================== -->
-+ 	<target name="post.gather.sources">
-+-		<unzip src="${target.folder}/src.zip" dest="${target.folder}" overwrite="false"/>
-+-		<delete file="${destination.temp.folder}/src.zip" />	
-++	  <delete dir="${destination.temp.folder}/javax" />
-+ 	</target>
-+ 
-+ 	<!-- ===================================================================== -->
-+@@ -146,7 +146,6 @@
-+ 	<!--   destination.temp.folder - destination folder                        -->
-+ 	<!-- ===================================================================== -->
-+ 	<target name="pre.clean">  
-+-		<move  file="src.zip" tofile="services_src.zip"/>
-+ 	</target>
-+ 
-+ 	<!-- ===================================================================== -->
-+@@ -157,6 +156,5 @@
-+ 	<!--   temp.folder - temporary folder                                      -->
-+ 	<!-- ===================================================================== -->
-+ 	<target name="post.clean">
-+-		<move file="services_src.zip" tofile="src.zip"/>
-+ 	</target>
-+ </project>
++-customBuildCallbacks=customBuildCallbacks.xml
+diff --git a/build.xml b/build.xml
+index 8f185fb..d0d83f6 100644
+--- a/build.xml
++++ b/build.xml
+@@ -309,6 +309,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" />
+ 		<patch patchfile="${basedir}/patches/no-gnome-vfs.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" />
+@@ -321,6 +322,8 @@
+ 		<replace file="${buildConfigs}/eclipse-build-config/build.properties" token="@build_arch@" value="${buildArch}" />
+ 		<patch patchfile="${basedir}/patches/java-home.patch" dir="${buildDirectory}" strip="2" />
+ 		<patch patchfile="${basedir}/patches/webkitgtk.patch" dir="${buildDirectory}" strip="0" />
++		<delete dir="${buildDirectory}/plugins/org.eclipse.equinox.io/" />
++		<delete dir="${buildDirectory}/plugins/org.eclipse.osgi.services/src/org/osgi/service/io/" />
+ 		<echo file="patch-stamp" />
+ 	</target>
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 53de397..84abda2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,10 +7,8 @@ fix-help-contents.patch
 pdebuild-path-copy-platform.patch
 pdebuild-script.patch
 symlink-system-files.patch
-generate-metadata-and-extract-swt-libraries.patch
 remove-unnecessary-files.patch
 strip-destDir.patch
 clean-source.patch
-#osgi-services.patch
-#osgi-services-symlink-javax.patch
-#eclipse-build-generatedScripts.patch
+osgi-services.patch
+eclipse-build-generatedScripts.patch


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

