Update for 0.53.1.

7 files changed, 89 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index acc6ce7580f4..af8131e9da8c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = unvanquished-git
 	pkgdesc = A team-based, fast-paced, fps/rts hybrid game which pits aliens against humans. Git version.
-	pkgver = 0.52.0.r3.ga27cbc884
+	pkgver = 0.53.1.r18.g7810f3453
 	pkgrel = 1
 	url = https://www.unvanquished.net
 	install = unvanquished.install
@@ -39,11 +39,20 @@ pkgbase = unvanquished-git
 	backup = etc/unvanquished/server.cfg
 	backup = etc/unvanquished/maprotation.cfg
 	source = unvanquished.install
+	source = unvanquished.sh
+	source = unvanquished-tty.sh
+	source = unvanquished.conf
+	source = unvanquished.desktop
+	source = unvanquished.service
 	source = Unvanquished::git+https://github.com/Unvanquished/Unvanquished.git#branch=master
-	source = naclsdk_linux64-5.tar.bz2::https://dl.unvanquished.net/deps/linux64-5.tar.bz2
+	source = naclsdk_linux64-6.tar.bz2::https://dl.unvanquished.net/deps/linux64-6.tar.bz2
 	md5sums = 6d9430b5b06b93a43a1cb79e14637f0b
+	md5sums = 8d89d015e13f39f1849dfa40146dbfb6
+	md5sums = 705d8ad238356cd8fc97f63060f9b2e9
+	md5sums = fd69458c8aa7fa8e71cea6a5993fdcbc
+	md5sums = 6d0c7f32cb46e2a3a3901f0ad745fa39
+	md5sums = acf733d3389af8806edc54c872212e53
 	md5sums = SKIP
-	md5sums = 3c2cceeb5c653c4e53543fc892377f38
+	md5sums = 8e3e08ca8797e45e8dc01cdadf938676
 
 pkgname = unvanquished-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 7a3748c86d66..7d5baee89412 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Martin F. Schumann
 
 pkgname=unvanquished-git
-pkgver=0.52.0.r3.ga27cbc884
+pkgver=0.53.1.r18.g7810f3453
 pkgrel=1
 pkgdesc='A team-based, fast-paced, fps/rts hybrid game which pits aliens against humans. Git version.'
 arch=('x86_64')
@@ -35,17 +35,27 @@ _unvanquished="Unvanquished"
 
 # NaCL SDK is a buildtime dependency of Dæmon.
 # NOTE: Due to enormous compile times, we use a binary distribution.
