[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.8, updated. eclipse/3.8.0_rc3-1-4-g7e34096

[Jakub Adam]

The following commit has been merged in the master-3.8 branch:
commit d1e3ca6c637038d98b8a3d4bf63f850e6e501d4b
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Tue Jun 5 20:57:29 2012 +0200

    Fix FTBFS on most architectures

diff --git a/debian/changelog b/debian/changelog
index 5747008..370e6bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+eclipse (3.8.0~rc3-2) UNRELEASED; urgency=low
+
+  * Fix FTBFS on most architectures.
+
+ -- Jakub Adam <jakub.adam at ktknet.cz>  Tue, 05 Jun 2012 22:34:51 +0200
+
 eclipse (3.8.0~rc3-1) experimental; urgency=low
 
   * New upstream release.
diff --git a/patches/eclipse-add-archs-filesystem.patch b/debian/patches/eclipse-add-archs-net.patch
similarity index 64%
copy from patches/eclipse-add-archs-filesystem.patch
copy to debian/patches/eclipse-add-archs-net.patch
index 6a71f88..db338ff 100644
--- a/patches/eclipse-add-archs-filesystem.patch
+++ b/debian/patches/eclipse-add-archs-net.patch
@@ -1,12 +1,20 @@
---- a/features/org.eclipse.platform/feature.xml
-+++ b/features/org.eclipse.platform/feature.xml
-@@ -445,6 +445,116 @@
-          version="0.0.0"
-          fragment="true"
+From: Jakub Adam <jakub.adam at ktknet.cz>
+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(+)
+
+diff --git a/eclipse/features/org.eclipse.platform/feature.xml b/eclipse/features/org.eclipse.platform/feature.xml
+index b3e4606..1720908 100644
+--- a/eclipse/features/org.eclipse.platform/feature.xml
++++ b/eclipse/features/org.eclipse.platform/feature.xml
+@@ -114,6 +114,116 @@
           unpack="false"/>
-+	 
-+   <plugin
-+         id="org.eclipse.core.filesystem.linux.alpha"
+          
+    <plugin
++         id="org.eclipse.core.net.linux.alpha"
 +         os="linux"
 +         arch="alpha"
 +         download-size="0"
@@ -14,9 +22,9 @@
 +         version="0.0.0"
 +         fragment="true"
 +         unpack="false"/>
-+	 
++
 +   <plugin
-+         id="org.eclipse.core.filesystem.linux.arm"
++         id="org.eclipse.core.net.linux.arm"
 +         os="linux"
 +         arch="arm"
 +         download-size="0"
@@ -24,9 +32,9 @@
 +         version="0.0.0"
 +         fragment="true"
 +         unpack="false"/>
-+	 
++
 +   <plugin
-+         id="org.eclipse.core.filesystem.linux.ia64"
++         id="org.eclipse.core.net.linux.ia64"
 +         os="linux"
 +         arch="ia64"
 +         download-size="0"
@@ -36,7 +44,7 @@
 +         unpack="false"/>
 +
 +   <plugin
-+         id="org.eclipse.core.filesystem.linux.mips"
++         id="org.eclipse.core.net.linux.mips"
 +         os="linux"
 +         arch="mips"
 +         download-size="0"
@@ -46,7 +54,7 @@
 +         unpack="false"/>
 +
 +   <plugin
-+         id="org.eclipse.core.filesystem.linux.mipsel"
++         id="org.eclipse.core.net.linux.mipsel"
 +         os="linux"
 +         arch="mipsel"
 +         download-size="0"
@@ -56,7 +64,7 @@
 +         unpack="false"/>
 +
 +   <plugin
-+         id="org.eclipse.core.filesystem.linux.PA_RISC"
++         id="org.eclipse.core.net.linux.PA_RISC"
 +         os="linux"
 +         arch="PA_RISC"
 +         download-size="0"
@@ -66,7 +74,7 @@
 +         unpack="false"/>
 +
 +   <plugin
-+         id="org.eclipse.core.filesystem.linux.ppc"
++         id="org.eclipse.core.net.linux.ppc"
 +         os="linux"
 +         arch="ppc"
 +         download-size="0"
@@ -74,9 +82,9 @@
 +         version="0.0.0"
 +         fragment="true"
 +         unpack="false"/>
-+	 
++
 +   <plugin
-+         id="org.eclipse.core.filesystem.linux.s390"
++         id="org.eclipse.core.net.linux.s390"
 +         os="linux"
 +         arch="s390"
 +         download-size="0"
@@ -84,9 +92,9 @@
 +         version="0.0.0"
 +         fragment="true"
 +         unpack="false"/>
-+	 
++
 +   <plugin
-+         id="org.eclipse.core.filesystem.linux.s390x"
++         id="org.eclipse.core.net.linux.s390x"
 +         os="linux"
 +         arch="s390x"
 +         download-size="0"
@@ -94,9 +102,9 @@
 +         version="0.0.0"
 +         fragment="true"
 +         unpack="false"/>
-+	 
++
 +   <plugin
-+         id="org.eclipse.core.filesystem.linux.sparc"
++         id="org.eclipse.core.net.linux.sparc"
 +         os="linux"
 +         arch="sparc"
 +         download-size="0"
@@ -104,9 +112,9 @@
 +         version="0.0.0"
 +         fragment="true"
 +         unpack="false"/>
-+	 
++
 +   <plugin
-+         id="org.eclipse.core.filesystem.linux.sparc64"
++         id="org.eclipse.core.net.linux.sparc64"
 +         os="linux"
 +         arch="sparc64"
 +         download-size="0"
@@ -114,6 +122,8 @@
 +         version="0.0.0"
 +         fragment="true"
 +         unpack="false"/>
- 
-    <plugin
-          id="org.eclipse.core.filesystem.linux.x86_64"
++
++   <plugin
+          id="org.eclipse.core.net.linux.x86_64"
+          os="linux"
+          arch="x86_64"
diff --git a/debian/patches/series b/debian/patches/series
index ea4f4b2..777e538 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -33,3 +33,4 @@ refresh-eclipse-nosourcebundlesfordependencies.patch
 install-new-icons.patch
 disable-useless-patches.patch
 generate-additional-archs.patch
+eclipse-add-archs-net.patch

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