From 855911333a76999ede37fca5b720b85143e01d3c Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Thu, 6 Jun 2019 22:45:37 -0400
Subject: Bump version for 10.3.4

---
 deployment/debian-package-x64/pkg-src/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'deployment/debian-package-x64/pkg-src')

diff --git a/deployment/debian-package-x64/pkg-src/changelog b/deployment/debian-package-x64/pkg-src/changelog
index a47f7e8410..a6cab4cc2b 100644
--- a/deployment/debian-package-x64/pkg-src/changelog
+++ b/deployment/debian-package-x64/pkg-src/changelog
@@ -1,3 +1,9 @@
+jellyfin (10.3.4-1) unstable; urgency=medium
+
+  * New upstream version 10.3.4; release changelog at https://github.com/jellyfin/jellyfin/releases/tag/v10.3.4
+
+ -- Jellyfin Packaging Team <packaging@jellyfin.org>  Thu, 06 Jun 2019 22:45:31 -0400
+
 jellyfin (10.3.3-1) unstable; urgency=medium
 
   * New upstream version 10.3.3; release changelog at https://github.com/jellyfin/jellyfin/releases/tag/v10.3.3
-- 
cgit v1.2.3


From cb07822aa33fd76461be4c5b1443c1ca47c44057 Mon Sep 17 00:00:00 2001
From: Bond-009 <bond.009@outlook.com>
Date: Wed, 17 Apr 2019 15:16:34 +0200
Subject: Add execute permissions back

---
 deployment/centos-package-x64/clean.sh               | 0
 deployment/centos-package-x64/docker-build.sh        | 0
 deployment/centos-package-x64/package.sh             | 0
 deployment/common.build.sh                           | 0
 deployment/debian-package-armhf/clean.sh             | 0
 deployment/debian-package-armhf/docker-build.sh      | 0
 deployment/debian-package-armhf/package.sh           | 0
 deployment/debian-package-x64/clean.sh               | 0
 deployment/debian-package-x64/docker-build.sh        | 0
 deployment/debian-package-x64/package.sh             | 0
 deployment/debian-package-x64/pkg-src/bin/restart.sh | 0
 deployment/docker/build.sh                           | 0
 deployment/docker/package.sh                         | 0
 deployment/fedora-package-x64/clean.sh               | 0
 deployment/fedora-package-x64/create_tarball.sh      | 0
 deployment/fedora-package-x64/docker-build.sh        | 0
 deployment/fedora-package-x64/package.sh             | 0
 deployment/fedora-package-x64/pkg-src/restart.sh     | 0
 deployment/linux-x64/build.sh                        | 0
 deployment/linux-x64/clean.sh                        | 0
 deployment/linux-x64/package.sh                      | 0
 deployment/macos/build.sh                            | 0
 deployment/macos/clean.sh                            | 0
 deployment/macos/package.sh                          | 0
 deployment/portable/build.sh                         | 0
 deployment/portable/clean.sh                         | 0
 deployment/portable/package.sh                       | 0
 deployment/ubuntu-package-x64/clean.sh               | 0
 deployment/ubuntu-package-x64/docker-build.sh        | 0
 deployment/ubuntu-package-x64/package.sh             | 0
 deployment/win-x64/build.sh                          | 0
 deployment/win-x64/clean.sh                          | 0
 deployment/win-x64/package.sh                        | 0
 deployment/win-x86/build.sh                          | 0
 deployment/win-x86/clean.sh                          | 0
 deployment/win-x86/package.sh                        | 0
 36 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 deployment/centos-package-x64/clean.sh
 mode change 100644 => 100755 deployment/centos-package-x64/docker-build.sh
 mode change 100644 => 100755 deployment/centos-package-x64/package.sh
 mode change 100644 => 100755 deployment/common.build.sh
 mode change 100644 => 100755 deployment/debian-package-armhf/clean.sh
 mode change 100644 => 100755 deployment/debian-package-armhf/docker-build.sh
 mode change 100644 => 100755 deployment/debian-package-armhf/package.sh
 mode change 100644 => 100755 deployment/debian-package-x64/clean.sh
 mode change 100644 => 100755 deployment/debian-package-x64/docker-build.sh
 mode change 100644 => 100755 deployment/debian-package-x64/package.sh
 mode change 100644 => 100755 deployment/debian-package-x64/pkg-src/bin/restart.sh
 mode change 100644 => 100755 deployment/docker/build.sh
 mode change 100644 => 100755 deployment/docker/package.sh
 mode change 100644 => 100755 deployment/fedora-package-x64/clean.sh
 mode change 100644 => 100755 deployment/fedora-package-x64/create_tarball.sh
 mode change 100644 => 100755 deployment/fedora-package-x64/docker-build.sh
 mode change 100644 => 100755 deployment/fedora-package-x64/package.sh
 mode change 100644 => 100755 deployment/fedora-package-x64/pkg-src/restart.sh
 mode change 100644 => 100755 deployment/linux-x64/build.sh
 mode change 100644 => 100755 deployment/linux-x64/clean.sh
 mode change 100644 => 100755 deployment/linux-x64/package.sh
 mode change 100644 => 100755 deployment/macos/build.sh
 mode change 100644 => 100755 deployment/macos/clean.sh
 mode change 100644 => 100755 deployment/macos/package.sh
 mode change 100644 => 100755 deployment/portable/build.sh
 mode change 100644 => 100755 deployment/portable/clean.sh
 mode change 100644 => 100755 deployment/portable/package.sh
 mode change 100644 => 100755 deployment/ubuntu-package-x64/clean.sh
 mode change 100644 => 100755 deployment/ubuntu-package-x64/docker-build.sh
 mode change 100644 => 100755 deployment/ubuntu-package-x64/package.sh
 mode change 100644 => 100755 deployment/win-x64/build.sh
 mode change 100644 => 100755 deployment/win-x64/clean.sh
 mode change 100644 => 100755 deployment/win-x64/package.sh
 mode change 100644 => 100755 deployment/win-x86/build.sh
 mode change 100644 => 100755 deployment/win-x86/clean.sh
 mode change 100644 => 100755 deployment/win-x86/package.sh

