aboutsummaryrefslogtreecommitdiff
path: root/deployment
diff options
context:
space:
mode:
Diffstat (limited to 'deployment')
-rw-r--r--deployment/debian-package-x64/pkg-src/changelog9
-rw-r--r--deployment/debian-package-x64/pkg-src/control7
-rw-r--r--deployment/fedora-package-x64/pkg-src/jellyfin.spec10
3 files changed, 14 insertions, 12 deletions
diff --git a/deployment/debian-package-x64/pkg-src/changelog b/deployment/debian-package-x64/pkg-src/changelog
index a4b55a4ec..e3cbcc849 100644
--- a/deployment/debian-package-x64/pkg-src/changelog
+++ b/deployment/debian-package-x64/pkg-src/changelog
@@ -1,4 +1,4 @@
-jellyfin (10.2.0~rc2) unstable; urgency=medium
+jellyfin (10.2.0-1) unstable; urgency=medium
* jellyfin:
* PR452 Use EF Core for Activity database
@@ -75,10 +75,9 @@ jellyfin (10.2.0~rc2) unstable; urgency=medium
* PR869: Remove DLL support and require all packages/plugins to be zip archives
* PR872: Fix potential NullReferenceException
* PR890: Drop ETag and use Last-Modified header
+ * PR892: Add jellyfin-ffmpeg and versioning to package deps
+ * PR901: Properly dispose HttpWebResponse when the request failed to avoid 'too many open files'
* jellyfin-web:
- * PR24 Add Master codeowners
- * PR34 Revert "Add Master codeowners"
- * PR49 Release 10.1.0
* PR51 remove more code for sync and camera roll
* PR56 Use English for fallback translations and clean up language files
* PR58 Css slider fixes
@@ -102,7 +101,7 @@ jellyfin (10.2.0~rc2) unstable; urgency=medium
* PR127 Change sharedcomponents module to core
* PR135 Make sure fallback culture is always available
- -- Jellyfin Packaging Team <packaging@jellyfin.org> Sun, 13 Feb 2019 01:03:20 -0500
+ -- Jellyfin Packaging Team <packaging@jellyfin.org> Fri, 15 Feb 2019 20:51:25 -0500
jellyfin (10.1.0-1) unstable; urgency=medium
diff --git a/deployment/debian-package-x64/pkg-src/control b/deployment/debian-package-x64/pkg-src/control
index 74bebeaf1..88d10438b 100644
--- a/deployment/debian-package-x64/pkg-src/control
+++ b/deployment/debian-package-x64/pkg-src/control
@@ -18,6 +18,11 @@ 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: at, libsqlite3-0, ffmpeg, libfontconfig1, libfreetype6, libssl1.0.0 | libssl1.0.2
+Depends: at,
+ libsqlite3-0,
+ ffmpeg (<7:4.1) | jellyfin-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/deployment/fedora-package-x64/pkg-src/jellyfin.spec b/deployment/fedora-package-x64/pkg-src/jellyfin.spec
index 03fc0b6ff..a017fcd8e 100644
--- a/deployment/fedora-package-x64/pkg-src/jellyfin.spec
+++ b/deployment/fedora-package-x64/pkg-src/jellyfin.spec
@@ -8,7 +8,7 @@
Name: jellyfin
Version: 10.2.0
-Release: rc2%{?dist}
+Release: 1%{?dist}
Summary: The Free Software Media Browser
License: GPLv2
URL: https://jellyfin.media
@@ -140,11 +140,10 @@ fi
%systemd_postun_with_restart jellyfin.service
%changelog
-* Wed Feb 13 2019 Jellyfin Packaging Team <packaging@jellyfin.org>
+* Fri Feb 15 2019 Jellyfin Packaging Team <packaging@jellyfin.org>
- jellyfin:
- PR452 Use EF Core for Activity database
- PR535 Clean up streambuilder
-- PR651 Release 10.1.0
- PR655 Support trying local branches in submodule
- PR656 Do some logging in MediaInfoService
- PR657 Remove conditions that are always true/false
@@ -216,10 +215,9 @@ fi
- PR869 Remove DLL support and require all packages/plugins to be zip archives
- PR872 Fix potential NullReferenceException
- PR890 Drop ETag and use Last-Modified header
+- PR892: Add jellyfin-ffmpeg and versioning to package deps
+- PR901: Properly dispose HttpWebResponse when the request failed to avoid 'too many open files'
- jellyfin-web:
-- PR24 Add Master codeowners
-- PR34 Revert "Add Master codeowners"
-- PR49 Release 10.1.0
- PR51 remove more code for sync and camera roll
- PR56 Use English for fallback translations and clean up language files
- PR58 Css slider fixes