aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Rabert <6550543+nvllsvm@users.noreply.github.com>2018-12-11 21:56:07 -0500
committerGitHub <noreply@github.com>2018-12-11 21:56:07 -0500
commitdc2c27f9cc31483fa5f898a606a3547fc0749068 (patch)
tree38c2b5319bdad834a519e9b62388f31b85d68b86
parent1bb90e013577764ea0d81e03fd42bb31832a26cc (diff)
parent2a52c50451e1c1fb71c89a91fb31d7a31c050fec (diff)
Merge pull request #71 from joshuaboniface/debian-ffmpeg
Add ffmpeg dependency and bump package version
-rw-r--r--debian/changelog6
-rw-r--r--debian/control2
2 files changed, 7 insertions, 1 deletions
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..41a491c08 100644
--- a/debian/control
+++ b/debian/control
@@ -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.1, 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.