aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--.gitlab-ci.yml10
-rw-r--r--.gitmodules2
-rw-r--r--CONTRIBUTING.md40
-rw-r--r--Dockerfile3
-rw-r--r--Dockerfile.debian_package22
-rw-r--r--MediaBrowser.Server.Mono/ApplicationPathHelper.cs11
-rw-r--r--MediaBrowser.Server.Mono/app.config4
-rw-r--r--MediaBrowser.sln48
-rw-r--r--README.md78
-rw-r--r--debian/changelog6
-rw-r--r--debian/control4
-rwxr-xr-xdebian/rules2
13 files changed, 213 insertions, 19 deletions
diff --git a/.gitignore b/.gitignore
index fe9c9e144..f34c83571 100644
--- a/.gitignore
+++ b/.gitignore
@@ -235,5 +235,7 @@ pip-log.txt
MediaBrowser.WebDashboard/dashboard-ui/.idea/
/.vs
+.idea/
+
# Don't ignore the debian/bin folder
!debian/bin/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 000000000..f9c205bcf
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,10 @@
+variables:
+ GIT_DEPTH: "1"
+ GIT_SUBMODULE_STRATEGY: "recursive"
+
+build:docker:
+ image: docker
+ services:
+ - docker:dind
+ script:
+ - docker build .
diff --git a/.gitmodules b/.gitmodules
index 2ef569c7c..31a58ecf1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
[submodule "ThirdParty/taglib-sharp"]
path = ThirdParty/taglib-sharp
- url = git@github.com:mono/taglib-sharp.git
+ url = https://github.com/mono/taglib-sharp.git
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 000000000..b5fd212c9
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,40 @@
+Contributing to Jellyfin
+============
+
+Thank you for your interest in contributing to Jellyfin. We are a community project made up of volunteers doing our best to keep a free software version of Emby alive and healthy.
+
+This document describes how to contribute to Jellyfin via GitHub, and is applicable to anyone who might wish to open up an issue or do a pull request. Please give it a read-through first.
+
+## Issues
+
+Issues should be one of three things:
+
+1. A software bug with Jellyfin.
+2. A feature request or suggestion.
+3. A task to be done with Jellyfin.
+
+All other discussions should be directed towards the [Jellyfin Riot channel](https://matrix.to/#/#jellyfin:matrix.org), the [Jellyfish development Riot channel](https://matrix.to/#/#jellyfin-dev:matrix.org), or [our subreddit](https://reddit.com/r/jellyfin).
+
+When writing an issue, please ensure you capture as much relevant detail as possible - having to request additional information just leads to wasted time. Please include any log output, configuration options, and system details.
+
+## Pull Requests
+
+We adhere to a fairly standard fork-and-PR model of development:
+
+1. Fork a copy of the Jellyfin repository to your own user.
+
+2. Make your changes on a local feature branch of your copy of the repository.
+
+3. Submit a pull request from your feature branch back to the upstream master branch.
+
+All PRs require review before merging. Once that is done, if the PR is not tagged with the WIP label, it should be immediately merged by the reviewer assuming that they have write access. If you do not have write access, please feel free to leave reviews as well and suggest changes as they will be taken into account as well.
+
+## Developer Access
+
+We are open with granting developer (merge/write) access to those who show interest in contributing and reviewing PRs. Such access can be granted by a current developer. Unruly or abusive developers can be removed at any time by the core team, so please take your responsibility seriously. We're all in this together trying to make the best free software media platform we can.
+
+## How can I contribute?
+
+If you're a .NET C# or Javascript developer, please feel free to jump right in - we can use all the help we can get!
+
+ If you're not a developer, please consider helping out by contributing documentation, testing the latest releases and reporting bugs, or by telling your friends about the project! Any little bit helps.
diff --git a/Dockerfile b/Dockerfile
index 66c8884aa..fad1a95a2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,8 @@ FROM microsoft/dotnet:${DOTNET_VERSION}-sdk as builder
WORKDIR /repo
COPY . .
ARG CONFIGURATION=RELEASE
-RUN dotnet clean \
+RUN export DOTNET_CLI_TELEMETRY_OPTOUT=1 \
+ && dotnet clean \
&& dotnet build --configuration ${CONFIGURATION} $(pwd)/MediaBrowser.sln \
&& dotnet publish --configuration ${CONFIGURATION} $(pwd)/MediaBrowser.sln --output /jellyfin
diff --git a/Dockerfile.debian_package b/Dockerfile.debian_package
new file mode 100644
index 000000000..31505b978
--- /dev/null
+++ b/Dockerfile.debian_package
@@ -0,0 +1,22 @@
+FROM debian:9
+
+# https://dotnet.microsoft.com/download/linux-package-manager/debian9/sdk-current
+RUN apt-get update \
+ && apt-get install -y apt-transport-https debhelper gnupg wget \
+ && wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.asc.gpg \
+ && mv microsoft.asc.gpg /etc/apt/trusted.gpg.d/ \
+ && wget -q https://packages.microsoft.com/config/debian/9/prod.list \
+ && mv prod.list /etc/apt/sources.list.d/microsoft-prod.list \
+ && chown root:root /etc/apt/trusted.gpg.d/microsoft.asc.gpg \
+ && chown root:root /etc/apt/sources.list.d/microsoft-prod.list \
+ && apt-get update \
+ && apt-get install -y dotnet-sdk-2.2
+
+WORKDIR /repo
+COPY . .
+
+RUN dpkg-buildpackage -us -uc \
+ && mkdir /dist \
+ && mv /jellyfin*deb /dist
+
+WORKDIR /dist
diff --git a/MediaBrowser.Server.Mono/ApplicationPathHelper.cs b/MediaBrowser.Server.Mono/ApplicationPathHelper.cs
index c8cca40ff..ac55693fa 100644
--- a/MediaBrowser.Server.Mono/ApplicationPathHelper.cs
+++ b/MediaBrowser.Server.Mono/ApplicationPathHelper.cs
@@ -1,6 +1,7 @@
using System;
using System.Configuration;
using System.IO;
+using System.Runtime.InteropServices;
namespace MediaBrowser.Server.Mono
{
@@ -22,7 +23,15 @@ namespace MediaBrowser.Server.Mono
ConfigurationManager.AppSettings["DebugProgramDataPath"] :
ConfigurationManager.AppSettings["ReleaseProgramDataPath"];
- programDataPath = programDataPath.Replace("%ApplicationData%", Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData));
+ if (System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+ {
+ programDataPath = programDataPath.Replace("%ApplicationData%", Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData));
+ }
+ else
+ {
+ programDataPath = programDataPath.Replace("%ApplicationData%", "/var/lib");
+ }
+
programDataPath = programDataPath
.Replace('/', Path.DirectorySeparatorChar)
diff --git a/MediaBrowser.Server.Mono/app.config b/MediaBrowser.Server.Mono/app.config
index 42a9d04e7..a93871625 100644
--- a/MediaBrowser.Server.Mono/app.config
+++ b/MediaBrowser.Server.Mono/app.config
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<appSettings>
- <add key="DebugProgramDataPath" value="E:\Temp" />
- <add key="ReleaseProgramDataPath" value="/var/lib/emby/" />
+ <add key="DebugProgramDataPath" value="%ApplicationData%/jellyfin-debug/" />
+ <add key="ReleaseProgramDataPath" value="%ApplicationData%/jellyfin/" />
</appSettings>
</configuration> \ No newline at end of file
diff --git a/MediaBrowser.sln b/MediaBrowser.sln
index b29bde97d..b7c8ba527 100644
--- a/MediaBrowser.sln
+++ b/MediaBrowser.sln
@@ -56,6 +56,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Emby.Notifications", "Emby.
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Emby.Naming", "Emby.Naming\Emby.Naming.csproj", "{E5AF7B26-2239-4CE0-B477-0AA2018EDAA2}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageMagickSharp", "ImageMagickSharp\ImageMagickSharp\ImageMagickSharp.csproj", "{124E0710-6572-497B-B2A5-696AA08AD8BB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "taglib-sharp", "ThirdParty\taglib-sharp\src\taglib-sharp.csproj", "{D45FC504-D06B-41A0-A220-C20B7E8F1304}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emby.XmlTv", "Emby.XmlTv\Emby.XmlTv\Emby.XmlTv.csproj", "{6EAFA7F0-8A82-49E6-B2FA-086C5CAEA95B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IsoMounter", "Emby.IsoMounting\IsoMounter\IsoMounter.csproj", "{9BA471D2-6DB9-4DBF-B3A0-9FB3171F94A6}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -477,6 +485,46 @@ Global
{E5AF7B26-2239-4CE0-B477-0AA2018EDAA2}.Release|x64.Build.0 = Release|Any CPU
{E5AF7B26-2239-4CE0-B477-0AA2018EDAA2}.Release|x86.ActiveCfg = Release|Any CPU
{E5AF7B26-2239-4CE0-B477-0AA2018EDAA2}.Release|x86.Build.0 = Release|Any CPU
+ {6EAFA7F0-8A82-49E6-B2FA-086C5CAEA95B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6EAFA7F0-8A82-49E6-B2FA-086C5CAEA95B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6EAFA7F0-8A82-49E6-B2FA-086C5CAEA95B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {6EAFA7F0-8A82-49E6-B2FA-086C5CAEA95B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {6EAFA7F0-8A82-49E6-B2FA-086C5CAEA95B}.Debug|Win32.ActiveCfg = Debug|Any CPU
+ {6EAFA7F0-8A82-49E6-B2FA-086C5CAEA95B}.Debug|Win32.Build.0 = Debug|Any CPU
+ {6EAFA7F0-8A82-49E6-B2FA-086C5CAEA95B}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {6EAFA7F0-8A82-49E6-B2FA-086C5CAEA95B}.Debug|x64.Build.0 = Debug|Any CPU
+ {6EAFA7F0-8A82-49E6-B2FA-086C5CAEA95B}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {6EAFA7F0-8A82-49E6-B2FA-086C5CAEA95B}.Debug|x86.Build.0 = Debug|Any CPU
+ {6EAFA7F0-8A82-49E6-B2FA-086C5CAEA95B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {6EAFA7F0-8A82-49E6-B2FA-086C5CAEA95B}.Release|Any CPU.Build.0 = Release|Any CPU
+ {6EAFA7F0-8A82-49E6-B2FA-086C5CAEA95B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {6EAFA7F0-8A82-49E6-B2FA-086C5CAEA95B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {6EAFA7F0-8A82-49E6-B2FA-086C5CAEA95B}.Release|Win32.ActiveCfg = Release|Any CPU
+ {6EAFA7F0-8A82-49E6-B2FA-086C5CAEA95B}.Release|Win32.Build.0 = Release|Any CPU
+ {6EAFA7F0-8A82-49E6-B2FA-086C5CAEA95B}.Release|x64.ActiveCfg = Release|Any CPU
+ {6EAFA7F0-8A82-49E6-B2FA-086C5CAEA95B}.Release|x64.Build.0 = Release|Any CPU
+ {6EAFA7F0-8A82-49E6-B2FA-086C5CAEA95B}.Release|x86.ActiveCfg = Release|Any CPU
+ {6EAFA7F0-8A82-49E6-B2FA-086C5CAEA95B}.Release|x86.Build.0 = Release|Any CPU
+ {9BA471D2-6DB9-4DBF-B3A0-9FB3171F94A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {9BA471D2-6DB9-4DBF-B3A0-9FB3171F94A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {9BA471D2-6DB9-4DBF-B3A0-9FB3171F94A6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {9BA471D2-6DB9-4DBF-B3A0-9FB3171F94A6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {9BA471D2-6DB9-4DBF-B3A0-9FB3171F94A6}.Debug|Win32.ActiveCfg = Debug|Any CPU
+ {9BA471D2-6DB9-4DBF-B3A0-9FB3171F94A6}.Debug|Win32.Build.0 = Debug|Any CPU
+ {9BA471D2-6DB9-4DBF-B3A0-9FB3171F94A6}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {9BA471D2-6DB9-4DBF-B3A0-9FB3171F94A6}.Debug|x64.Build.0 = Debug|Any CPU
+ {9BA471D2-6DB9-4DBF-B3A0-9FB3171F94A6}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {9BA471D2-6DB9-4DBF-B3A0-9FB3171F94A6}.Debug|x86.Build.0 = Debug|Any CPU
+ {9BA471D2-6DB9-4DBF-B3A0-9FB3171F94A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {9BA471D2-6DB9-4DBF-B3A0-9FB3171F94A6}.Release|Any CPU.Build.0 = Release|Any CPU
+ {9BA471D2-6DB9-4DBF-B3A0-9FB3171F94A6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {9BA471D2-6DB9-4DBF-B3A0-9FB3171F94A6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {9BA471D2-6DB9-4DBF-B3A0-9FB3171F94A6}.Release|Win32.ActiveCfg = Release|Any CPU
+ {9BA471D2-6DB9-4DBF-B3A0-9FB3171F94A6}.Release|Win32.Build.0 = Release|Any CPU
+ {9BA471D2-6DB9-4DBF-B3A0-9FB3171F94A6}.Release|x64.ActiveCfg = Release|Any CPU
+ {9BA471D2-6DB9-4DBF-B3A0-9FB3171F94A6}.Release|x64.Build.0 = Release|Any CPU
+ {9BA471D2-6DB9-4DBF-B3A0-9FB3171F94A6}.Release|x86.ActiveCfg = Release|Any CPU
+ {9BA471D2-6DB9-4DBF-B3A0-9FB3171F94A6}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/README.md b/README.md
index 1b7ec512b..f247d95c0 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,10 @@ While our first priority is a stable build, we will eventually add features that
[Feature Requests](http://feathub.com/jellyfin/jellyfin)
+## Contributing to Jellyfin
+
+If you're interested in contributing, please see [CONTRIBUTING.md](https://github.com/jellyfin/jellyfin/blob/master/CONTRIBUTING.md).
+
## Prebuilt Jellyfin packages
Prebuild packages are available for Debian/Ubuntu and Arch, and via Docker Hub.
@@ -25,16 +29,22 @@ The Jellyfin Docker image is available on Docker Hub at https://hub.docker.com/r
The Jellyfin package is in the AUR at https://aur.archlinux.org/packages/jellyfin-git/
+### Unraid
+
+An Unraid Docker template is available. See [this documentation page](https://github.com/jellyfin/jellyfin/blob/master/unRaid/docker-templates/README.md) for details on installing it.
+
### Debian/Ubuntu
-A package repository is available at https://repo.jellyfin.org. To use it:
+A package repository is available at https://repo.jellyfin.org.
-0. Install the `dotnet-runtime-2.1` package via [Microsoft's repositories](https://dotnet.microsoft.com/download/dotnet-core/2.1).
+#### Clean install
+
+0. Install the `dotnet-runtime-2.2` package via [Microsoft's repositories](https://dotnet.microsoft.com/download/dotnet-core/2.2).
0. Import the GPG signing key (signed by Joshua):
```
wget -O - https://repo.jellyfin.org/debian/jellyfin-signing-key-joshua.gpg.key | sudo apt-key add -
```
-0. Add an entry to `/etc/apt/sources.list.d/jellyfin.list` (note that Ubuntu will get `buster` but this should work fine):
+0. Add an entry to `/etc/apt/sources.list.d/jellyfin.list` (note that Ubuntu will get `buster` in the list file, but this should still work fine):
```
echo "deb https://repo.jellyfin.org/debian $( grep -Ewo -m1 --color=none 'jessie|stretch|buster' /etc/os-release || echo buster ) main" | sudo tee /etc/apt/sources.list.d/jellyfin.list
```
@@ -47,6 +57,43 @@ A package repository is available at https://repo.jellyfin.org. To use it:
sudo apt install jellyfin
```
+#### Upgrade from Emby
+
+The following procedure should work to upgrade from Emby to Jellyfin on an existing installation:
+
+0. Upgrade to Emby 3.5.X, preferably 3.5.2, so the database schema is fully up-to-date and consistent. This is somewhat optional but can reduce the risk of obscure bugs later on.
+0. Stop the `emby-server` daemon:
+ ```
+ sudo service emby-server stop
+ ```
+0. Move your existing Emby data directory out of the way:
+ ```
+ sudo mv /var/lib/emby /var/lib/emby.backup
+ ```
+0. Remove the `emby-server` package:
+ ```
+ sudo apt remove emby-server
+ ```
+0. Install the `jellyfin` package using the instructions above, verifying that `/var/lib/emby` is a symlink to `/var/lib/jellyfin`.
+0. Stop the `jellyfin` daemon:
+ ```
+ sudo service jellyfin stop
+ ```
+0. Copy over all the data files from the old backup data directory:
+ ```
+ sudo cp -a /var/lib/emby.backup/* /var/lib/jellyfin/
+ ```
+0. Correct ownership on the new data directory:
+ ```
+ sudo chown -R jellyfin:jellyfin /var/lib/jellyfin
+ ```
+0. Start the `jellyfin` daemon:
+ ```
+ sudo service jellyfin start
+ ```
+
+This same general procedure should apply for upgrades on any other platform as well though the specific commands and/or paths may be different.
+
## Building Jellyfin packages from source
Jellyfin seeks to integrate build facilities for any desired packaging format. Instructions for the various formats can be found below.
@@ -57,17 +104,26 @@ NOTE: When building from source, only cloning the full Git repository is support
Debian build facilities are integrated into the repo at `debian/`.
-1. Install the `dotnet-sdk-2.1` package via [Microsoft's repositories](https://dotnet.microsoft.com/download/dotnet-core/2.1).
-2. Run `dpkg-buildpackage -us -uc`.
-3. Install the resulting `jellyfin_*.deb` file on your system.
+0. Install the `dotnet-sdk-2.2` package via [Microsoft's repositories](https://dotnet.microsoft.com/download/dotnet-core/2.2).
+0. Run `dpkg-buildpackage -us -uc`.
+0. Install the resulting `jellyfin_*.deb` file on your system.
A huge thanks to Carlos Hernandez who created the original Debian build configuration for Emby 3.1.1.
### Windows (64 bit)
+
A pre-built windows installer will be available soon. Until then it isn't too hard to install Jellyfin from Source.
-1. Install the dotnet core SDK 2.1 from [Microsoft's Webpage](https://dotnet.microsoft.com/download/dotnet-core/2.1) and [install Git for Windows](https://gitforwindows.org/)
-2. Clone Jellyfin into a directory of your choice. `git clone https://github.com/jellyfin/jellyfin.git C:\Jellyfin`
-3. From the Jellyfin directory you can use our Jellyfin build script. Call `Build-Jellyfin.ps1 -InstallFFMPEG` from inside the directory in a powershell window. Make sure you've set your executionpolicy to unsrestricted. If you want to optimize for your environment you can use the -WindowsVersion and -Architecture flags to do so, default is generic windows x64. The -InstallLocation flag lets you select where the compiled binaries go, default is `$Env:AppData\JellyFin-Server\` . The -InstallFFMPEG flag will automatically pull the stable FFMPEG binaries appropriate to your architecture (x86/x64 only for now) from [Zeranoe](https://ffmpeg.zeranoe.com/builds/), and then place them in your emby directory.
-4. (Optional) Use [NSSM](https://nssm.cc/) to configure JellyFin to run as a service
-5. Jellyfin is now available in the default directory (or the directory you chose). Assuming you kept the default directory, to start it from a powershell window run, `&"$env:APPDATA\Jellyfin-Server\EmbyServer.exe"`. To start it from CMD run, `%APPDATA%\Jellyfin-Server\EmbyServer.exe` \ No newline at end of file
+0. Install the dotnet core SDK 2.2 from [Microsoft's Webpage](https://dotnet.microsoft.com/download/dotnet-core/2.2) and [install Git for Windows](https://gitforwindows.org/)
+0. Clone Jellyfin into a directory of your choice.
+ ```
+ git clone https://github.com/jellyfin/jellyfin.git C:\Jellyfin
+ ```
+0. From the Jellyfin directory you can use our Jellyfin build script. Call `Build-Jellyfin.ps1 -InstallFFMPEG` from inside the directory in a powershell window. Make sure you've set your executionpolicy to unsrestricted.
+
+ Additional flags:
+ * If you want to optimize for your environment you can use the `-WindowsVersion` and `-Architecture` flags to do so; the default is generic Windows x64.
+ * The `-InstallLocation` flag lets you select where the compiled binaries go; the default is `$Env:AppData\JellyFin-Server\` .
+ * The `-InstallFFMPEG` flag will automatically pull the stable ffmpeg binaries appropriate to your architecture (x86/x64 only for now) from [Zeranoe](https://ffmpeg.zeranoe.com/builds/) and place them in your Jellyfin directory.
+0. (Optional) Use [NSSM](https://nssm.cc/) to configure JellyFin to run as a service
+0. Jellyfin is now available in the default directory (or the directory you chose). Assuming you kept the default directory, to start it from a Powershell window, run, `&"$env:APPDATA\Jellyfin-Server\EmbyServer.exe"`. To start it from CMD, run, `%APPDATA%\Jellyfin-Server\EmbyServer.exe`
diff --git a/debian/changelog b/debian/changelog
index 9199f71fc..e41c6b8e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+jellyfin (3.5.2-1) unstable; urgency=medium
+
+ * Add ffmpeg dependency and cleanup work
+
+ -- Joshua Boniface <joshua@boniface.me> Tue, 11 Dec 2018 20:55:32 -0500
+
jellyfin (3.5.2) unstable; urgency=medium
* Rename from emby-server on version 3.5.2
diff --git a/debian/control b/debian/control
index 7d1e5de38..bc5e05daa 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: misc
Priority: optional
Maintainer: Vasily <just.one.man@yandex.ru>
Build-Depends: debhelper (>= 9),
- dotnet-sdk-2.1,
+ dotnet-sdk-2.2,
libc6-dev
Standards-Version: 3.9.4
@@ -12,6 +12,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: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, at, libsqlite3-0, dotnet-runtime-2.1
+Depends: ${shlibs:Depends}, ${misc:Depends}, at, libsqlite3-0, dotnet-runtime-2.2, ffmpeg
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/rules b/debian/rules
index ef697f173..864b64f6f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,7 @@ CONFIG := Release
TERM := xterm
SHELL := /bin/bash
export DH_VERBOSE=1
+export DOTNET_CLI_TELEMETRY_OPTOUT=1
%:
dh $@
@@ -14,7 +15,6 @@ override_dh_auto_test:
override_dh_clistrip:
override_dh_auto_build:
- git submodule update --init
dotnet build --configuration $(CONFIG) $(CURDIR)/MediaBrowser.sln --output='$(CURDIR)/usr/lib/jellyfin/bin'
dotnet publish --configuration $(CONFIG) $(CURDIR)/MediaBrowser.sln --output='$(CURDIR)/usr/lib/jellyfin/bin'