[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. debian/3.7_exp-5-52-gb9d9b98

[Jakub Adam]

The following commit has been merged in the master branch:
commit 7e65217fc260f2775f46a99c9eeedb84790312ab
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Thu Dec 29 20:02:01 2011 +0100

    Set custom shared config directory when uninstalling the initializer
    
    Prevents our ~/.eclipse to pollute the configuration of freshly
    built Eclipse.

diff --git a/debian/patches/series b/debian/patches/series
index a163b56..5d8bce9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,3 +20,4 @@ fix-org-eclipse-swt-gtk-linux.patch
 remove-org-apache-lucene.patch
 relabel-to-3-7-1.patch
 fix-com-ibm-icu-search-path.patch
+set-shared-config-dir.patch
diff --git a/debian/patches/set-shared-config-dir.patch b/debian/patches/set-shared-config-dir.patch
new file mode 100644
index 0000000..cd67570
--- /dev/null
+++ b/debian/patches/set-shared-config-dir.patch
@@ -0,0 +1,36 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Thu, 29 Dec 2011 00:45:27 +0100
+Subject: set-shared-config-dir
+
+When uninstalling the initializer, set custom shared config directory
+to prevent our ~/.eclipse to pollute the configuration of freshly
+built Eclipse.
+---
+ build.xml |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index d9ccd48..f5e468f 100644
+--- a/build.xml
++++ b/build.xml
+@@ -983,9 +983,9 @@
+                         <arg line="-p2.os ${p2.os}" />
+                         <arg line="-p2.ws ${p2.ws}" />
+                         <arg line="-p2.arch ${p2.arch}" />
+-                        <arg line="${p2.director.extraArgs}" />
+                         <arg line="-metadatarepository file:${p2.repo}" />
+                         <arg line="-artifactrepository file:${p2.repo}" />
++                        <arg line="${p2.director.extraArgs}" />
+                 </exec>
+         </target>
+ 
+@@ -1074,7 +1074,7 @@
+                         <param name="p2.director.uninstallIU" value="org.eclipse.equinox.initializer" />
+                         <param name="p2.director.profile" value="PlatformProfile" />
+                         <param name="p2.director.install.path" value="${installationDir}" />
+-                        <param name="p2.director.extraArgs" value="-purgeHistory" />
++                        <param name="p2.director.extraArgs" value="-purgeHistory -vmargs -Dosgi.sharedConfiguration.area=${installationDir}/configuration" />
+ 			<param name="p2.os" value="linux" />
+                         <param name="p2.ws" value="gtk" />
+                         <param name="p2.arch" value="${buildArch}" />
+-- 

-- 
eclipse - Powerful IDE written in java - Debian package.