(limited to 'deployment/debian-package-x64/pkg-src')

diff --git a/deployment/centos-package-x64/clean.sh b/deployment/centos-package-x64/clean.sh
old mode 100644
new mode 100755
diff --git a/deployment/centos-package-x64/docker-build.sh b/deployment/centos-package-x64/docker-build.sh
old mode 100644
new mode 100755
diff --git a/deployment/centos-package-x64/package.sh b/deployment/centos-package-x64/package.sh
old mode 100644
new mode 100755
diff --git a/deployment/common.build.sh b/deployment/common.build.sh
old mode 100644
new mode 100755
diff --git a/deployment/debian-package-armhf/clean.sh b/deployment/debian-package-armhf/clean.sh
old mode 100644
new mode 100755
diff --git a/deployment/debian-package-armhf/docker-build.sh b/deployment/debian-package-armhf/docker-build.sh
old mode 100644
new mode 100755
diff --git a/deployment/debian-package-armhf/package.sh b/deployment/debian-package-armhf/package.sh
old mode 100644
new mode 100755
diff --git a/deployment/debian-package-x64/clean.sh b/deployment/debian-package-x64/clean.sh
old mode 100644
new mode 100755
diff --git a/deployment/debian-package-x64/docker-build.sh b/deployment/debian-package-x64/docker-build.sh
old mode 100644
new mode 100755
diff --git a/deployment/debian-package-x64/package.sh b/deployment/debian-package-x64/package.sh
old mode 100644
new mode 100755
diff --git a/deployment/debian-package-x64/pkg-src/bin/restart.sh b/deployment/debian-package-x64/pkg-src/bin/restart.sh
old mode 100644
new mode 100755
diff --git a/deployment/docker/build.sh b/deployment/docker/build.sh
old mode 100644
new mode 100755
diff --git a/deployment/docker/package.sh b/deployment/docker/package.sh
old mode 100644
new mode 100755
diff --git a/deployment/fedora-package-x64/clean.sh b/deployment/fedora-package-x64/clean.sh
old mode 100644
new mode 100755
diff --git a/deployment/fedora-package-x64/create_tarball.sh b/deployment/fedora-package-x64/create_tarball.sh
old mode 100644
new mode 100755
diff --git a/deployment/fedora-package-x64/docker-build.sh b/deployment/fedora-package-x64/docker-build.sh
old mode 100644
new mode 100755
diff --git a/deployment/fedora-package-x64/package.sh b/deployment/fedora-package-x64/package.sh
old mode 100644
new mode 100755
diff --git a/deployment/fedora-package-x64/pkg-src/restart.sh b/deployment/fedora-package-x64/pkg-src/restart.sh
old mode 100644
new mode 100755
diff --git a/deployment/linux-x64/build.sh b/deployment/linux-x64/build.sh
old mode 100644
new mode 100755
diff --git a/deployment/linux-x64/clean.sh b/deployment/linux-x64/clean.sh
old mode 100644
new mode 100755
diff --git a/deployment/linux-x64/package.sh b/deployment/linux-x64/package.sh
old mode 100644
new mode 100755
diff --git a/deployment/macos/build.sh b/deployment/macos/build.sh
old mode 100644
new mode 100755
diff --git a/deployment/macos/clean.sh b/deployment/macos/clean.sh
old mode 100644
new mode 100755
diff --git a/deployment/macos/package.sh b/deployment/macos/package.sh
old mode 100644
new mode 100755
diff --git a/deployment/portable/build.sh b/deployment/portable/build.sh
old mode 100644
new mode 100755
diff --git a/deployment/portable/clean.sh b/deployment/portable/clean.sh
old mode 100644
new mode 100755
diff --git a/deployment/portable/package.sh b/deployment/portable/package.sh
old mode 100644
new mode 100755
diff --git a/deployment/ubuntu-package-x64/clean.sh b/deployment/ubuntu-package-x64/clean.sh
old mode 100644
new mode 100755
diff --git a/deployment/ubuntu-package-x64/docker-build.sh b/deployment/ubuntu-package-x64/docker-build.sh
old mode 100644
new mode 100755
diff --git a/deployment/ubuntu-package-x64/package.sh b/deployment/ubuntu-package-x64/package.sh
old mode 100644
new mode 100755
diff --git a/deployment/win-x64/build.sh b/deployment/win-x64/build.sh
old mode 100644
new mode 100755
diff --git a/deployment/win-x64/clean.sh b/deployment/win-x64/clean.sh
old mode 100644
new mode 100755
diff --git a/deployment/win-x64/package.sh b/deployment/win-x64/package.sh
old mode 100644
new mode 100755
diff --git a/deployment/win-x86/build.sh b/deployment/win-x86/build.sh
old mode 100644
new mode 100755
diff --git a/deployment/win-x86/clean.sh b/deployment/win-x86/clean.sh
old mode 100644
new mode 100755
diff --git a/deployment/win-x86/package.sh b/deployment/win-x86/package.sh
old mode 100644
new mode 100755
-- 
cgit v1.2.3


