[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. a03b4e7807989be43862b60c5400ae0fa028b176

[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 has been updated
       via  a03b4e7807989be43862b60c5400ae0fa028b176 (commit)
      from  2e5aed68a41e3738abe0f024f27f0ff5157f67d5 (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 a03b4e7807989be43862b60c5400ae0fa028b176
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sat Oct 17 23:50:38 2009 +0200

    Add fix-shell-script-perm.patch and preserve-perms-on-install.patch
    
    Fix permission for ant executable files and preserve the execution
    permission when installing these files.

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

Summary of changes:
 debian/patches/fix-shell-script-perm.patch     |   14 ++++++++++++++
 debian/patches/preserve-perms-on-install.patch |   21 +++++++++++++++++++++
 debian/patches/series                          |    2 ++
 3 files changed, 37 insertions(+), 0 deletions(-)

diff --git a/debian/patches/fix-shell-script-perm.patch b/debian/patches/fix-shell-script-perm.patch
new file mode 100644
index 0000000..ab49387
--- /dev/null
+++ b/debian/patches/fix-shell-script-perm.patch
@@ -0,0 +1,14 @@
+Description: correct permission after applying patch
+Author: Benjamin Drung <bdrung at ubuntu.com>
+
+diff -pruN a/build.xml b/build.xml
+--- a/build.xml	2009-10-17 21:15:16.105935633 +0200
++++ b/build.xml	2009-10-17 21:16:49.372586004 +0200
+@@ -211,6 +211,7 @@
+ 		<patch patchfile="${basedir}/patches/donotstorebuildlogsinfiles.patch" dir="${buildDirectory}" strip="3" />
+ 		<patch patchfile="${basedir}/patches/donotsetjavahomeandoptimizeliblocalfile.patch" dir="${buildDirectory}" strip="3" />
+ 		<patch patchfile="${basedir}/patches/eclipse-pde.build-add-package-build.patch" dir="${buildDirectory}/plugins/org.eclipse.pde.build" strip="0" />
++		<chmod dir="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build" includes="*.sh" perm="a+x" />
+ 		<patch patchfile="${basedir}/patches/gnomeproxy-makefile.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" />
+ 		<!-- end eclipse-build-only patches -->
diff --git a/debian/patches/preserve-perms-on-install.patch b/debian/patches/preserve-perms-on-install.patch
new file mode 100644
index 0000000..f567913
--- /dev/null
+++ b/debian/patches/preserve-perms-on-install.patch
@@ -0,0 +1,21 @@
+Description: preserve the execution permission when installing files
+Author: Benjamin Drung <bdrung at ubuntu.com>
+
+--- a/build.xml	(Revision 23484)
++++ b/build.xml	(Arbeitskopie)
+@@ -685,9 +685,12 @@
+ 
+ 	<target name="install" depends="provision.sdk">
+ 		<mkdir dir="${destDir}${prefix}/${libDir}/eclipse" />
+-		<copy todir="${destDir}${prefix}/${libDir}/eclipse" overwrite="true">
+-			<fileset dir="${buildDirectory}/installation" />
+-		</copy>
++		<exec executable="cp" failonerror="true">
++			<arg value="-rd"/>
++			<arg value="--no-target-directory" />
++			<arg value="${buildDirectory}/installation" />
++			<arg value="${destDir}${prefix}/${libDir}/eclipse"/>
++		</exec>
+ 		<!-- install desktop file -->
+ 		<copy file="eclipse.desktop" todir="${destDir}${prefix}/share/applications" />
+ 		<!-- install icons -->
diff --git a/debian/patches/series b/debian/patches/series
index 323180e..037ea0c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,6 @@
 libgnomeproxy.patch
 gnomemakefile-patch.patch
 bashisms.patch
+fix-shell-script-perm.patch
+preserve-perms-on-install.patch
 fix-perm.patch
diff --git a/swt_bundle.sh b/swt_bundle.sh
old mode 100644
new mode 100755


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