[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. debian/3.6.2-exp-1-46-ga2ce402

[Niels Thykier]

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 has been updated
       via  a2ce4020c2365efdc5a45c1579d8ec17b0fd6c0b (commit)
      from  9b8f8f4ac53cbdc90b9caa3f177e9774984ae800 (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 a2ce4020c2365efdc5a45c1579d8ec17b0fd6c0b
Author: Niels Thykier <niels at thykier.net>
Date:   Mon Aug 8 18:23:41 2011 +0200

    Enabled the osgi-services.patch

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

Summary of changes:
 debian/patches/osgi-services.patch |    6 ++++--
 debian/patches/series              |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/patches/osgi-services.patch b/debian/patches/osgi-services.patch
index f4a2f12..a378a9d 100644
--- a/debian/patches/osgi-services.patch
+++ b/debian/patches/osgi-services.patch
@@ -24,12 +24,12 @@ Applied-Upstream: no
  		<file name="org.eclipse.update.core" />
 --- /dev/null
 +++ b/patches/osgi-services-build.patch
-@@ -0,0 +1,21 @@
+@@ -0,0 +1,23 @@
 +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,10 @@
++@@ -11,11 +11,12 @@
 + bin.includes = plugin.properties,\
 +                about.html,\
 +                META-INF/,\
@@ -44,6 +44,8 @@ Applied-Upstream: no
 +-               about_files/
 +-source.. = .
 ++source.. = src/
+++javacSource=1.5
+++javacTarget=1.5
 + output.. = .
 +-customBuildCallbacks=customBuildCallbacks.xml
 --- a/build.xml
diff --git a/debian/patches/series b/debian/patches/series
index ce2e209..098e590 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,6 +10,6 @@ remove-unnecessary-files.patch
 strip-destDir.patch
 clean-source.patch
 ### Needs updated eclipse-build-generatedScripts.tar.bz2
-#osgi-services.patch
+osgi-services.patch
 #eclipse-build-generatedScripts.patch
 debian-load-internal-swt.patch


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