From d5fe82314e11d3b8b2ba58e4684a7968fbe6dbca Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Sun, 9 Jun 2019 21:47:45 -0400
Subject: Bump version for 10.3.5

---
 Dockerfile                                          | 2 +-
 Dockerfile.arm                                      | 2 +-
 Dockerfile.arm64                                    | 2 +-
 SharedVersion.cs                                    | 4 ++--
 build.yaml                                          | 2 +-
 deployment/debian-package-x64/pkg-src/changelog     | 6 ++++++
 deployment/fedora-package-x64/pkg-src/jellyfin.spec | 4 +++-
 7 files changed, 15 insertions(+), 7 deletions(-)

(limited to 'deployment/debian-package-x64/pkg-src')

diff --git a/Dockerfile b/Dockerfile
index be01640f83..c971f1cc13 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,7 +21,7 @@ RUN apt-get update \
 COPY --from=ffmpeg / /
 COPY --from=builder /jellyfin /jellyfin
 
-ARG JELLYFIN_WEB_VERSION=10.3.4
+ARG JELLYFIN_WEB_VERSION=10.3.5
 RUN curl -L https://github.com/jellyfin/jellyfin-web/archive/v${JELLYFIN_WEB_VERSION}.tar.gz | tar zxf - \
  && rm -rf /jellyfin/jellyfin-web \
  && mv jellyfin-web-${JELLYFIN_WEB_VERSION} /jellyfin/jellyfin-web
diff --git a/Dockerfile.arm b/Dockerfile.arm
index 972825f3ce..4847c726be 100644
--- a/Dockerfile.arm
+++ b/Dockerfile.arm
@@ -26,7 +26,7 @@ RUN apt-get update \
  && chmod 777 /cache /config /media
 COPY --from=builder /jellyfin /jellyfin
 
-ARG JELLYFIN_WEB_VERSION=10.3.4
+ARG JELLYFIN_WEB_VERSION=10.3.5
 RUN curl -L https://github.com/jellyfin/jellyfin-web/archive/v${JELLYFIN_WEB_VERSION}.tar.gz | tar zxf - \
  && rm -rf /jellyfin/jellyfin-web \
  && mv jellyfin-web-${JELLYFIN_WEB_VERSION} /jellyfin/jellyfin-web
diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
index 5ee0eaf5b9..a26cfc7b3b 100644
--- a/Dockerfile.arm64
+++ b/Dockerfile.arm64
@@ -26,7 +26,7 @@ RUN apt-get update \
  && chmod 777 /cache /config /media
 COPY --from=builder /jellyfin /jellyfin
 
-ARG JELLYFIN_WEB_VERSION=10.3.4
+ARG JELLYFIN_WEB_VERSION=10.3.5
 RUN curl -L https://github.com/jellyfin/jellyfin-web/archive/v${JELLYFIN_WEB_VERSION}.tar.gz | tar zxf - \
  && rm -rf /jellyfin/jellyfin-web \
  && mv jellyfin-web-${JELLYFIN_WEB_VERSION} /jellyfin/jellyfin-web
diff --git a/SharedVersion.cs b/SharedVersion.cs
index 3a8a0aef46..27ba1cf2cb 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("10.3.4")]
-[assembly: AssemblyFileVersion("10.3.4")]
+[assembly: AssemblyVersion("10.3.5")]
+[assembly: AssemblyFileVersion("10.3.5")]
diff --git a/build.yaml b/build.yaml
index 688ba4ca09..cb010ed597 100644
--- a/build.yaml
+++ b/build.yaml
@@ -1,7 +1,7 @@
 ---
 # We just wrap `build` so this is really it
 name: "jellyfin"
-version: "10.3.4"
+version: "10.3.5"
 packages:
   - debian-package-x64
   - debian-package-armhf
diff --git a/deployment/debian-package-x64/pkg-src/changelog b/deployment/debian-package-x64/pkg-src/changelog
index a6cab4cc2b..94d0c87dfc 100644
--- a/deployment/debian-package-x64/pkg-src/changelog
+++ b/deployment/debian-package-x64/pkg-src/changelog
@@ -1,3 +1,9 @@
+jellyfin (10.3.5-1) unstable; urgency=medium
+
+  * New upstream version 10.3.5; release changelog at https://github.com/jellyfin/jellyfin/releases/tag/v10.3.5
+
+ -- Jellyfin Packaging Team <packaging@jellyfin.org>  Sun, 09 Jun 2019 21:47:35 -0400
+
 jellyfin (10.3.4-1) unstable; urgency=medium
 
   * New upstream version 10.3.4; release changelog at https://github.com/jellyfin/jellyfin/releases/tag/v10.3.4
