[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 26e293420fbc628739b7344e1b0e88b5ccb40f02
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Thu Dec 29 03:27:15 2011 +0100

    Fix path to org.eclipse.swt

diff --git a/debian/patches/fix-org-eclipse-swt-gtk-linux.patch b/debian/patches/fix-org-eclipse-swt-gtk-linux.patch
new file mode 100644
index 0000000..abd1022
--- /dev/null
+++ b/debian/patches/fix-org-eclipse-swt-gtk-linux.patch
@@ -0,0 +1,39 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Wed, 28 Dec 2011 01:25:24 +0100
+Subject: fix-org-eclipse-swt-gtk-linux
+
+${buildDirectory} is not defined in build.xml, hardcode correct path.
+
+swtfix
+---
+ .../org.eclipse.swt.gtk.linux.x86/build.xml        |    2 +-
+ .../org.eclipse.swt.gtk.linux.x86_64/build.xml     |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/eclipse/plugins/org.eclipse.swt.gtk.linux.x86/build.xml b/eclipse/plugins/org.eclipse.swt.gtk.linux.x86/build.xml
+index 04021c8..cc931bd 100644
+--- a/eclipse/plugins/org.eclipse.swt.gtk.linux.x86/build.xml
++++ b/eclipse/plugins/org.eclipse.swt.gtk.linux.x86/build.xml
+@@ -9,7 +9,7 @@
+ 	<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
+ 	<property name="version.suffix" value="3.7.1" />
+ 
+-	<condition property="plugindir" value="../../../eclipse.platform.swt/bundles/org.eclipse.swt" else="${buildDirectory}/plugins/org.eclipse.swt">
++	<condition property="plugindir" value="../../../eclipse.platform.swt/bundles/org.eclipse.swt" else="../org.eclipse.swt">
+ 		<available file="../../../eclipse.platform.swt/bundles/org.eclipse.swt" type="dir"/>
+ 	</condition>
+ 	<import file="${plugindir}/buildFragment.xml"/>
+diff --git a/eclipse/plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml b/eclipse/plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml
+index a9f0885..f96e424 100644
+--- a/eclipse/plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml
++++ b/eclipse/plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml
+@@ -9,7 +9,7 @@
+ 	<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
+ 	<property name="version.suffix" value="3.7.1" />
+ 	
+-	<condition property="plugindir" value="../../../eclipse.platform.swt/bundles/org.eclipse.swt" else="${buildDirectory}/plugins/org.eclipse.swt">
++	<condition property="plugindir" value="../../../eclipse.platform.swt/bundles/org.eclipse.swt" else="../org.eclipse.swt">
+ 		<available file="../../../eclipse.platform.swt/bundles/org.eclipse.swt" type="dir"/>
+ 	</condition>
+ 	<import file="${plugindir}/buildFragment.xml"/>
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index ba6b7ec..83cd352 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@ debian-load-internal-swt.patch
 gnomeproxy-makefile.patch
 find-newer-servlet-api.patch
 eclipse-build-additionalArchs.patch
+fix-org-eclipse-swt-gtk-linux.patch

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