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

[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  7527cb121707450c383cd606528999e2f72915fe (commit)
      from  65da761522c46277c6509c5254021845651d91ce (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 7527cb121707450c383cd606528999e2f72915fe
Author: Niels Thykier <niels at thykier.net>
Date:   Sun Nov 22 22:44:52 2009 +0100

    Refreshed all patches.

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

Summary of changes:
 debian/patches/fix-directory-in-eclipse-ini.patch |   10 +++++-----
 debian/patches/fix-perm.patch                     |    9 +++++----
 debian/patches/fix-shell-script-perm.patch        |   11 ++++++-----
 debian/patches/move-config-file-to-etc.patch      |    8 +++++---
 debian/patches/remove-eclipse-version.patch       |   10 +++++-----
 5 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/debian/patches/fix-directory-in-eclipse-ini.patch b/debian/patches/fix-directory-in-eclipse-ini.patch
index 8292b86..4a57cfa 100644
--- a/debian/patches/fix-directory-in-eclipse-ini.patch
+++ b/debian/patches/fix-directory-in-eclipse-ini.patch
@@ -2,11 +2,11 @@ Description: Correct the directory in eclipse.ini
 Author: Benjamin Drung <bdrung at ubuntu.com>
 Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=295525
 
-diff --git a/build.xml b/build.xml
-index 9be5c34..0a574a4 100644
---- a/build.xml
-+++ b/build.xml
-@@ -761,7 +761,7 @@
+Index: b/build.xml
+===================================================================
+--- a/build.xml	2009-11-22 22:42:57.513305650 +0100
++++ b/build.xml	2009-11-22 22:43:00.425283074 +0100
+@@ -774,7 +774,7 @@
  		<property name="startupjarpath" refid="startupjar" />
  		<symlink link="${destDir}/${prefix}/${libDir}/eclipse/startup.jar" resource="plugins/${startupjarpath}" />
  
diff --git a/debian/patches/fix-perm.patch b/debian/patches/fix-perm.patch
index 63312d4..94b4075 100644
--- a/debian/patches/fix-perm.patch
+++ b/debian/patches/fix-perm.patch
@@ -2,10 +2,11 @@ Description: fix permission for ant executable files
 Author: Benjamin Drung <bdrung at ubuntu.com>
 Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=289017
 
-diff -pruN a/build.xml b/build.xml
---- a/build.xml	2009-10-12 21:46:39.598436279 +0200
-+++ b/build.xml	2009-10-12 21:59:14.677936277 +0200
-@@ -708,6 +708,10 @@
+Index: b/build.xml
+===================================================================
+--- a/build.xml	2009-11-22 22:42:43.125304213 +0100
++++ b/build.xml	2009-11-22 22:43:54.113282597 +0100
+@@ -775,6 +775,10 @@
  		<symlink link="${destDir}/${prefix}/${libDir}/eclipse/startup.jar" resource="plugins/${startupjarpath}" />
  
  		<echo append="true" file="${destDir}${prefix}/${libDir}/eclipse/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${destDir}${prefix}/share/eclipse/dropins" />
diff --git a/debian/patches/fix-shell-script-perm.patch b/debian/patches/fix-shell-script-perm.patch
index b97fb95..fa2e000 100644
--- a/debian/patches/fix-shell-script-perm.patch
+++ b/debian/patches/fix-shell-script-perm.patch
@@ -2,14 +2,15 @@ Description: correct permission after applying patch
 Author: Benjamin Drung <bdrung at ubuntu.com>
 Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=295526
 
-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 @@
+Index: b/build.xml
+===================================================================
+--- a/build.xml	2009-11-22 22:42:32.997283514 +0100
++++ b/build.xml	2009-11-22 22:43:55.934306182 +0100
+@@ -248,6 +248,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 -->
+ 		<chmod dir="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build" includes="*.sh" perm="a+x" />
diff --git a/debian/patches/move-config-file-to-etc.patch b/debian/patches/move-config-file-to-etc.patch
index ea59100..a8fb9b9 100644
--- a/debian/patches/move-config-file-to-etc.patch
+++ b/debian/patches/move-config-file-to-etc.patch
@@ -3,9 +3,11 @@ Author: Benjamin Drung <bdrung at ubuntu.com>
 Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=295523
 Bug-Ubuntu: https://bugs.launchpad.net/bugs/43162
 
---- eclipse-3.5.1+repack.orig/build.xml
-+++ eclipse-3.5.1+repack/build.xml
-@@ -762,6 +762,10 @@
+Index: b/build.xml
+===================================================================
+--- a/build.xml	2009-11-22 22:42:54.410283038 +0100
++++ b/build.xml	2009-11-22 22:43:49.729282747 +0100
+@@ -775,6 +775,10 @@
  		<symlink link="${destDir}/${prefix}/${libDir}/eclipse/startup.jar" resource="plugins/${startupjarpath}" />
  
  		<echo append="true" file="${destDir}${prefix}/${libDir}/eclipse/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${destDir}${prefix}/share/eclipse/dropins" />
diff --git a/debian/patches/remove-eclipse-version.patch b/debian/patches/remove-eclipse-version.patch
index e816370..1fb0d0c 100644
--- a/debian/patches/remove-eclipse-version.patch
+++ b/debian/patches/remove-eclipse-version.patch
@@ -2,10 +2,10 @@ Description: Remove version string from eclipse directory.
 Author: Benjamin Drung <bdrung at ubuntu.com>
 Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=295307
 
-diff --git a/build.xml b/build.xml
-index 22200b3..f928de5 100644
---- a/build.xml
-+++ b/build.xml
+Index: b/build.xml
+===================================================================
+--- a/build.xml	2009-11-22 22:42:48.081304835 +0100
++++ b/build.xml	2009-11-22 22:43:52.150305066 +0100
 @@ -6,7 +6,7 @@
  	<property file="build.properties" />
  
@@ -15,7 +15,7 @@ index 22200b3..f928de5 100644
  
  	<condition property="onlyExtractedSdkSourcePresent">
  		<and>
-@@ -120,11 +120,11 @@
+@@ -121,11 +121,11 @@
  	</target>
  
  	<target name="copySource" unless="sdkSourcePresent">


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