diff --git a/deployment/fedora-package-x64/pkg-src/jellyfin.spec b/deployment/fedora-package-x64/pkg-src/jellyfin.spec
index 5294ebfca9..aeea7ecd00 100644
--- a/deployment/fedora-package-x64/pkg-src/jellyfin.spec
+++ b/deployment/fedora-package-x64/pkg-src/jellyfin.spec
@@ -7,7 +7,7 @@
 %endif
 
 Name:           jellyfin
-Version:        10.3.4
+Version:        10.3.5
 Release:        1%{?dist}
 Summary:        The Free Software Media Browser
 License:        GPLv2
@@ -140,6 +140,8 @@ fi
 %systemd_postun_with_restart jellyfin.service
 
 %changelog
+* Sun Jun 09 2019 Jellyfin Packaging Team <packaging@jellyfin.org>
+- New upstream version 10.3.5; release changelog at https://github.com/jellyfin/jellyfin/releases/tag/v10.3.5
 * Thu Jun 06 2019 Jellyfin Packaging Team <packaging@jellyfin.org>
 - New upstream version 10.3.4; release changelog at https://github.com/jellyfin/jellyfin/releases/tag/v10.3.4
 * Fri May 17 2019 Jellyfin Packaging Team <packaging@jellyfin.org>
-- 
cgit v1.2.3


From c08c0272b5c801fecbb13b146b9e24429aa6df62 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Thu, 27 Jun 2019 18:05:03 -0400
Subject: Add nicer restart script

The old restart script was buggy, as reported in #1320. This updated
script seems to work far more reliably and conforms to the existing
jellyfin-sudoers packages sudo configuration.
---
 .../debian-package-x64/pkg-src/bin/restart.sh      | 48 ++++++++++++++--------
 deployment/fedora-package-x64/pkg-src/restart.sh   | 40 +++++++++++++++---
 2 files changed, 67 insertions(+), 21 deletions(-)

(limited to 'deployment/debian-package-x64/pkg-src')

diff --git a/deployment/debian-package-x64/pkg-src/bin/restart.sh b/deployment/debian-package-x64/pkg-src/bin/restart.sh
index 738f86727c..acfb0c5a25 100644
--- a/deployment/debian-package-x64/pkg-src/bin/restart.sh
+++ b/deployment/debian-package-x64/pkg-src/bin/restart.sh
@@ -1,20 +1,36 @@
 #!/bin/bash
 
-NAME=jellyfin
+# restart.sh - Jellyfin server restart script
+# Part of the Jellyfin project (https://github.com/jellyfin)
+#
+# This script restarts the Jellyfin daemon on Linux when using
+# the Restart button on the admin dashboard. It supports the
+# systemctl, service, and traditional /etc/init.d (sysv) restart
+# methods, chosen automatically by which one is found first (in
+# that order).
+#
+# This script is used by the Debian/Ubuntu/Fedora/CentOS packages.
 
-restart_cmds=(
-  "systemctl restart ${NAME}"
-  "service ${NAME} restart"
-  "/etc/init.d/${NAME} restart"
-  "s6-svc -t /var/run/s6/services/${NAME}"
-)
+get_service_command() {
+    for command in systemctl service; do
+        if which $command &>/dev/null; then
+            echo $command && return
+        fi
+    done
+    echo "sysv"
+}
 
-for restart_cmd in "${restart_cmds[@]}"; do
-  cmd=$(echo "$restart_cmd" | awk '{print $1}')
-  cmd_loc=$(command -v ${cmd})
-  if [[ -n "$cmd_loc" ]]; then
-    restart_cmd=$(echo "$restart_cmd" | sed -e "s%${cmd}%${cmd_loc}%")
-    echo "sleep 2; sudo $restart_cmd > /dev/null 2>&1" | at now > /dev/null 2>&1
-    exit 0
-  fi
-done
+cmd="$( get_service_command )"
+echo "Using system control command '$cmd' to restart Jellyfin..."
+case $cmd in
+    'systemctl')
+        echo "sleep 2; /usr/bin/sudo /usr/bin/systemctl restart jellyfin" | at now 
+        ;;
+    'service')
+        echo "sleep 2; /usr/bin/sudo /sbin/service jellyfin restart" | at now 
+        ;;
+    'sysv')
+        echo "sleep 2; /usr/bin/sudo /etc/init.d/jellyfin restart" | at now 
+        ;;
+esac
+exit 0
diff --git a/deployment/fedora-package-x64/pkg-src/restart.sh b/deployment/fedora-package-x64/pkg-src/restart.sh
index e84dca587f..acfb0c5a25 100644
--- a/deployment/fedora-package-x64/pkg-src/restart.sh
+++ b/deployment/fedora-package-x64/pkg-src/restart.sh
@@ -1,6 +1,36 @@
-#!/bin/sh
+#!/bin/bash
 
