diff options
| author | David <daullmer@gmail.com> | 2020-07-21 21:56:24 +0200 |
|---|---|---|
| committer | David <daullmer@gmail.com> | 2020-07-21 21:56:24 +0200 |
| commit | be8cf1e9ef5f24903c406f5cdbe985e84ffeb102 (patch) | |
| tree | b3a925ec3cf8afd8a04eeaad94861b258dfec70f /debian | |
| parent | 9a2bcd6266fb222491abe6ea31d5e7e734699d5f (diff) | |
| parent | 5b57c81ee14ce585161b9ac331e6e3528826b815 (diff) | |
Merge branch 'api-migration' into api-syncplay
# Conflicts:
# MediaBrowser.Api/SyncPlay/SyncPlayService.cs
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 35fb65957..d38d03805 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +jellyfin-server (10.6.0-2) unstable; urgency=medium + + * Fix upgrade bug + + -- Joshua Boniface <joshua@boniface.me> Sun, 19 Jul 22:47:27 -0400 + jellyfin-server (10.6.0-1) unstable; urgency=medium * Forthcoming stable release diff --git a/debian/control b/debian/control index 896d8286b..39c2aa055 100644 --- a/debian/control +++ b/debian/control @@ -15,9 +15,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 -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, |