From bb376037720dba07dbd66aa593c436ac49c243d7 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <rednoah@filebot.net>
Date: Wed, 13 Jun 2018 01:23:00 +0700
Subject: [PATCH] Update DEB package

---
 build.xml                                        |  8 ++++----
 installer/deb/filebot.sh                         |  2 +-
 installer/deb/share/applications/filebot.desktop | 15 ---------------
 3 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/build.xml b/build.xml
index ec4a0813..33f72904 100644
--- a/build.xml
+++ b/build.xml
@@ -692,12 +692,10 @@
 
 		<jdeb destfile="${dir.dist}/${package.name}_${application.version}_${deb.arch}.deb" control="${dir.staging}/control" compression="${tar.compression}" verbose="true">
 			<tarfileset prefix="/usr/share/filebot/bin" dir="${dir.staging}" includes="*.sh" filemode="755" />
-
-			<!-- jdeb does not support tarfileset fullpath attribute (see https://github.com/tcurdt/jdeb/issues/245) -->
-			<tarfileset prefix="/usr/share/filebot/jar" file="${path.fatjar}" />
-
+			<tarfileset prefix="/usr/share/filebot/jar" dir="${dir.dist}/lib" />
 			<tarfileset prefix="/usr/share/filebot/lib" dir="${dir.lib}/native/linux-${arch}" includes="fpcalc" filemode="755" />
 			<tarfileset prefix="/usr/share/filebot/lib" dir="${dir.lib}/native/linux-${arch}" includes="*.so" />
+
 			<tarfileset prefix="/usr/share/icons/hicolor/scalable/apps" dir="${dir.installer}/icons" includes="filebot.svg" />
 			<tarfileset prefix="/usr/share" dir="${dir.staging}/share" includes="**/*.desktop" />
 		</jdeb>
@@ -710,6 +708,8 @@
 			<param name="arch.env" value="AMD64" />
 			<param name="arch.jre" value="x64" />
 		</antcall>
+
+		<!-- 32-bit Windows is not supported by Oracle JDK so there are no JRE builds -->
 		<!--
 		<antcall target="appx-arch">
 			<param name="arch" value="x86" />
diff --git a/installer/deb/filebot.sh b/installer/deb/filebot.sh
index 61f2f585..24a74f3b 100644
--- a/installer/deb/filebot.sh
+++ b/installer/deb/filebot.sh
@@ -9,4 +9,4 @@ fi
 # select application data folder
 APP_DATA="$HOME/.filebot"
 
-java @{java.application.options} -Dapplication.deployment=deb -Djdk.gtk.version=3 -DuseGVFS=true -Dnet.filebot.gio.GVFS="$XDG_RUNTIME_DIR/gvfs" -Dapplication.dir="$APP_DATA" -Djava.io.tmpdir="$APP_DATA/tmp" -Djna.boot.library.path="$APP_ROOT/lib" -Djna.library.path="$APP_ROOT/lib" -Djava.library.path="$APP_ROOT/lib" -Dnet.filebot.AcoustID.fpcalc="$APP_ROOT/lib/fpcalc" $JAVA_OPTS -classpath "$APP_ROOT/jar/*" @{main.class} "$@"
+java @{java.application.options} -Dapplication.deployment=deb -DuseGVFS=true -Dnet.filebot.gio.GVFS="$XDG_RUNTIME_DIR/gvfs" -Dapplication.dir="$APP_DATA" -Djava.io.tmpdir="$APP_DATA/tmp" -Djna.boot.library.path="$APP_ROOT/lib" -Djna.library.path="$APP_ROOT/lib" -Djava.library.path="$APP_ROOT/lib" -Dnet.filebot.AcoustID.fpcalc="$APP_ROOT/lib/fpcalc" $JAVA_OPTS -classpath "$APP_ROOT/jar/*" @{main.class} "$@"
diff --git a/installer/deb/share/applications/filebot.desktop b/installer/deb/share/applications/filebot.desktop
index 369a2f81..5415caca 100644
--- a/installer/deb/share/applications/filebot.desktop
+++ b/installer/deb/share/applications/filebot.desktop
@@ -10,18 +10,3 @@ Actions=Rename;Subtitles;Checksum;
 StartupNotify=true
 StartupWMClass=@{deb.application.class}
 X-Ubuntu-Gettext-Domain=@{package.name}
-
-[Desktop Action Rename]
-Name=Rename
-Exec=filebot --mode Rename %F
-OnlyShowIn=Unity;
-
-[Desktop Action Subtitles]
-Name=Subtitles
-Exec=filebot --mode Subtitles %F
-OnlyShowIn=Unity;
-
-[Desktop Action Checksum]
-Name=Checksum
-Exec=filebot --mode SFV %F
-OnlyShowIn=Unity;