-NAME=jellyfin
-restart_cmd="/usr/bin/systemctl restart ${NAME}"
-echo "sleep 2; sudo $restart_cmd > /dev/null 2>&1" | at now > /dev/null 2>&1
-exit 0
\ No newline at end of file
+# restart.sh - Jellyfin server restart script
+# Part of the Jellyfin project (https://github.com/jellyfin)
+#
+# This script restarts the Jellyfin daemon on Linux when using
+# the Restart button on the admin dashboard. It supports the
+# systemctl, service, and traditional /etc/init.d (sysv) restart
+# methods, chosen automatically by which one is found first (in
+# that order).
+#
+# This script is used by the Debian/Ubuntu/Fedora/CentOS packages.
+
+get_service_command() {
+    for command in systemctl service; do
+        if which $command &>/dev/null; then
+            echo $command && return
+        fi
+    done
+    echo "sysv"
+}
+
+cmd="$( get_service_command )"
+echo "Using system control command '$cmd' to restart Jellyfin..."
+case $cmd in
+    'systemctl')
+        echo "sleep 2; /usr/bin/sudo /usr/bin/systemctl restart jellyfin" | at now 
+        ;;
+    'service')
+        echo "sleep 2; /usr/bin/sudo /sbin/service jellyfin restart" | at now 
+        ;;
+    'sysv')
+        echo "sleep 2; /usr/bin/sudo /etc/init.d/jellyfin restart" | at now 
+        ;;
+esac
+exit 0
-- 
cgit v1.2.3


From a629f209b931e37a2e3e5db5ee9827460e5f3bbf Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Fri, 28 Jun 2019 11:06:55 -0400
Subject: Make message wording more consistent

---
 deployment/debian-package-x64/pkg-src/bin/restart.sh | 2 +-
 deployment/fedora-package-x64/pkg-src/restart.sh     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'deployment/debian-package-x64/pkg-src')

diff --git a/deployment/debian-package-x64/pkg-src/bin/restart.sh b/deployment/debian-package-x64/pkg-src/bin/restart.sh
index acfb0c5a25..4c664d404e 100644
--- a/deployment/debian-package-x64/pkg-src/bin/restart.sh
+++ b/deployment/debian-package-x64/pkg-src/bin/restart.sh
@@ -21,7 +21,7 @@ get_service_command() {
 }
 
 cmd="$( get_service_command )"
-echo "Using system control command '$cmd' to restart Jellyfin..."
+echo "Detected service control platform '$cmd'; using it to restart Jellyfin..."
 case $cmd in
     'systemctl')
         echo "sleep 2; /usr/bin/sudo /usr/bin/systemctl restart jellyfin" | at now 
diff --git a/deployment/fedora-package-x64/pkg-src/restart.sh b/deployment/fedora-package-x64/pkg-src/restart.sh
index acfb0c5a25..4c664d404e 100644
--- a/deployment/fedora-package-x64/pkg-src/restart.sh
+++ b/deployment/fedora-package-x64/pkg-src/restart.sh
@@ -21,7 +21,7 @@ get_service_command() {
 }
 
 cmd="$( get_service_command )"
-echo "Using system control command '$cmd' to restart Jellyfin..."
+echo "Detected service control platform '$cmd'; using it to restart Jellyfin..."
 case $cmd in
     'systemctl')
         echo "sleep 2; /usr/bin/sudo /usr/bin/systemctl restart jellyfin" | at now 
-- 
cgit v1.2.3


From 62105c249f59e4343a8db2ff6d2cb8af809745d5 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Fri, 28 Jun 2019 11:15:08 -0400
Subject: Use which to find the service binary path

---
 deployment/debian-package-x64/pkg-src/bin/restart.sh | 4 ++--
 deployment/fedora-package-x64/pkg-src/restart.sh     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'deployment/debian-package-x64/pkg-src')

diff --git a/deployment/debian-package-x64/pkg-src/bin/restart.sh b/deployment/debian-package-x64/pkg-src/bin/restart.sh
index 4c664d404e..9b64b6d728 100644
--- a/deployment/debian-package-x64/pkg-src/bin/restart.sh
+++ b/deployment/debian-package-x64/pkg-src/bin/restart.sh
@@ -24,10 +24,10 @@ cmd="$( get_service_command )"
 echo "Detected service control platform '$cmd'; using it to restart Jellyfin..."
 case $cmd in
     'systemctl')
-        echo "sleep 2; /usr/bin/sudo /usr/bin/systemctl restart jellyfin" | at now 
+        echo "sleep 2; /usr/bin/sudo $( which systemctl ) restart jellyfin" | at now 
         ;;
     'service')
-        echo "sleep 2; /usr/bin/sudo /sbin/service jellyfin restart" | at now 
+        echo "sleep 2; /usr/bin/sudo $( which service ) jellyfin restart" | at now 
         ;;
     'sysv')
         echo "sleep 2; /usr/bin/sudo /etc/init.d/jellyfin restart" | at now 
