From 4ecedb2a12e3ebc464472b9f2ff0bfb06c9a4b87 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Sun, 19 Jul 2020 23:26:59 -0400 Subject: Fix bad dependency handling in 10.6.0-1 Fixes the incorrect dependency handling from 10.6.0, which was missing the Replaces and Breaks entries on jellyfin-server. Thus apt would complain about /etc/default/jellyfin being in two packages and fail to upgrade. With this configuration, I've verified that apt now handles this situation properly. --- debian/control | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 896d8286b..013ee13e0 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,6 @@ Section: misc Priority: optional Maintainer: Jellyfin Team Build-Depends: debhelper (>= 9), - dotnet-sdk-3.1, libc6-dev, libcurl4-openssl-dev, libfontconfig1-dev, @@ -15,8 +14,8 @@ Vcs-Git: https://github.org/jellyfin/jellyfin.git Vcs-Browser: https://github.org/jellyfin/jellyfin Package: jellyfin-server -Replaces: mediabrowser, emby, emby-server-beta, jellyfin-dev, emby-server -Breaks: mediabrowser, emby, emby-server-beta, jellyfin-dev, emby-server +Replaces: mediabrowser, emby, emby-server-beta, jellyfin-dev, emby-server, jellyfin (<<10.6.0) +Breaks: mediabrowser, emby, emby-server-beta, jellyfin-dev, emby-server, jellyfin (<<10.6.0) Conflicts: mediabrowser, emby, emby-server-beta, jellyfin-dev, emby-server Architecture: any Depends: at, -- cgit v1.2.3 From 4966ca3616c44a0ae486de952725492b51e58e4c Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Sun, 19 Jul 2020 23:28:25 -0400 Subject: Remove the old Emby conflicts It's been long enough that this is no longer an issue. We still conflict on the ports 8096 and 8190, but this will simply result in a failure to start; allow users to get themselves into that situation if they wish. --- debian/control | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 013ee13e0..4515e78bf 100644 --- a/debian/control +++ b/debian/control @@ -14,9 +14,8 @@ Vcs-Git: https://github.org/jellyfin/jellyfin.git Vcs-Browser: https://github.org/jellyfin/jellyfin Package: jellyfin-server -Replaces: mediabrowser, emby, emby-server-beta, jellyfin-dev, emby-server, jellyfin (<<10.6.0) -Breaks: mediabrowser, emby, emby-server-beta, jellyfin-dev, emby-server, jellyfin (<<10.6.0) -Conflicts: mediabrowser, emby, emby-server-beta, jellyfin-dev, emby-server +Replaces: jellyfin (<<10.6.0) +Breaks: jellyfin (<<10.6.0) Architecture: any Depends: at, libsqlite3-0, -- cgit v1.2.3 From b1fe20aac5b33bb7c984cd84825fc91fd9972eb3 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Sun, 19 Jul 2020 23:36:48 -0400 Subject: Readd sed'd out dotnet-sdk dependency --- debian/control | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 4515e78bf..39c2aa055 100644 --- a/debian/control +++ b/debian/control @@ -3,6 +3,7 @@ Section: misc Priority: optional Maintainer: Jellyfin Team Build-Depends: debhelper (>= 9), + dotnet-sdk-3.1, libc6-dev, libcurl4-openssl-dev, libfontconfig1-dev, -- cgit v1.2.3