The following commit has been merged in the master branch:
commit 9a27963e1763dcfd6ae132517293fd499b33af4c
Author: Niels Thykier <ni...@thykier.net>
Date:   Tue Dec 27 20:47:34 2011 +0100

    Partial fix for #649912: FTBFS on various archs

diff --git a/debian/eclipse-build-additionalArchs.tar.bz2 
b/debian/eclipse-build-additionalArchs.tar.bz2
new file mode 100644
index 0000000..7a80614
Binary files /dev/null and b/debian/eclipse-build-additionalArchs.tar.bz2 differ
diff --git a/debian/patches/eclipse-build-additionalArchs.patch 
b/debian/patches/eclipse-build-additionalArchs.patch
new file mode 100644
index 0000000..1269a2d
--- /dev/null
+++ b/debian/patches/eclipse-build-additionalArchs.patch
@@ -0,0 +1,84 @@
+From: Niels Thykier <ni...@thykier.net>
+Date: Tue, 27 Dec 2011 15:29:27 +0100
+Subject: eclipse-build-additionalArchs.patch
+
+---
+ additionalArchs/rename.sh       |    4 ++--
+ build.xml                       |    2 +-
+ generateAdditionalPlatforms.xml |    8 ++++----
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/additionalArchs/rename.sh b/additionalArchs/rename.sh
+index 2f8b177..c35634f 100755
+--- a/additionalArchs/rename.sh
++++ b/additionalArchs/rename.sh
+@@ -4,13 +4,13 @@ newArch=$1
+ 
+ moves(){
+ for f in $(find -type d); do
+-      tofile=$(echo $f | sed "s/ppc/$newArch/")
++      tofile=$(echo $f | sed "s/ppc64/$newArch/")
+       if [ $tofile != $f ]; then
+         cp -pfr $f $tofile
+       fi
+     done
+ for f in $(find -type f); do
+-      tofile=$(echo $f | sed "s/ppc/$newArch/")
++      tofile=$(echo $f | sed "s/ppc64/$newArch/")
+       if [ $tofile != $f ]; then
+         cp -pfr $f $tofile
+         rm -fr $f
+diff --git a/build.xml b/build.xml
+index f49c4e3..d9ccd48 100644
+--- a/build.xml
++++ b/build.xml
+@@ -220,7 +220,7 @@
+                       <fileset dir="${buildDirectory}/plugins" 
includes="**/ECLIPSEF.RSA" />
+               </delete>
+               <!-- add additional archs -->
+-              <untar compression="bzip2" 
dest="${basedir}/build/eclipse-${label}-src/plugins" 
src="${basedir}/eclipse-build-additionalArchs.tar.bz2" />
++              <untar compression="bzip2" 
dest="${basedir}/build/eclipse-${label}-src/plugins" 
src="${basedir}/debian/eclipse-build-additionalArchs.tar.bz2" />
+               <!-- prepare ecf build tree -->
+               <delete>
+                       <fileset dir="${buildDirectory}/plugins" 
includes="org.eclipse.ecf*" />
+diff --git a/generateAdditionalPlatforms.xml b/generateAdditionalPlatforms.xml
+index 70fa936..c1e3f47 100644
+--- a/generateAdditionalPlatforms.xml
++++ b/generateAdditionalPlatforms.xml
+@@ -1,7 +1,7 @@
+ <project name="Pdebuild bootstrap" default="cleanGenerate" basedir=".">
+       <target name="cleanGenerate" depends="clean, createTarball" />
+       <property name="archsDir" value="additionalArchs" />
+-      <property name="sourceDir" 
value="build/eclipse-3.7.0-I20110505-0800-src" />
++      <property name="sourceDir" value="build/eclipse-3.7.0-src" />
+ 
+       <macrodef name="copyPlugin">
+               <attribute name="pluginName" />
+@@ -9,7 +9,7 @@
+               <sequential>
+                       <copy todir="${archsDir}/@{pluginName}.@{newArch}">
+                               <resources>
+-                                      <fileset 
dir="${sourceDir}/plugins/@{pluginName}.ppc">
++                                      <fileset 
dir="${sourceDir}/plugins/@{pluginName}.ppc64">
+                                               <include name="**" />
+                                       </fileset>
+                               </resources>
+@@ -33,7 +33,7 @@
+                               <exclude name="rename.sh" />
+                               <include name="*@{newArch}/**/*.*" />
+                               <excludesfile name="${archsDir}/rename.sh" />
+-                              <replacetoken>ppc</replacetoken>
++                              <replacetoken>ppc64</replacetoken>
+                       </replace>
+               </sequential>
+       </macrodef>
+@@ -48,7 +48,7 @@
+       </target>
+ 
+       <target name="generate" depends="init">
+-              <generateArch newArch="ppc64" />
++              <generateArch newArch="ppc" />
+               <generateArch newArch="sparc" />
+           <generateArch newArch="sparc64" />
+       </target>
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 3a4a0e5..d619a01 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@ debian-load-internal-swt.patch
 gnomeproxy-makefile.patch
 find-newer-system-jasper.patch
 find-newer-servlet-api.patch
+eclipse-build-additionalArchs.patch
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
index 6701e6c..c35af5d 100644
--- a/debian/source/include-binaries
+++ b/debian/source/include-binaries
@@ -1 +1,2 @@
 debian/eclipse-build-generatedScripts.tar.bz2
+debian/eclipse-build-additionalArchs.tar.bz2

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

_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to