From 9d38998b8464a4d6a39283d5add6943ed1e874bc Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <reinhard.pointner@gmail.com>
Date: Thu, 29 Nov 2018 22:23:56 +0700
Subject: [PATCH] Differentiate the amd64 package from the universal package by
 including all the native dependencies (excl. JRE)

---
 build.xml                     | 2 +-
 installer/deb/control/control | 1 -
 installer/deb/filebot.sh      | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index 04ca5170..c0be576b 100644
--- a/build.xml
+++ b/build.xml
@@ -549,7 +549,7 @@
 			<tarfileset prefix="/usr/share/filebot/bin" dir="${dir.staging}" includes="*.sh" filemode="755" />
 			<tarfileset prefix="/usr/share/filebot/mod" dir="${dir.staging}/jre/ext/modules/lib" />
 			<tarfileset prefix="/usr/share/filebot/jar" dir="${dir.dist}/lib" />
-			<tarfileset prefix="/usr/share/filebot/lib" dir="${dir.lib}/native/linux-amd64" includes="${deb.jna.depends}" />
+			<tarfileset prefix="/usr/share/filebot/lib" dir="${dir.lib}/native/linux-amd64" />
 
 			<tarfileset prefix="/usr/share/icons/hicolor/scalable/apps" dir="${dir.installer}/icons" includes="filebot.svg" />
 			<tarfileset prefix="/usr/share" dir="${dir.staging}/share" />
diff --git a/installer/deb/control/control b/installer/deb/control/control
index d31dced3..dfbcc756 100644
--- a/installer/deb/control/control
+++ b/installer/deb/control/control
@@ -8,5 +8,4 @@ Homepage: @{package.homepage}
 Section: utils
 Priority: extra
 Depends: openjdk-@{jvm.version}-jre
-Recommends: libmediainfo0v5, libchromaprint-tools, p7zip-full, p7zip-rar
 Enhances: nautilus-actions
diff --git a/installer/deb/filebot.sh b/installer/deb/filebot.sh
index 5119e84c..0c442e5b 100644
--- a/installer/deb/filebot.sh
+++ b/installer/deb/filebot.sh
@@ -11,4 +11,4 @@ APP_DATA="$HOME/.filebot"
 LIBRARY_PATH="$FILEBOT_HOME/lib"
 MODULE_PATH="$FILEBOT_HOME/mod"
 
-java -Dapplication.deployment=deb --module-path "$MODULE_PATH" --add-modules ALL-MODULE-PATH -Dnet.filebot.Archive.extractor=SevenZipExecutable @{java.application.options} @{linux.application.options} @{linux.desktop.application.options} $JAVA_OPTS $FILEBOT_OPTS -jar "$FILEBOT_HOME/jar/filebot.jar" "$@"
+java -Dapplication.deployment=deb --module-path "$MODULE_PATH" --add-modules ALL-MODULE-PATH -Dnet.filebot.AcoustID.fpcalc="$LIBRARY_PATH/fpcalc" @{java.application.options} @{linux.application.options} @{linux.desktop.application.options} $JAVA_OPTS $FILEBOT_OPTS -jar "$FILEBOT_HOME/jar/filebot.jar" "$@"