diff --git a/deployment/fedora-package-x64/pkg-src/restart.sh b/deployment/fedora-package-x64/pkg-src/restart.sh
index 4c664d404e..9b64b6d728 100644
--- a/deployment/fedora-package-x64/pkg-src/restart.sh
+++ b/deployment/fedora-package-x64/pkg-src/restart.sh
@@ -24,10 +24,10 @@ cmd="$( get_service_command )"
 echo "Detected service control platform '$cmd'; using it to restart Jellyfin..."
 case $cmd in
     'systemctl')
-        echo "sleep 2; /usr/bin/sudo /usr/bin/systemctl restart jellyfin" | at now 
+        echo "sleep 2; /usr/bin/sudo $( which systemctl ) restart jellyfin" | at now 
         ;;
     'service')
-        echo "sleep 2; /usr/bin/sudo /sbin/service jellyfin restart" | at now 
+        echo "sleep 2; /usr/bin/sudo $( which service ) jellyfin restart" | at now 
         ;;
     'sysv')
         echo "sleep 2; /usr/bin/sudo /etc/init.d/jellyfin restart" | at now 
-- 
cgit v1.2.3


From b3f9d045012310216aca5bbf70f3bcc8c36febc9 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Sat, 6 Jul 2019 13:34:38 -0400
Subject: Bump version for 10.3.6

---
 Dockerfile                                          | 2 +-
 Dockerfile.arm                                      | 2 +-
 Dockerfile.arm64                                    | 2 +-
 MediaBrowser.WebDashboard/jellyfin-web              | 2 +-
 SharedVersion.cs                                    | 4 ++--
 build.yaml                                          | 2 +-
 deployment/debian-package-x64/pkg-src/changelog     | 6 ++++++
 deployment/fedora-package-x64/pkg-src/jellyfin.spec | 4 +++-
 8 files changed, 16 insertions(+), 8 deletions(-)

(limited to 'deployment/debian-package-x64/pkg-src')

diff --git a/Dockerfile b/Dockerfile
index c971f1cc13..864cfa445b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,7 +21,7 @@ RUN apt-get update \
 COPY --from=ffmpeg / /
 COPY --from=builder /jellyfin /jellyfin
 
-ARG JELLYFIN_WEB_VERSION=10.3.5
+ARG JELLYFIN_WEB_VERSION=10.3.6
 RUN curl -L https://github.com/jellyfin/jellyfin-web/archive/v${JELLYFIN_WEB_VERSION}.tar.gz | tar zxf - \
  && rm -rf /jellyfin/jellyfin-web \
  && mv jellyfin-web-${JELLYFIN_WEB_VERSION} /jellyfin/jellyfin-web
diff --git a/Dockerfile.arm b/Dockerfile.arm
index 4847c726be..8167390632 100644
--- a/Dockerfile.arm
+++ b/Dockerfile.arm
@@ -26,7 +26,7 @@ RUN apt-get update \
  && chmod 777 /cache /config /media
 COPY --from=builder /jellyfin /jellyfin
 
-ARG JELLYFIN_WEB_VERSION=10.3.5
+ARG JELLYFIN_WEB_VERSION=10.3.6
 RUN curl -L https://github.com/jellyfin/jellyfin-web/archive/v${JELLYFIN_WEB_VERSION}.tar.gz | tar zxf - \
  && rm -rf /jellyfin/jellyfin-web \
  && mv jellyfin-web-${JELLYFIN_WEB_VERSION} /jellyfin/jellyfin-web
diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
index a26cfc7b3b..1843f7224b 100644
--- a/Dockerfile.arm64
+++ b/Dockerfile.arm64
@@ -26,7 +26,7 @@ RUN apt-get update \
  && chmod 777 /cache /config /media
 COPY --from=builder /jellyfin /jellyfin
 
-ARG JELLYFIN_WEB_VERSION=10.3.5
+ARG JELLYFIN_WEB_VERSION=10.3.6
 RUN curl -L https://github.com/jellyfin/jellyfin-web/archive/v${JELLYFIN_WEB_VERSION}.tar.gz | tar zxf - \
  && rm -rf /jellyfin/jellyfin-web \
  && mv jellyfin-web-${JELLYFIN_WEB_VERSION} /jellyfin/jellyfin-web
diff --git a/MediaBrowser.WebDashboard/jellyfin-web b/MediaBrowser.WebDashboard/jellyfin-web
index 37636dae5c..c9e70d9564 160000
--- a/MediaBrowser.WebDashboard/jellyfin-web
+++ b/MediaBrowser.WebDashboard/jellyfin-web
@@ -1 +1 @@
-Subproject commit 37636dae5c6c0b0711dfc7612f843b864dd59469
+Subproject commit c9e70d95643e84437189dd500b0380ec0fbbf659
diff --git a/SharedVersion.cs b/SharedVersion.cs
index 27ba1cf2cb..1e74d8f7d6 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("10.3.5")]
-[assembly: AssemblyFileVersion("10.3.5")]
+[assembly: AssemblyVersion("10.3.6")]
+[assembly: AssemblyFileVersion("10.3.6")]
diff --git a/build.yaml b/build.yaml
index cb010ed597..7a5e66b112 100644
--- a/build.yaml
+++ b/build.yaml
@@ -1,7 +1,7 @@
 ---
 # We just wrap `build` so this is really it
 name: "jellyfin"
