Browse Source

Remove web building, rename, bump version

Joshua M. Boniface 5 years ago
parent
commit
93d1256a4c
3 changed files with 10 additions and 20 deletions
  1. 6 0
      debian/changelog
  2. 4 5
      debian/control
  3. 0 15
      debian/rules

+ 6 - 0
debian/changelog

@@ -1,3 +1,9 @@
+jellyfin-server (10.6.0-1) unstable; urgency=medium
+
+  * Forthcoming stable release
+
+ -- Jellyfin Packaging Team <packaging@jellyfin.org>  Mon, 23 Mar 2020 14:46:05 -0400
+
 jellyfin (10.5.0-1) unstable; urgency=medium
 jellyfin (10.5.0-1) unstable; urgency=medium
 
 
   * New upstream version 10.5.0; release changelog at https://github.com/jellyfin/jellyfin/releases/tag/v10.5.0
   * New upstream version 10.5.0; release changelog at https://github.com/jellyfin/jellyfin/releases/tag/v10.5.0

+ 4 - 5
debian/control

@@ -1,4 +1,4 @@
-Source: jellyfin
+Source: jellyfin-server
 Section: misc
 Section: misc
 Priority: optional
 Priority: optional
 Maintainer: Jellyfin Team <team@jellyfin.org>
 Maintainer: Jellyfin Team <team@jellyfin.org>
@@ -8,15 +8,13 @@ Build-Depends:  debhelper (>= 9),
                 libcurl4-openssl-dev,
                 libcurl4-openssl-dev,
                 libfontconfig1-dev,
                 libfontconfig1-dev,
                 libfreetype6-dev,
                 libfreetype6-dev,
-                libssl-dev,
-                wget,
-                npm | nodejs
+                libssl-dev
 Standards-Version: 3.9.4
 Standards-Version: 3.9.4
 Homepage: https://jellyfin.media/
 Homepage: https://jellyfin.media/
 Vcs-Git: https://github.org/jellyfin/jellyfin.git
 Vcs-Git: https://github.org/jellyfin/jellyfin.git
 Vcs-Browser: https://github.org/jellyfin/jellyfin
 Vcs-Browser: https://github.org/jellyfin/jellyfin
 
 
-Package: jellyfin
+Package: jellyfin-server
 Replaces: mediabrowser, emby, emby-server-beta, jellyfin-dev, emby-server
 Replaces: mediabrowser, emby, emby-server-beta, jellyfin-dev, emby-server
 Breaks: 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
 Conflicts: mediabrowser, emby, emby-server-beta, jellyfin-dev, emby-server
@@ -27,5 +25,6 @@ Depends: at,
          libfontconfig1,
          libfontconfig1,
          libfreetype6,
          libfreetype6,
          libssl1.1
          libssl1.1
+Recommends: jellyfin-web
 Description: Jellyfin is a home media server.
 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.
  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.

+ 0 - 15
debian/rules

@@ -2,8 +2,6 @@
 CONFIG := Release
 CONFIG := Release
 TERM := xterm
 TERM := xterm
 SHELL := /bin/bash
 SHELL := /bin/bash
-WEB_TARGET := $(CURDIR)/MediaBrowser.WebDashboard/jellyfin-web
-WEB_VERSION := $(shell sed -n -e 's/^version: "\(.*\)"/\1/p' $(CURDIR)/build.yaml)
 
 
 HOST_ARCH := $(shell arch)
 HOST_ARCH := $(shell arch)
 BUILD_ARCH := ${DEB_HOST_MULTIARCH}
 BUILD_ARCH := ${DEB_HOST_MULTIARCH}
@@ -41,25 +39,12 @@ override_dh_auto_test:
 override_dh_clistrip:
 override_dh_clistrip:
 
 
 override_dh_auto_build:
 override_dh_auto_build:
-	echo $(WEB_VERSION)
-	# Clone down and build Web frontend
-	mkdir -p $(WEB_TARGET)
-	wget -O web-src.tgz https://github.com/jellyfin/jellyfin-web/archive/v$(WEB_VERSION).tar.gz || wget -O web-src.tgz https://github.com/jellyfin/jellyfin-web/archive/master.tar.gz
-	mkdir -p $(CURDIR)/web
-	tar -xzf web-src.tgz -C $(CURDIR)/web/ --strip 1
-	cd $(CURDIR)/web/ && npm install yarn
-	cd $(CURDIR)/web/ && node_modules/yarn/bin/yarn install
-	mv $(CURDIR)/web/dist/* $(WEB_TARGET)/
-	# Build the application
 	dotnet publish --configuration $(CONFIG) --output='$(CURDIR)/usr/lib/jellyfin/bin' --self-contained --runtime $(DOTNETRUNTIME) \
 	dotnet publish --configuration $(CONFIG) --output='$(CURDIR)/usr/lib/jellyfin/bin' --self-contained --runtime $(DOTNETRUNTIME) \
 		"-p:GenerateDocumentationFile=false;DebugSymbols=false;DebugType=none" Jellyfin.Server
 		"-p:GenerateDocumentationFile=false;DebugSymbols=false;DebugType=none" Jellyfin.Server
 
 
 override_dh_auto_clean:
 override_dh_auto_clean:
 	dotnet clean -maxcpucount:1 --configuration $(CONFIG) Jellyfin.Server || true
 	dotnet clean -maxcpucount:1 --configuration $(CONFIG) Jellyfin.Server || true
-	rm -f  '$(CURDIR)/web-src.tgz'
 	rm -rf '$(CURDIR)/usr'
 	rm -rf '$(CURDIR)/usr'
-	rm -rf '$(CURDIR)/web'
-	rm -rf '$(WEB_TARGET)'
 
 
 # Force the service name to jellyfin even if we're building jellyfin-nightly
 # Force the service name to jellyfin even if we're building jellyfin-nightly
 override_dh_installinit:
 override_dh_installinit: