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

[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  d75660e30ece34ba1bea5c167eae788ad769fdc7 (commit)
       via  48a6933b48589329e92f339714d6de69e9f53963 (commit)
      from  e7b3a0d7a042dac31487e99c1f0227132dab1fc3 (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 d75660e30ece34ba1bea5c167eae788ad769fdc7
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sun Jul 11 16:07:30 2010 +0200

    Fix strip-destDir.patch.

commit 48a6933b48589329e92f339714d6de69e9f53963
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sun Jul 11 13:35:04 2010 +0200

    Refresh clean-source.patch.

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

Summary of changes:
 debian/patches/clean-source.patch  |    2 +-
 debian/patches/strip-destDir.patch |    7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/patches/clean-source.patch b/debian/patches/clean-source.patch
index 50c99e6..ca8e84d 100644
--- a/debian/patches/clean-source.patch
+++ b/debian/patches/clean-source.patch
@@ -43,7 +43,7 @@ Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=304112
 +unzip src.zip -d src
 +cd ../..
 +# Remove zip files
-+find -name '*.zip' ! -name 'launchersrc.zip' -delete
++find -name '*.zip' -delete
 +
 +# Correct permissions
 +find -type d -print0 | xargs -0 chmod 755
diff --git a/debian/patches/strip-destDir.patch b/debian/patches/strip-destDir.patch
index 73f72c8..167e493 100644
--- a/debian/patches/strip-destDir.patch
+++ b/debian/patches/strip-destDir.patch
@@ -4,14 +4,17 @@ Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=319473
 
 --- a/build.xml
 +++ b/build.xml
-@@ -917,6 +917,18 @@
+@@ -917,6 +917,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" />
 +		<!-- Strip ${destDir} from path -->
++		<exec executable="sed" inputstring="${destDir}" outputproperty="destDirWithUnderscores" failonerror="true">
++			<arg value="s@/@_ at g" />
++		</exec>
 +		<apply executable="sed" failonerror="true" verbose="true">
 +			<arg value="-i" />
-+			<arg value="s@${destDir}@@g" />
++			<arg value="s@${destDir}@@g;s@${destDirWithUnderscores}@@g" />
 +			<srcfile />
 +			<fileset dir="${destDir}/${prefix}/${libDir}/eclipse">
 +				<include name="metadata/content.xml" />


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