diff options
| author | Andrew Rabert <6550543+nvllsvm@users.noreply.github.com> | 2018-12-16 23:35:07 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-16 23:35:07 -0500 |
| commit | a8bce31a01225911b69f2c3b59a7397895f7b79b (patch) | |
| tree | 9706016bc04c8b1b497173165d41972c502256d6 /debian | |
| parent | 8e9485867bc207377af0e30cde206c1f9a37bc0d (diff) | |
| parent | 5d0c0a8b7cf6696343f6c983b9d0f676cb9cd386 (diff) | |
Merge pull request #199 from jellyfin/develop
Master 3.5.2-3
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control | 8 | ||||
| -rw-r--r-- | debian/preinst | 4 | ||||
| -rwxr-xr-x | debian/rules | 4 |
4 files changed, 17 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index 3abd5c9b43..dbd489e8f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +jellyfin (3.5.2-3) unstable; urgency=medium + + * Correct several bugs in 3.5.2-2 packaging + + -- Joshua Boniface <joshua@boniface.me> Sat, 15 Dec 2018 18:17:32 -0500 + jellyfin (3.5.2-2) unstable; urgency=medium * Major code updates related to rebranding and cleanup diff --git a/debian/control b/debian/control index c00988f3e6..13c62c8065 100644 --- a/debian/control +++ b/debian/control @@ -1,11 +1,13 @@ Source: jellyfin Section: misc Priority: optional -Maintainer: Vasily <just.one.man@yandex.ru> +Maintainer: Jellyfin Team <team@jellyfin.org> Build-Depends: debhelper (>= 9), dotnet-sdk-2.2, libc6-dev, - libcurl4-openssl-dev + libcurl4-openssl-dev, + libfontconfig1-dev, + libfreetype6-dev Standards-Version: 3.9.4 Package: jellyfin @@ -13,6 +15,6 @@ Replaces: mediabrowser, emby, emby-server-beta, jellyfin-dev, emby-server Breaks: mediabrowser, emby, emby-server-beta, jellyfin-dev, emby-server Conflicts: mediabrowser, emby, emby-server-beta, jellyfin-dev, emby-server Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, at, libsqlite3-0, ffmpeg +Depends: at, libsqlite3-0, ffmpeg, libfontconfig1, libfreetype6, libssl1.0.0 | libssl1.0.2 Description: Jellyfin is a home media server. It is built on top of other popular open source technologies such as Service Stack, jQuery, jQuery mobile, and Mono. It features a REST-based api with built-in documentation to facilitate client development. We also have client libraries for our api to enable rapid development. diff --git a/debian/preinst b/debian/preinst index c53260bb06..2ce29a0cf1 100644 --- a/debian/preinst +++ b/debian/preinst @@ -53,6 +53,10 @@ case "$1" in [[ -f $PIDFILE ]] && rm $PIDFILE fi fi + + # Clean up old Emby cruft that can break the user's system + [[ -f /etc/sudoers.d/emby ]] && rm -f /etc/sudoers.d/emby + ;; abort-upgrade) ;; diff --git a/debian/rules b/debian/rules index 0b790f2e45..6c915af6f4 100755 --- a/debian/rules +++ b/debian/rules @@ -15,8 +15,8 @@ override_dh_auto_test: override_dh_clistrip: override_dh_auto_build: - dotnet publish --configuration $(CONFIG) $(CURDIR)/MediaBrowser.sln --output='$(CURDIR)/usr/lib/jellyfin/bin' --self-contained --runtime linux-x64 + dotnet publish --configuration $(CONFIG) --output='$(CURDIR)/usr/lib/jellyfin/bin' --self-contained --runtime linux-x64 override_dh_auto_clean: - dotnet clean -maxcpucount:1 --configuration $(CONFIG) $(CURDIR)/MediaBrowser.sln || true + dotnet clean -maxcpucount:1 --configuration $(CONFIG) || true rm -rf '$(CURDIR)/usr' |