From 33e03e39b96d8b01c6e7c61fe9d343219a7aa04a Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <reinhard.pointner@gmail.com>
Date: Thu, 7 Mar 2019 18:53:54 +0700
Subject: [PATCH] Use the jna.jar from the system repository to make sure the
 version matches the corresponding libjnidispatch.so native library

---
 app.properties                           | 2 +-
 build.xml                                | 6 +++---
 installer/deb-universal/control/control  | 2 +-
 installer/deb-universal/control/postinst | 7 +++++++
 installer/deb-universal/control/prerm    | 7 +++++++
 5 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 installer/deb-universal/control/postinst
 create mode 100644 installer/deb-universal/control/prerm

diff --git a/app.properties b/app.properties
index c338d106..f545ea20 100644
--- a/app.properties
+++ b/app.properties
@@ -73,7 +73,7 @@ mac.application.category: public.app-category.utilities
 deb.application.categories: AudioVideo;Video;Utility;FileTools;
 deb.application.mimetype: inode/directory;video/*;audio/*;text/*;application/*;
 deb.application.class: net-filebot-Main
-deb.jna.depends: libjnidispatch.so
+deb.jna.depends: jna.jar, libjnidispatch.so
 
 # Package Options
 tar.compression: xz
diff --git a/build.xml b/build.xml
index de3c2b0e..c6a43441 100644
--- a/build.xml
+++ b/build.xml
@@ -572,8 +572,8 @@
 		<property name="dir.staging" location="${dir.dist}/deb-universal" />
 
 		<!-- use Debian package structure -->
-		<copy-replace todir="${dir.staging}">
-			<fileset dir="${dir.installer}/deb" />
+		<copy-replace todir="${dir.staging}/share">
+			<fileset dir="${dir.installer}/deb/share" />
 		</copy-replace>
 		<copy-replace todir="${dir.staging}">
 			<fileset dir="${dir.installer}/deb-universal" />
@@ -581,7 +581,7 @@
 
 		<jdeb destfile="${dir.dist}/${application.name}_${application.version}_universal.deb" control="${dir.staging}/control" compression="${tar.compression}" verbose="true">
 			<tarfileset prefix="/usr/share/filebot/bin" dir="${dir.staging}" includes="*.sh" filemode="755" />
-			<tarfileset prefix="/usr/share/filebot/jar" dir="${dir.dist}/lib" />
+			<tarfileset prefix="/usr/share/filebot/jar" dir="${dir.dist}/lib" excludes="${deb.jna.depends}" />
 
 			<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-universal/control/control b/installer/deb-universal/control/control
index 49cf5722..df921f9b 100644
--- a/installer/deb-universal/control/control
+++ b/installer/deb-universal/control/control
@@ -8,5 +8,5 @@ Homepage: @{package.homepage}
 Section: utils
 Priority: extra
 Depends: openjdk-@{jvm.version}-jre
-Recommends: openjfx, libjna-jni, libmediainfo0v5, libchromaprint-tools, p7zip-full, unrar
+Recommends: openjfx, libjna-java, mediainfo, libchromaprint-tools, p7zip-full, unrar
 Enhances: nautilus-actions
diff --git a/installer/deb-universal/control/postinst b/installer/deb-universal/control/postinst
new file mode 100644
index 00000000..0f8c6077
--- /dev/null
+++ b/installer/deb-universal/control/postinst
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# link filebot command
+ln -sf /usr/share/filebot/bin/filebot.sh /usr/bin/filebot
+
+# link system JNA library
+ln -sf /usr/share/java/jna.jar /usr/share/filebot/jar/jna.jar
diff --git a/installer/deb-universal/control/prerm b/installer/deb-universal/control/prerm
new file mode 100644
index 00000000..3747fd5a
--- /dev/null
+++ b/installer/deb-universal/control/prerm
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# unlink filebot command
+rm -f /usr/bin/filebot
+
+# unlink system JNA library
+rm -f /usr/share/filebot/jar/jna.jar