[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. debian/3.8.1-1-1-gdf9cccc

Jakub Adam jakub.adam at ktknet.cz
Tue Dec 4 19:22:33 UTC 2012


The following commit has been merged in the master branch:
commit df9ccccfb82ebc542007bd3b7508ac76dfb322bc
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Tue Dec 4 19:27:12 2012 +0100

    Fix ppc64 build

diff --git a/debian/changelog b/debian/changelog
index cbe0612..68d6999 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+eclipse (3.8.1-2) UNRELEASED; urgency=low
+
+  * Fix FTBFS on ppc64 (Closes: #694950).
+
+ -- Jakub Adam <jakub.adam at ktknet.cz>  Tue, 04 Dec 2012 19:29:25 +0100
+
 eclipse (3.8.1-1) experimental; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/eclipse-add-archs-filesystem.patch b/debian/patches/eclipse-add-archs-filesystem.patch
new file mode 100644
index 0000000..57838ab
--- /dev/null
+++ b/debian/patches/eclipse-add-archs-filesystem.patch
@@ -0,0 +1,37 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Tue, 4 Dec 2012 19:59:07 +0100
+Subject: eclipse-add-archs-filesystem
+
+---
+ patches/eclipse-add-archs-filesystem.patch |   12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/patches/eclipse-add-archs-filesystem.patch b/patches/eclipse-add-archs-filesystem.patch
+index 6a71f88..206ec92 100644
+--- a/patches/eclipse-add-archs-filesystem.patch
++++ b/patches/eclipse-add-archs-filesystem.patch
+@@ -1,6 +1,6 @@
+ --- a/features/org.eclipse.platform/feature.xml
+ +++ b/features/org.eclipse.platform/feature.xml
+-@@ -445,6 +445,116 @@
++@@ -565,6 +565,126 @@
+           version="0.0.0"
+           fragment="true"
+           unpack="false"/>
+@@ -114,6 +114,16 @@
+ +         version="0.0.0"
+ +         fragment="true"
+ +         unpack="false"/>
+++
+++   <plugin
+++         id="org.eclipse.core.filesystem.linux.ppc64"
+++         os="linux"
+++         arch="ppc64"
+++         download-size="0"
+++         install-size="0"
+++         version="0.0.0"
+++         fragment="true"
+++         unpack="false"/>
+  
+     <plugin
+           id="org.eclipse.core.filesystem.linux.x86_64"
diff --git a/debian/patches/eclipse-add-archs-net.patch b/debian/patches/eclipse-add-archs-net.patch
index db338ff..61c7555 100644
--- a/debian/patches/eclipse-add-archs-net.patch
+++ b/debian/patches/eclipse-add-archs-net.patch
@@ -3,14 +3,14 @@ Date: Tue, 5 Jun 2012 20:55:55 +0200
 Subject: eclipse-add-archs-net
 
 ---
- eclipse/features/org.eclipse.platform/feature.xml |  110 +++++++++++++++++++++
- 1 file changed, 110 insertions(+)
+ eclipse/features/org.eclipse.platform/feature.xml |  120 +++++++++++++++++++++
+ 1 file changed, 120 insertions(+)
 
 diff --git a/eclipse/features/org.eclipse.platform/feature.xml b/eclipse/features/org.eclipse.platform/feature.xml
-index b3e4606..1720908 100644
+index 6df7ca2..68974bf 100644
 --- a/eclipse/features/org.eclipse.platform/feature.xml
 +++ b/eclipse/features/org.eclipse.platform/feature.xml
-@@ -114,6 +114,116 @@
+@@ -114,6 +114,126 @@
           unpack="false"/>
           
     <plugin
@@ -84,6 +84,16 @@ index b3e4606..1720908 100644
 +         unpack="false"/>
 +
 +   <plugin
++         id="org.eclipse.core.net.linux.ppc64"
++         os="linux"
++         arch="ppc64"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"
++         unpack="false"/>
++
++   <plugin
 +         id="org.eclipse.core.net.linux.s390"
 +         os="linux"
 +         arch="s390"
diff --git a/debian/patches/series b/debian/patches/series
index 6d7972d..89296b3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -39,3 +39,4 @@ eclipse-help-fix-jsp-precompilation.patch
 use-deb-build-compiler-flags.patch
 fix-gnu-kfreebsd-build.patch
 gnomeproxy-glib-2.32-compat.patch
+eclipse-add-archs-filesystem.patch

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



More information about the pkg-java-commits mailing list