From 022955d9ac011ff4feac03c8c656a2e0c7e1790f Mon Sep 17 00:00:00 2001
From: Joshua Boniface <joshua@boniface.me>
Date: Fri, 28 Dec 2018 10:25:19 -0500
Subject: [PATCH 1/3] Move the .NET Runtime flag into a variable

---
 debian/rules | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 6c915af6f4..10a3a84864 100755
--- a/debian/rules
+++ b/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

From 1b4a21871a57aabdcf3bcab7be753bd7e6987e91 Mon Sep 17 00:00:00 2001
From: Joshua Boniface <joshua@boniface.me>
Date: Fri, 28 Dec 2018 10:26:54 -0500
Subject: [PATCH 2/3] Bump Debian binary version

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e4176123d7..9dc21d467e 100644
--- a/debian/changelog
+++ b/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

From 34f226d83a7dd9a36a29f361b16606117fce2735 Mon Sep 17 00:00:00 2001
From: Joshua Boniface <joshua@boniface.me>
Date: Fri, 28 Dec 2018 10:27:27 -0500
Subject: [PATCH 3/3] Tweak unit to restart on any failure, 15s timeout

---
 debian/jellyfin.service | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/jellyfin.service b/debian/jellyfin.service
index d5a999cf53..4c37399092 100644
--- a/debian/jellyfin.service
+++ b/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