-_naclsdk_base_ver=5
+_naclsdk_base_ver=6
 _naclsdk_ver="linux64-${_naclsdk_base_ver}"
 _naclsdk="${_naclsdk_ver}"
 
 source=("unvanquished.install"
+        "unvanquished.sh"
+        "unvanquished-tty.sh"
+        "unvanquished.conf"
+        "unvanquished.desktop"
+        "unvanquished.service"
         "${_unvanquished}::git+https://github.com/Unvanquished/Unvanquished.git#${_type}=${_checkout}"
         "naclsdk_${_naclsdk_ver}.tar.bz2::https://dl.unvanquished.net/deps/${_naclsdk_ver}.tar.bz2")
 
 md5sums=('6d9430b5b06b93a43a1cb79e14637f0b'
+         '8d89d015e13f39f1849dfa40146dbfb6'
+         '705d8ad238356cd8fc97f63060f9b2e9'
+         'fd69458c8aa7fa8e71cea6a5993fdcbc'
+         '6d0c7f32cb46e2a3a3901f0ad745fa39'
+         'acf733d3389af8806edc54c872212e53'
          'SKIP'
-         '3c2cceeb5c653c4e53543fc892377f38')
+         '8e3e08ca8797e45e8dc01cdadf938676')
 
 pkgver() {
 	cd "${srcdir}/${_unvanquished}"
@@ -93,13 +103,15 @@ package() {
 		var/lib/unvanquished-server/game
 
 	# Install content.
-	cd "${srcdir}/${_unvanquished}"
+	cd "${srcdir}"
 
-	for resolution in $(ls -c1 dist/icons/); do
-		icondir="${pkgdir}/usr/share/icons/hicolor/${resolution}/apps"
-		install -d -m 755 "${icondir}"
-		install -m 644 "dist/icons/${resolution}/unvanquished.png" "${icondir}"
-	done
+	install -m 755 unvanquished.sh         "${pkgdir}/usr/bin/unvanquished"
+	install -m 755 unvanquished-tty.sh     "${pkgdir}/usr/bin/unvanquished-tty"
+	install -m 644 unvanquished.conf       "${pkgdir}/etc/conf.d/"
+	install -m 644 unvanquished.service    "${pkgdir}/usr/lib/systemd/system/"
+	install -m 644 unvanquished.desktop    "${pkgdir}/usr/share/applications/"
+
+	cd "${srcdir}/${_unvanquished}"
 
 	install -m 644 COPYING.txt             "${pkgdir}/usr/share/licenses/unvanquished/"
 
@@ -113,18 +125,18 @@ package() {
 	install -m 755 nacl_helper_bootstrap   "${pkgdir}/usr/lib/unvanquished/"
 	install -m 755 nacl_loader             "${pkgdir}/usr/lib/unvanquished/"
 
-	# install starters and dedicated server config
-	# TODO: Use the distro-independent distribution files as much as possible,
-	#       ship all archlinux-specific files with the AUR package.
-	cd "${srcdir}/${_unvanquished}/archlinux"
+	cd "${srcdir}/${_unvanquished}/dist/configs"
 
-	install -m 755 unvanquished.sh         "${pkgdir}/usr/bin/unvanquished"
-	install -m 755 unvanquished-tty.sh     "${pkgdir}/usr/bin/unvanquished-tty"
-	install -m 644 unvanquished.conf       "${pkgdir}/etc/conf.d/"
-	install -m 644 unvanquished.service    "${pkgdir}/usr/lib/systemd/system/"
-	install -m 644 unvanquished.desktop    "${pkgdir}/usr/share/applications/"
-	install -m 644 configs/maprotation.cfg "${pkgdir}/etc/unvanquished/"
-	install -m 644 configs/server.cfg      "${pkgdir}/etc/unvanquished/"
+	install -m 644 game/maprotation.cfg    "${pkgdir}/etc/unvanquished/"
+	install -m 644 config/server.cfg       "${pkgdir}/etc/unvanquished/"
+
+	cd "${srcdir}/${_unvanquished}/dist/icons"
+
+	for resolution in $(ls -c1); do
+		icondir="${pkgdir}/usr/share/icons/hicolor/${resolution}/apps"
+		install -d -m 755 "${icondir}"
+		install -m 644 "${resolution}/unvanquished.png" "${icondir}"
+	done
 
 	# setup server home directory
 	cd "${pkgdir}/var/lib/unvanquished-server/config"
diff --git a/unvanquished-tty.sh b/unvanquished-tty.sh
new file mode 100755
index 000000000000..c0469984311a
--- /dev/null
+++ b/unvanquished-tty.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+# launcher script for unvanquished tty client
+
+exec /usr/lib/unvanquished/daemon-tty -libpath /usr/lib/unvanquished -pakpath /usr/share/unvanquished/pkg "$@"
diff --git a/unvanquished.conf b/unvanquished.conf
new file mode 100644
index 000000000000..a3d1c61d9283
--- /dev/null
+++ b/unvanquished.conf
@@ -0,0 +1,14 @@
+# This file configures the environment for the unvanquished server. It isn't used by the client.
+#
+# Server files can be found here:
+#   /etc/unvanquished - static configuration
+#   $HOMEPATH         - runtime data and logs
+
+# Initial configuration file
+EXEC=server.cfg
+
+# Search pathes
+LIBPATH=/usr/lib/unvanquished
+PAKPATH=/usr/share/unvanquished/pkg
+HOMEPATH=/var/lib/unvanquished-server
+
diff --git a/unvanquished.desktop b/unvanquished.desktop
new file mode 100644
index 000000000000..d92046e801f8
--- /dev/null
+++ b/unvanquished.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Name=Unvanquished
+Comment=FPS/RTS Game - Aliens vs. Humans
+Icon=unvanquished
+Terminal=false
+Type=Application
+Exec=/usr/bin/unvanquished %U
+Categories=Game;ActionGame;StrategyGame;
+MimeType=x-scheme-handler/unv
diff --git a/unvanquished.service b/unvanquished.service
new file mode 100644
index 000000000000..b0f175cf52ff
--- /dev/null
+++ b/unvanquished.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Unvanquished Dedicated Server
+After=network.target
+
+[Service]
+EnvironmentFile=/etc/conf.d/unvanquished.conf
+User=unvanquished
+Group=unvanquished
+ExecStart=/usr/lib/unvanquished/daemonded -libpath $LIBPATH -pakpath $PAKPATH -homepath $HOMEPATH +exec $EXEC
+
+[Install]
+WantedBy=multi-user.target
diff --git a/unvanquished.sh b/unvanquished.sh
new file mode 100755
index 000000000000..4ade47eca0e2
--- /dev/null
+++ b/unvanquished.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+# launcher script for unvanquished client
+
+exec /usr/lib/unvanquished/daemon -libpath /usr/lib/unvanquished -pakpath /usr/share/unvanquished/pkg "$@"