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

[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  8d24cb77f3cc24a0fce30a8a23dd46eb48207096 (commit)
      from  7a6726b069eb60ec7cea87e09fe200f513006ee7 (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 8d24cb77f3cc24a0fce30a8a23dd46eb48207096
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Thu Mar 31 14:38:29 2011 +0200

    Refresh patches.

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

Summary of changes:
 debian/patches/clean-source.patch                  |    4 ++--
 debian/patches/compile-IPluginDescriptor.patch     |    2 +-
 debian/patches/eclipse-manpage.patch               |    4 ++--
 ...nerate-metadata-and-extract-swt-libraries.patch |    2 +-
 debian/patches/remove-unnecessary-files.patch      |    2 +-
 debian/patches/strip-destDir.patch                 |    2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/patches/clean-source.patch b/debian/patches/clean-source.patch
index d45955e..bc7ed0c 100644
--- a/debian/patches/clean-source.patch
+++ b/debian/patches/clean-source.patch
@@ -4,7 +4,7 @@ Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=304112
 
 --- a/buildSDKSource.sh
 +++ b/buildSDKSource.sh
-@@ -159,21 +159,18 @@
+@@ -163,21 +163,18 @@
  rm -rf ecfBundles orbitRepo
  
  # Remove files from the version control system
@@ -28,7 +28,7 @@ Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=304112
  # Remove fetch logs
  rm fetch_*
  
-@@ -184,6 +181,24 @@
+@@ -188,6 +185,24 @@
  # Remove temporary files
  find -name '*.orig' -delete
  
diff --git a/debian/patches/compile-IPluginDescriptor.patch b/debian/patches/compile-IPluginDescriptor.patch
index bc5dc71..9c88c66 100644
--- a/debian/patches/compile-IPluginDescriptor.patch
+++ b/debian/patches/compile-IPluginDescriptor.patch
@@ -4,7 +4,7 @@ Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=319478
 
 --- a/build.xml
 +++ b/build.xml
-@@ -371,7 +371,38 @@
+@@ -372,7 +372,38 @@
  		<echo file="symlinks-stamp" />
  	</target>
  
diff --git a/debian/patches/eclipse-manpage.patch b/debian/patches/eclipse-manpage.patch
index 0e5db13..c6f8b53 100644
--- a/debian/patches/eclipse-manpage.patch
+++ b/debian/patches/eclipse-manpage.patch
@@ -624,10 +624,10 @@ Bug-Ubuntu: https://launchpad.net/bugs/494065
 +</refentry>
 --- a/build.xml
 +++ b/build.xml
-@@ -951,6 +951,12 @@
+@@ -952,6 +952,12 @@
  		<!-- eclipse binary -->
  		<mkdir dir="${destDir}${prefix}/bin" />
- 		<symlink link="${destDir}${prefix}/bin/eclipse" resource="../${libDir}/eclipse/eclipse" />
+ 		<symlink link="${destDir}${prefix}/bin/eclipse" resource="../${libDir}/eclipse/eclipse" overwrite="true"/>
 +		<!-- eclipse manpage -->
 +		<mkdir dir="${destDir}${prefix}/share/man/man1" />
 +		<exec executable="docbook2x-man" failonerror="true">
diff --git a/debian/patches/generate-metadata-and-extract-swt-libraries.patch b/debian/patches/generate-metadata-and-extract-swt-libraries.patch
index 6c84b39..b9bdb65 100644
--- a/debian/patches/generate-metadata-and-extract-swt-libraries.patch
+++ b/debian/patches/generate-metadata-and-extract-swt-libraries.patch
@@ -4,7 +4,7 @@ From: Benjamin Drung <bdrung at ubuntu.com>
 
 --- a/build.xml
 +++ b/build.xml
-@@ -1002,6 +1002,55 @@
+@@ -1003,6 +1003,55 @@
  
  		<echo append="true" file="${installationDir}/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${prefix}/share/eclipse/dropins" />
  
diff --git a/debian/patches/remove-unnecessary-files.patch b/debian/patches/remove-unnecessary-files.patch
index f1ca1b8..8b49ac1 100644
--- a/debian/patches/remove-unnecessary-files.patch
+++ b/debian/patches/remove-unnecessary-files.patch
@@ -3,7 +3,7 @@ From: Benjamin Drung <bdrung at ubuntu.com>
 
 --- a/build.xml
 +++ b/build.xml
-@@ -1137,6 +1137,10 @@
+@@ -1138,6 +1138,10 @@
  			</fileset>
  		</apply>
  		
diff --git a/debian/patches/strip-destDir.patch b/debian/patches/strip-destDir.patch
index e0394a6..0047122 100644
--- a/debian/patches/strip-destDir.patch
+++ b/debian/patches/strip-destDir.patch
@@ -4,7 +4,7 @@ Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=319473
 
 --- a/build.xml
 +++ b/build.xml
-@@ -1141,6 +1141,21 @@
+@@ -1142,6 +1142,21 @@
  		<delete dir="${destDir}/${prefix}/${libDir}/eclipse/metadata/binary" />
  		<delete dir="${destDir}/${prefix}/${libDir}/eclipse/metadata/features" />
  		<delete dir="${destDir}/${prefix}/${libDir}/eclipse/metadata/plugins" />


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