-version: "10.3.5"
+version: "10.3.6"
 packages:
   - debian-package-x64
   - debian-package-armhf
diff --git a/deployment/debian-package-x64/pkg-src/changelog b/deployment/debian-package-x64/pkg-src/changelog
index 94d0c87dfc..64912a11d1 100644
--- a/deployment/debian-package-x64/pkg-src/changelog
+++ b/deployment/debian-package-x64/pkg-src/changelog
@@ -1,3 +1,9 @@
+jellyfin (10.3.6-1) unstable; urgency=medium
+
+  * New upstream version 10.3.6; release changelog at https://github.com/jellyfin/jellyfin/releases/tag/v10.3.6
+
+ -- Jellyfin Packaging Team <packaging@jellyfin.org>  Sat, 06 Jul 2019 13:34:19 -0400
+
 jellyfin (10.3.5-1) unstable; urgency=medium
 
   * New upstream version 10.3.5; release changelog at https://github.com/jellyfin/jellyfin/releases/tag/v10.3.5
diff --git a/deployment/fedora-package-x64/pkg-src/jellyfin.spec b/deployment/fedora-package-x64/pkg-src/jellyfin.spec
index aeea7ecd00..809bde39d6 100644
--- a/deployment/fedora-package-x64/pkg-src/jellyfin.spec
+++ b/deployment/fedora-package-x64/pkg-src/jellyfin.spec
@@ -7,7 +7,7 @@
 %endif
 
 Name:           jellyfin
-Version:        10.3.5
+Version:        10.3.6
 Release:        1%{?dist}
 Summary:        The Free Software Media Browser
 License:        GPLv2
@@ -140,6 +140,8 @@ fi
 %systemd_postun_with_restart jellyfin.service
 
 %changelog
+* Sat Jul 06 2019 Jellyfin Packaging Team <packaging@jellyfin.org>
+- New upstream version 10.3.6; release changelog at https://github.com/jellyfin/jellyfin/releases/tag/v10.3.6
 * Sun Jun 09 2019 Jellyfin Packaging Team <packaging@jellyfin.org>
 - New upstream version 10.3.5; release changelog at https://github.com/jellyfin/jellyfin/releases/tag/v10.3.5
 * Thu Jun 06 2019 Jellyfin Packaging Team <packaging@jellyfin.org>
-- 
cgit v1.2.3


From 953f077f9d6e4272ebc38a6ef50111b04045a3a3 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Sun, 14 Jul 2019 23:11:17 -0400
Subject: Override the installinit name

Without this, when building the `jellyfin-nightly` package, it attempts
to find service/init files with the name `jellyfin-nightly` instead of
the proper name. This override prevents this by forcing the name to
`jellyfin`. Required for nightly builds.
---
 deployment/debian-package-x64/pkg-src/rules | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'deployment/debian-package-x64/pkg-src')

diff --git a/deployment/debian-package-x64/pkg-src/rules b/deployment/debian-package-x64/pkg-src/rules
index ee41e0e24b..2a5d41a696 100644
--- a/deployment/debian-package-x64/pkg-src/rules
+++ b/deployment/debian-package-x64/pkg-src/rules
@@ -45,3 +45,7 @@ override_dh_auto_build:
 override_dh_auto_clean:
 	dotnet clean -maxcpucount:1 --configuration $(CONFIG) Jellyfin.Server || true
 	rm -rf '$(CURDIR)/usr'
+
+# Force the service name to jellyfin even if we're building jellyfin-nightly
+override_dh_installinit:
+	dh_installinit --name=jellyfin
-- 
cgit v1.2.3


From 595a68b822654b03c32a35060bf97234dbc6ef7c Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Wed, 24 Jul 2019 10:48:35 -0400
Subject: Bump version for 10.3.7

---
 Dockerfile                                          | 2 +-
 Dockerfile.arm                                      | 2 +-
 Dockerfile.arm64                                    | 2 +-
 MediaBrowser.WebDashboard/jellyfin-web              | 2 +-
 SharedVersion.cs                                    | 4 ++--
 build.yaml                                          | 2 +-
 deployment/debian-package-x64/pkg-src/changelog     | 6 ++++++
 deployment/fedora-package-x64/pkg-src/jellyfin.spec | 4 +++-
 8 files changed, 16 insertions(+), 8 deletions(-)

(limited to 'deployment/debian-package-x64/pkg-src')

diff --git a/Dockerfile b/Dockerfile
index 864cfa445b..057d4b0413 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,7 +21,7 @@ RUN apt-get update \
 COPY --from=ffmpeg / /
 COPY --from=builder /jellyfin /jellyfin
 
-ARG JELLYFIN_WEB_VERSION=10.3.6
+ARG JELLYFIN_WEB_VERSION=10.3.7
 RUN curl -L https://github.com/jellyfin/jellyfin-web/archive/v${JELLYFIN_WEB_VERSION}.tar.gz | tar zxf - \
  && rm -rf /jellyfin/jellyfin-web \
  && mv jellyfin-web-${JELLYFIN_WEB_VERSION} /jellyfin/jellyfin-web
