diff options
| author | Vasily <JustAMan@users.noreply.github.com> | 2018-12-28 21:29:42 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-28 21:29:42 +0300 |
| commit | da0ae0d64f2f678ea93982f4aa4deb76e623fa1f (patch) | |
| tree | 1044b47b2522b3921ff3f8c57aba02c8437598d9 | |
| parent | a86b71899ec52c44ddc6c3018e8cc5e9d7ff4d62 (diff) | |
| parent | 34f226d83a7dd9a36a29f361b16606117fce2735 (diff) | |
Merge pull request #290 from joshuaboniface/debian-gpl-tweaks
Debian GPL tweaks
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/jellyfin.service | 4 | ||||
| -rwxr-xr-x | debian/rules | 3 |
3 files changed, 11 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index e4176123d..9dc21d467 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 diff --git a/debian/jellyfin.service b/debian/jellyfin.service index d5a999cf5..4c3739909 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 diff --git a/debian/rules b/debian/rules index 6c915af6f..10a3a8486 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 |