From 33dc1e1cd443149d4ef21e19b804e127eafde891 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <rednoah@users.noreply.github.com>
Date: Tue, 7 Oct 2014 17:06:37 +0000
Subject: [PATCH] * DEB doesn't accept i686 arch values, and fails on all i686
 machines saying that it doesn't match i386 ... stupid

---
 build.xml                                     |  20 +++++++++---------
 lib/native/{linux-i686 => linux-i386}/fpcalc  | Bin
 .../lib7-Zip-JBinding.so                      | Bin
 .../libmediainfo.so                           | Bin
 .../{linux-i686 => linux-i386}/libzen.so      | Bin
 5 files changed, 10 insertions(+), 10 deletions(-)
 rename lib/native/{linux-i686 => linux-i386}/fpcalc (100%)
 rename lib/native/{linux-i686 => linux-i386}/lib7-Zip-JBinding.so (100%)
 rename lib/native/{linux-i686 => linux-i386}/libmediainfo.so (100%)
 rename lib/native/{linux-i686 => linux-i386}/libzen.so (100%)

diff --git a/build.xml b/build.xml
index 6416ec6d..16643353 100644
--- a/build.xml
+++ b/build.xml
@@ -374,24 +374,24 @@
 		<property name="jre.version" value="jdk-8u20" />
 
 		<tar destfile="${path.ubuntu-binary.tar.gz}" compression="gzip" longfile="gnu">
-			<tarfileset fullpath="i686/opt/filebot/FileBot.jar" file="${path.fatjar}" />
+			<tarfileset fullpath="i386/opt/filebot/FileBot.jar" file="${path.fatjar}" />
 			<tarfileset fullpath="x86_64/opt/filebot/FileBot.jar" file="${path.fatjar}" />
 
-			<tarfileset prefix="i686/opt/filebot" dir="${dir.lib}/native/linux-i686" includes="*.so" />
+			<tarfileset prefix="i386/opt/filebot" dir="${dir.lib}/native/linux-i386" includes="*.so" />
 			<tarfileset prefix="x86_64/opt/filebot" dir="${dir.lib}/native/linux-amd64" includes="*.so" />
 
-			<tarfileset prefix="i686/opt/filebot/bin" file="${dir.installer}/ubuntu/filebot.sh" filemode="755" />
+			<tarfileset prefix="i386/opt/filebot/bin" file="${dir.installer}/ubuntu/filebot.sh" filemode="755" />
 			<tarfileset prefix="x86_64/opt/filebot/bin" file="${dir.installer}/ubuntu/filebot.sh" filemode="755" />
 
-			<tarfileset prefix="i686/opt/filebot" dir="${dir.lib}/native/linux-i686" includes="fpcalc" filemode="755" />
+			<tarfileset prefix="i386/opt/filebot" dir="${dir.lib}/native/linux-i386" includes="fpcalc" filemode="755" />
 			<tarfileset prefix="x86_64/opt/filebot" dir="${dir.lib}/native/linux-amd64" includes="fpcalc" filemode="755" />
 
 			<tarfileset fullpath="filebot.desktop" file="${dir.installer}/ubuntu/FileBot.desktop" />
 			<tarfileset fullpath="filebot.svg" file="${dir.installer}/icons/icon.svg" />
 
 			<!-- Include Java 8 JRE -->
-			<tarfileset prefix="i686/opt/filebot/jre" dir="${jre.dir}/${jre.version}-linux-i586/jre" excludes="bin/**" />
-			<tarfileset prefix="i686/opt/filebot/jre" dir="${jre.dir}/${jre.version}-linux-i586/jre" includes="bin/java" filemode="755" />
+			<tarfileset prefix="i386/opt/filebot/jre" dir="${jre.dir}/${jre.version}-linux-i586/jre" excludes="bin/**" />
+			<tarfileset prefix="i386/opt/filebot/jre" dir="${jre.dir}/${jre.version}-linux-i586/jre" includes="bin/java" filemode="755" />
 			<tarfileset prefix="x86_64/opt/filebot/jre" dir="${jre.dir}/${jre.version}-linux-x64/jre" excludes="bin/**" />
 			<tarfileset prefix="x86_64/opt/filebot/jre" dir="${jre.dir}/${jre.version}-linux-x64/jre" includes="bin/java" filemode="755" />
 		</tar>
@@ -402,10 +402,10 @@
 	</target>
 
 
-	<target name="deb" description="Build debian package for i686 and amd64">
+	<target name="deb" description="Build debian package for i386 and amd64">
 		<taskdef resource="ant_deb_task.properties" classpath="${dir.lib}/build/ant-deb.jar" />
 		<antcall target="deb-arch">
-			<param name="arch" value="i686" />
+			<param name="arch" value="i386" /><!-- arch i686 not allowed by deb -->
 		</antcall>
 		<antcall target="deb-arch">
 			<param name="arch" value="amd64" />
@@ -433,7 +433,7 @@
 			<param name="arch" value="arm" />
 		</antcall>
 		<antcall target="ipkg-arch">
-			<param name="arch" value="i686" />
+			<param name="arch" value="i386" />
 		</antcall>
 	</target>
 
@@ -563,7 +563,7 @@
 			<param name="arch" value="win32-x64" />
 		</antcall>
 		<antcall target="webstart-nativelib">
-			<param name="arch" value="linux-i686" />
+			<param name="arch" value="linux-i386" />
 		</antcall>
 		<antcall target="webstart-nativelib">
 			<param name="arch" value="linux-amd64" />
diff --git a/lib/native/linux-i686/fpcalc b/lib/native/linux-i386/fpcalc
similarity index 100%
rename from lib/native/linux-i686/fpcalc
rename to lib/native/linux-i386/fpcalc
diff --git a/lib/native/linux-i686/lib7-Zip-JBinding.so b/lib/native/linux-i386/lib7-Zip-JBinding.so
similarity index 100%
rename from lib/native/linux-i686/lib7-Zip-JBinding.so
rename to lib/native/linux-i386/lib7-Zip-JBinding.so
diff --git a/lib/native/linux-i686/libmediainfo.so b/lib/native/linux-i386/libmediainfo.so
similarity index 100%
rename from lib/native/linux-i686/libmediainfo.so
rename to lib/native/linux-i386/libmediainfo.so
diff --git a/lib/native/linux-i686/libzen.so b/lib/native/linux-i386/libzen.so
similarity index 100%
rename from lib/native/linux-i686/libzen.so
rename to lib/native/linux-i386/libzen.so