[eclipse] 02/02: Fix FTBFS on s390x

[Jakub Adam]

This is an automated email from the git hooks/post-receive script.

xhaakon-guest pushed a commit to branch xhaakon-arch-fixes
in repository eclipse.

commit 3121c7e272ae5d1e5a31106d90ae867ec1a36c35
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sat Jan 11 17:52:26 2014 +0100

    Fix FTBFS on s390x
---
 debian/changelog                          |  1 +
 debian/patches/fix-s390-s390x-build.patch | 24 ++++++++++++++++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 26 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1f01a89..0356b90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ eclipse (3.8.1-5) UNRELEASED; urgency=low
   [ Jakub Adam ]
   * Compile org.eclipse.osgi bundle for java 1.5.
     - Required for Tycho build with Java 7.
+  * Fix FTBFS on s390x architecture.
 
   [ Matthias Klose ]
   * Build for arm64 and ppc64el.
diff --git a/debian/patches/fix-s390-s390x-build.patch b/debian/patches/fix-s390-s390x-build.patch
new file mode 100644
index 0000000..75951e3
--- /dev/null
+++ b/debian/patches/fix-s390-s390x-build.patch
@@ -0,0 +1,24 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Sat, 11 Jan 2014 17:45:20 +0100
+Subject: fix-s390-s390x-build
+
+---
+ eclipse-build-config/productFiles/rcpConfig/build.properties | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/eclipse-build-config/productFiles/rcpConfig/build.properties b/eclipse-build-config/productFiles/rcpConfig/build.properties
+index 9d3866e..778924a 100644
+--- a/eclipse-build-config/productFiles/rcpConfig/build.properties
++++ b/eclipse-build-config/productFiles/rcpConfig/build.properties
+@@ -41,9 +41,9 @@ root.linux.gtk.sparc=absolute:${buildDirectory}/features/org.eclipse.platform/ab
+ root.linux.gtk.sparc.permissions.755=*.so*
+ root.linux.gtk.sparc64=absolute:${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.sparc64,absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/gtk/linux/sparc64
+ root.linux.gtk.sparc64.permissions.755=*.so*
+-root.linux.gtk.s390=absolute:${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.s390,absolute:${buildDirectory}/features/org.eclipse.equinox.executable/contributed/gtk/linux/s390
++root.linux.gtk.s390=absolute:${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.s390,absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/gtk/linux/s390
+ root.linux.gtk.s390.permissions.755=*.so*
+-root.linux.gtk.s390x=absolute:${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.s390x,absolute:${buildDirectory}/features/org.eclipse.equinox.executable/contributed/gtk/linux/s390x
++root.linux.gtk.s390x=absolute:${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.s390x,absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/gtk/linux/s390x
+ root.linux.gtk.s390x.permissions.755=*.so*
+ root.linux.gtk.x86_64=absolute:${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.x86_64,absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/gtk/linux/x86_64
+ root.linux.gtk.x86_64.permissions.755=*.so*
diff --git a/debian/patches/series b/debian/patches/series
index 0c2c0a3..68475ae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -43,3 +43,4 @@ eclipse-add-archs-filesystem.patch
 equinox-jsp-jasper-tomcat-7.0.40.patch
 osgi-target-java-1.5.patch
 eclipse-add-aarch64-ppc64el.patch
+fix-s390-s390x-build.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse.git