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

[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, master-3.6 has been updated
       via  5c7b26e0ecf68b3bc6f1f64a4c64bac6701fc9f9 (commit)
      from  aa280a9a95ea21046419e17773ff573bcff5fe43 (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 5c7b26e0ecf68b3bc6f1f64a4c64bac6701fc9f9
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Tue Oct 12 12:58:45 2010 +0200

    Refresh patches.

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

Summary of changes:
 .../patches/eclipse-build-generatedScripts.patch   |    2 +-
 debian/patches/osgi-services-symlink-javax.patch   |    2 +-
 debian/patches/osgi-services.patch                 |    4 ++--
 debian/patches/series                              |    3 +++
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/patches/eclipse-build-generatedScripts.patch b/debian/patches/eclipse-build-generatedScripts.patch
index b2916a8..398216a 100644
--- a/debian/patches/eclipse-build-generatedScripts.patch
+++ b/debian/patches/eclipse-build-generatedScripts.patch
@@ -13,7 +13,7 @@ Forwarded: not-needed
  	<available file="eclipse-sdktests-${label}-src.tar.bz2" property="testsSourcePresent" value="true" />
  	<available file="eclipse-sdktests-${label}-scripts.tar.bz2" property="testsScriptsPresent" value="true" />
  
-@@ -139,7 +139,7 @@
+@@ -152,7 +152,7 @@
  	</target>
  
  	<target name="extractBuildXmls" if="scriptsPresent">
diff --git a/debian/patches/osgi-services-symlink-javax.patch b/debian/patches/osgi-services-symlink-javax.patch
index d55de68..e5bbf17 100644
--- a/debian/patches/osgi-services-symlink-javax.patch
+++ b/debian/patches/osgi-services-symlink-javax.patch
@@ -4,7 +4,7 @@ Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=304710
 
 --- a/build.xml
 +++ b/build.xml
-@@ -286,6 +286,7 @@
+@@ -310,6 +310,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 8df6c4c..20258f9 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
-@@ -285,6 +285,7 @@
- 		<patch patchfile="${basedir}/patches/bz318912.patch" dir="${buildDirectory}"  strip="0" />
+@@ -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" />
diff --git a/debian/patches/series b/debian/patches/series
index 3bbbd51..dcc87d7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,6 @@ 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


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