diff --git a/Dockerfile.arm b/Dockerfile.arm
index 8167390632..dad4da1f14 100644
--- a/Dockerfile.arm
+++ b/Dockerfile.arm
@@ -26,7 +26,7 @@ RUN apt-get update \
  && chmod 777 /cache /config /media
 COPY --from=builder /jellyfin /jellyfin
 
-ARG JELLYFIN_WEB_VERSION=10.3.6
+ARG JELLYFIN_WEB_VERSION=10.3.7
 RUN curl -L https://github.com/jellyfin/jellyfin-web/archive/v${JELLYFIN_WEB_VERSION}.tar.gz | tar zxf - \
  && rm -rf /jellyfin/jellyfin-web \
  && mv jellyfin-web-${JELLYFIN_WEB_VERSION} /jellyfin/jellyfin-web
diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
index 1843f7224b..5d4e86bff4 100644
--- a/Dockerfile.arm64
+++ b/Dockerfile.arm64
@@ -26,7 +26,7 @@ RUN apt-get update \
  && chmod 777 /cache /config /media
 COPY --from=builder /jellyfin /jellyfin
 
-ARG JELLYFIN_WEB_VERSION=10.3.6
+ARG JELLYFIN_WEB_VERSION=10.3.7
 RUN curl -L https://github.com/jellyfin/jellyfin-web/archive/v${JELLYFIN_WEB_VERSION}.tar.gz | tar zxf - \
  && rm -rf /jellyfin/jellyfin-web \
  && mv jellyfin-web-${JELLYFIN_WEB_VERSION} /jellyfin/jellyfin-web
diff --git a/MediaBrowser.WebDashboard/jellyfin-web b/MediaBrowser.WebDashboard/jellyfin-web
index c9e70d9564..1d0fd79eb1 160000
--- a/MediaBrowser.WebDashboard/jellyfin-web
+++ b/MediaBrowser.WebDashboard/jellyfin-web
@@ -1 +1 @@
-Subproject commit c9e70d95643e84437189dd500b0380ec0fbbf659
+Subproject commit 1d0fd79eb1e4d0bf6a9f62f769a951970383bcf0
diff --git a/SharedVersion.cs b/SharedVersion.cs
index 1e74d8f7d6..500e6fe551 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("10.3.6")]
-[assembly: AssemblyFileVersion("10.3.6")]
+[assembly: AssemblyVersion("10.3.7")]
+[assembly: AssemblyFileVersion("10.3.7")]
diff --git a/build.yaml b/build.yaml
index 7a5e66b112..2d4bc29f43 100644
--- a/build.yaml
+++ b/build.yaml
@@ -1,7 +1,7 @@
 ---
 # We just wrap `build` so this is really it
 name: "jellyfin"
-version: "10.3.6"
+version: "10.3.7"
 packages:
   - debian-package-x64
   - debian-package-armhf
diff --git a/deployment/debian-package-x64/pkg-src/changelog b/deployment/debian-package-x64/pkg-src/changelog
index 64912a11d1..aa15827a72 100644
--- a/deployment/debian-package-x64/pkg-src/changelog
+++ b/deployment/debian-package-x64/pkg-src/changelog
@@ -1,3 +1,9 @@
+jellyfin (10.3.7-1) unstable; urgency=medium
+
+  * New upstream version 10.3.7; release changelog at https://github.com/jellyfin/jellyfin/releases/tag/v10.3.7
+
+ -- Jellyfin Packaging Team <packaging@jellyfin.org>  Wed, 24 Jul 2019 10:48:28 -0400
+
 jellyfin (10.3.6-1) unstable; urgency=medium
 
   * New upstream version 10.3.6; release changelog at https://github.com/jellyfin/jellyfin/releases/tag/v10.3.6
diff --git a/deployment/fedora-package-x64/pkg-src/jellyfin.spec b/deployment/fedora-package-x64/pkg-src/jellyfin.spec
index 809bde39d6..91b74ffe1e 100644
--- a/deployment/fedora-package-x64/pkg-src/jellyfin.spec
+++ b/deployment/fedora-package-x64/pkg-src/jellyfin.spec
@@ -7,7 +7,7 @@
 %endif
 
 Name:           jellyfin
-Version:        10.3.6
+Version:        10.3.7
 Release:        1%{?dist}
 Summary:        The Free Software Media Browser
 License:        GPLv2
@@ -140,6 +140,8 @@ fi
 %systemd_postun_with_restart jellyfin.service
 
 %changelog
+* Wed Jul 24 2019 Jellyfin Packaging Team <packaging@jellyfin.org>
+- New upstream version 10.3.7; release changelog at https://github.com/jellyfin/jellyfin/releases/tag/v10.3.7
 * Sat Jul 06 2019 Jellyfin Packaging Team <packaging@jellyfin.org>
 - New upstream version 10.3.6; release changelog at https://github.com/jellyfin/jellyfin/releases/tag/v10.3.6
 * Sun Jun 09 2019 Jellyfin Packaging Team <packaging@jellyfin.org>
-- 
cgit v1.2.3