Merge pull request #290 from joshuaboniface/debian-gpl-tweaks

Debian GPL tweaks

debian/changelog

@@ -1,3 +1,10 @@
+jellyfin (3.5.2-5) unstable; urgency=medium
+
+  * Fully GPL'd release - remove tainted code from MediaBrowser.Common
+  * Several code cleanups and tweaks
+
+ -- Joshua Boniface <joshua@boniface.me>  Fri, 28 Dec 2018 10:26:30 -0500
+
 jellyfin (3.5.2-4) unstable; urgency=medium
 
   * Correct manifest.json bug and vdpau

debian/jellyfin.service

@@ -7,8 +7,8 @@ Type = simple
 EnvironmentFile = /etc/default/jellyfin
 User = jellyfin
 ExecStart = /usr/bin/jellyfin -programdata ${JELLYFIN_DATA} -restartpath ${JELLYFIN_RESTART_SCRIPT} ${JELLYFIN_ADD_OPTS}
-Restart = on-abort
-TimeoutSec = 20
+Restart = on-failure
+TimeoutSec = 15
 
 [Install]
 WantedBy = multi-user.target

debian/rules

@@ -2,6 +2,7 @@
 CONFIG := Release
 TERM := xterm
 SHELL := /bin/bash
+DOTNETRUNTIME := linux-x64
 export DH_VERBOSE=1
 export DOTNET_CLI_TELEMETRY_OPTOUT=1
 
@@ -15,7 +16,7 @@ override_dh_auto_test:
 override_dh_clistrip:
 
 override_dh_auto_build:
-	dotnet publish --configuration $(CONFIG) --output='$(CURDIR)/usr/lib/jellyfin/bin' --self-contained --runtime linux-x64
+	dotnet publish --configuration $(CONFIG) --output='$(CURDIR)/usr/lib/jellyfin/bin' --self-contained --runtime $(DOTNETRUNTIME)
 
 override_dh_auto_clean:
 	dotnet clean -maxcpucount:1 --configuration $(CONFIG) || true