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

[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  24b9cbda5589009698450b1e7b26d38ef5edc0b7 (commit)
      from  d978fd53d29372c5559184693b36efd28255c6ba (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 24b9cbda5589009698450b1e7b26d38ef5edc0b7
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Wed Nov 18 23:33:13 2009 +0100

    Correct the directory in eclipse.ini

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

Summary of changes:
 build.xml                                         |    2 +-
 debian/patches/fix-directory-in-eclipse-ini.patch |   16 ++++++++++++++++
 debian/patches/series                             |    1 +
 3 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/build.xml b/build.xml
index 9be5c34..0a574a4 100644
--- a/build.xml
+++ b/build.xml
@@ -761,7 +761,7 @@
 		<property name="startupjarpath" refid="startupjar" />
 		<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" />
+		<echo append="true" file="${destDir}${prefix}/${libDir}/eclipse/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${prefix}/share/eclipse/dropins" />
 		<!-- Move config file to /etc -->
 		<mkdir dir="${destDir}/etc" />
 		<move file="${destDir}${prefix}/lib/eclipse/eclipse.ini" tofile="${destDir}/etc/eclipse.ini" />
diff --git a/debian/patches/fix-directory-in-eclipse-ini.patch b/debian/patches/fix-directory-in-eclipse-ini.patch
new file mode 100644
index 0000000..d6c8ef3
--- /dev/null
+++ b/debian/patches/fix-directory-in-eclipse-ini.patch
@@ -0,0 +1,16 @@
+Description: Correct the directory in eclipse.ini
+Author: Benjamin Drung <bdrung at ubuntu.com>
+
+diff --git a/build.xml b/build.xml
+index 9be5c34..0a574a4 100644
+--- a/build.xml
++++ b/build.xml
+@@ -761,7 +761,7 @@
+ 		<property name="startupjarpath" refid="startupjar" />
+ 		<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" />
++		<echo append="true" file="${destDir}${prefix}/${libDir}/eclipse/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${prefix}/share/eclipse/dropins" />
+ 		<!-- Move config file to /etc -->
+ 		<mkdir dir="${destDir}/etc" />
+ 		<move file="${destDir}${prefix}/lib/eclipse/eclipse.ini" tofile="${destDir}/etc/eclipse.ini" />
diff --git a/debian/patches/series b/debian/patches/series
index 6a2d2ac..23f2b43 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ fix-shell-script-perm.patch
 fix-perm.patch
 remove-eclipse-version.patch
 move-config-file-to-etc.patch
+fix-directory-in-eclipse-ini.patch


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