[arch-commits] Commit in sauerbraten/repos (38 files)
Laurent Carlier
lcarlier at nymeria.archlinux.org
Mon May 13 07:12:03 UTC 2013
Date: Monday, May 13, 2013 @ 09:12:03
Author: lcarlier
Revision: 90555
archrelease: copy trunk to community-i686, community-x86_64
Added:
sauerbraten/repos/community-i686/PKGBUILD
(from rev 90554, sauerbraten/trunk/PKGBUILD)
sauerbraten/repos/community-i686/license.txt
(from rev 90554, sauerbraten/trunk/license.txt)
sauerbraten/repos/community-i686/sauerbraten-client
(from rev 90554, sauerbraten/trunk/sauerbraten-client)
sauerbraten/repos/community-i686/sauerbraten-server
(from rev 90554, sauerbraten/trunk/sauerbraten-server)
sauerbraten/repos/community-i686/sauerbraten.confd
(from rev 90554, sauerbraten/trunk/sauerbraten.confd)
sauerbraten/repos/community-i686/sauerbraten.desktop
(from rev 90554, sauerbraten/trunk/sauerbraten.desktop)
sauerbraten/repos/community-i686/sauerbraten.install
(from rev 90554, sauerbraten/trunk/sauerbraten.install)
sauerbraten/repos/community-i686/sauerbraten.png
(from rev 90554, sauerbraten/trunk/sauerbraten.png)
sauerbraten/repos/community-i686/sauerbraten.service
(from rev 90554, sauerbraten/trunk/sauerbraten.service)
sauerbraten/repos/community-x86_64/PKGBUILD
(from rev 90554, sauerbraten/trunk/PKGBUILD)
sauerbraten/repos/community-x86_64/license.txt
(from rev 90554, sauerbraten/trunk/license.txt)
sauerbraten/repos/community-x86_64/sauerbraten-client
(from rev 90554, sauerbraten/trunk/sauerbraten-client)
sauerbraten/repos/community-x86_64/sauerbraten-server
(from rev 90554, sauerbraten/trunk/sauerbraten-server)
sauerbraten/repos/community-x86_64/sauerbraten.confd
(from rev 90554, sauerbraten/trunk/sauerbraten.confd)
sauerbraten/repos/community-x86_64/sauerbraten.desktop
(from rev 90554, sauerbraten/trunk/sauerbraten.desktop)
sauerbraten/repos/community-x86_64/sauerbraten.install
(from rev 90554, sauerbraten/trunk/sauerbraten.install)
sauerbraten/repos/community-x86_64/sauerbraten.png
(from rev 90554, sauerbraten/trunk/sauerbraten.png)
sauerbraten/repos/community-x86_64/sauerbraten.service
(from rev 90554, sauerbraten/trunk/sauerbraten.service)
Deleted:
sauerbraten/repos/community-i686/PKGBUILD
sauerbraten/repos/community-i686/fix-indirect-linking.diff
sauerbraten/repos/community-i686/license.txt
sauerbraten/repos/community-i686/sauerbraten-client
sauerbraten/repos/community-i686/sauerbraten-server
sauerbraten/repos/community-i686/sauerbraten.confd
sauerbraten/repos/community-i686/sauerbraten.install
sauerbraten/repos/community-i686/sauerbraten.png
sauerbraten/repos/community-i686/sauerbraten.rcd
sauerbraten/repos/community-i686/sauerbraten.service
sauerbraten/repos/community-x86_64/PKGBUILD
sauerbraten/repos/community-x86_64/fix-indirect-linking.diff
sauerbraten/repos/community-x86_64/license.txt
sauerbraten/repos/community-x86_64/sauerbraten-client
sauerbraten/repos/community-x86_64/sauerbraten-server
sauerbraten/repos/community-x86_64/sauerbraten.confd
sauerbraten/repos/community-x86_64/sauerbraten.install
sauerbraten/repos/community-x86_64/sauerbraten.png
sauerbraten/repos/community-x86_64/sauerbraten.rcd
sauerbraten/repos/community-x86_64/sauerbraten.service
--------------------------------------------+
/PKGBUILD | 146 +++++++++++++++++++++++++++
/license.txt | 68 ++++++++++++
/sauerbraten-client | 20 +++
/sauerbraten-server | 44 ++++++++
/sauerbraten.confd | 6 +
/sauerbraten.install | 44 ++++++++
/sauerbraten.service | 26 ++++
community-i686/PKGBUILD | 63 -----------
community-i686/fix-indirect-linking.diff | 20 ---
community-i686/license.txt | 34 ------
community-i686/sauerbraten-client | 10 -
community-i686/sauerbraten-server | 22 ----
community-i686/sauerbraten.confd | 3
community-i686/sauerbraten.desktop | 10 +
community-i686/sauerbraten.install | 22 ----
community-i686/sauerbraten.rcd | 37 ------
community-i686/sauerbraten.service | 13 --
community-x86_64/PKGBUILD | 63 -----------
community-x86_64/fix-indirect-linking.diff | 20 ---
community-x86_64/license.txt | 34 ------
community-x86_64/sauerbraten-client | 10 -
community-x86_64/sauerbraten-server | 22 ----
community-x86_64/sauerbraten.confd | 3
community-x86_64/sauerbraten.desktop | 10 +
community-x86_64/sauerbraten.install | 22 ----
community-x86_64/sauerbraten.rcd | 37 ------
community-x86_64/sauerbraten.service | 13 --
27 files changed, 374 insertions(+), 448 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-05-13 07:11:26 UTC (rev 90554)
+++ community-i686/PKGBUILD 2013-05-13 07:12:03 UTC (rev 90555)
@@ -1,63 +0,0 @@
-# $Id$
-# Maintainer: Laurent Carlier <lordheavym at gmail.com>
-# Contributor: Jaroslaw Swierczynski <swiergot at aur.archlinux.org>
-# Contributor: Roman Kyrylych <Roman.Kyrylych at gmail.com>
-# Contributor: Christoph Siegenthaler <csi at gmx.ch>
-# Contributor: Jesse Young <jesse at eon.jlyo.org>
-
-pkgname=sauerbraten
-pkgver=2013_02_03_collect_edition
-pkgrel=1
-pkgdesc="FPS that uses an improved version of the Cube engine"
-arch=('i686' 'x86_64')
-url="http://www.sauerbraten.org/"
-license=('ZLIB')
-makedepends=('sdl_mixer' 'sdl_image' 'mesa-libgl' 'glu' 'gendesk')
-install=sauerbraten.install
-backup=('etc/conf.d/sauerbraten')
-source=(http://downloads.sourceforge.net/$pkgname/${pkgname}_${pkgver}_linux.tar.bz2
- sauerbraten-client
- sauerbraten-server
- sauerbraten.confd
- sauerbraten.png
- sauerbraten.install
- sauerbraten.service
- license.txt)
-md5sums=('2cfbd619981402898f97b93be08d58ac'
- 'cb84f0baa72ad88b939a9e5fd0916559'
- '4a42c314d01ccdc4c76fad38d18c7434'
- 'c28be8761ede9ca82b6ab311aa7f6d42'
- '3e602f421f7342cf8c3ed16314523d6f'
- '2f7b423f49491359ff776a91414db4d8'
- '3c964cdd0906461c0404641b1eb52d96'
- 'cf46cd0148f03b7477f7c54aec865abe')
-_exec=('sauerbraten-client %u')
-
-build() {
- cd "$srcdir"
- gendesk
-
- cd "$pkgname/src"
-
- make
-}
-
-package() {
- depends=('sdl_mixer' 'sdl_image' 'libgl' 'sauerbraten-data')
-
- cd ${srcdir}/$pkgname/src
-
- make DESTDIR="${pkgdir}" install
-
- cd ..
- install -D bin_unix/native_client ${pkgdir}/opt/sauerbraten/bin/linux_client
- install -D bin_unix/native_server ${pkgdir}/opt/sauerbraten/bin/linux_server
-
- install -Dm755 ${srcdir}/sauerbraten-client ${pkgdir}/usr/bin/sauerbraten-client
- install -Dm755 ${srcdir}/sauerbraten-server ${pkgdir}/usr/sbin/sauerbraten-server
- install -Dm644 ${srcdir}/sauerbraten.confd ${pkgdir}/etc/conf.d/sauerbraten
- install -Dm644 ${srcdir}/sauerbraten.service ${pkgdir}/usr/lib/systemd/system/sauerbraten.service
- install -Dm644 ${srcdir}/sauerbraten.desktop ${pkgdir}/usr/share/applications/sauerbraten.desktop
- install -Dm644 ${srcdir}/sauerbraten.png ${pkgdir}/usr/share/pixmaps/sauerbraten.png
- install -Dm644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/sauerbraten/license.txt
-}
Copied: sauerbraten/repos/community-i686/PKGBUILD (from rev 90554, sauerbraten/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-05-13 07:12:03 UTC (rev 90555)
@@ -0,0 +1,73 @@
+# $Id$
+# Maintainer: Laurent Carlier <lordheavym at gmail.com>
+# Contributor: Jaroslaw Swierczynski <swiergot at aur.archlinux.org>
+# Contributor: Roman Kyrylych <Roman.Kyrylych at gmail.com>
+# Contributor: Christoph Siegenthaler <csi at gmx.ch>
+# Contributor: Jesse Young <jesse at eon.jlyo.org>
+
+pkgname=sauerbraten
+pkgver=2013_02_03_collect_edition
+pkgrel=2
+pkgdesc="FPS that uses an improved version of the Cube engine"
+arch=('i686' 'x86_64')
+url="http://www.sauerbraten.org/"
+license=('ZLIB')
+makedepends=('sdl_mixer' 'sdl_image' 'mesa-libgl' 'glu') # gendesk
+install=sauerbraten.install
+backup=('etc/conf.d/sauerbraten')
+source=(http://downloads.sourceforge.net/$pkgname/${pkgname}_${pkgver}_linux.tar.bz2
+ sauerbraten-client
+ sauerbraten-server
+ sauerbraten.confd
+ sauerbraten.png
+ sauerbraten.install
+ sauerbraten.service
+ sauerbraten.desktop
+ license.txt)
+md5sums=('2cfbd619981402898f97b93be08d58ac'
+ 'cb84f0baa72ad88b939a9e5fd0916559'
+ '4a42c314d01ccdc4c76fad38d18c7434'
+ 'c28be8761ede9ca82b6ab311aa7f6d42'
+ '3e602f421f7342cf8c3ed16314523d6f'
+ '2f7b423f49491359ff776a91414db4d8'
+ '3c964cdd0906461c0404641b1eb52d96'
+ 'cf46cd0148f03b7477f7c54aec865abe')
+#_exec=('sauerbraten-client %u')
+
+build() {
+# cd "$srcdir"
+# gendesk ## broken ##
+
+ cd "$pkgname/src"
+
+ make
+}
+
+package() {
+ depends=('sdl_mixer' 'sdl_image' 'libgl' 'sauerbraten-data')
+
+ cd ${srcdir}/$pkgname/src
+
+ make DESTDIR="${pkgdir}" install
+
+ cd ..
+ install -D bin_unix/native_client ${pkgdir}/opt/sauerbraten/bin/linux_client
+ install -D bin_unix/native_server ${pkgdir}/opt/sauerbraten/bin/linux_server
+
+ install -Dm755 ${srcdir}/sauerbraten-client ${pkgdir}/usr/bin/sauerbraten-client
+ install -Dm755 ${srcdir}/sauerbraten-server ${pkgdir}/usr/bin/sauerbraten-server
+ install -Dm644 ${srcdir}/sauerbraten.confd ${pkgdir}/etc/conf.d/sauerbraten
+ install -Dm644 ${srcdir}/sauerbraten.service ${pkgdir}/usr/lib/systemd/system/sauerbraten.service
+ install -Dm644 ${srcdir}/sauerbraten.desktop ${pkgdir}/usr/share/applications/sauerbraten.desktop
+ install -Dm644 ${srcdir}/sauerbraten.png ${pkgdir}/usr/share/pixmaps/sauerbraten.png
+ install -Dm644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/sauerbraten/license.txt
+}
+md5sums=('2cfbd619981402898f97b93be08d58ac'
+ 'cb84f0baa72ad88b939a9e5fd0916559'
+ '4a42c314d01ccdc4c76fad38d18c7434'
+ 'c28be8761ede9ca82b6ab311aa7f6d42'
+ '3e602f421f7342cf8c3ed16314523d6f'
+ '2f7b423f49491359ff776a91414db4d8'
+ '3c964cdd0906461c0404641b1eb52d96'
+ '05c1f5f33c744097c4c70f1e23738847'
+ 'cf46cd0148f03b7477f7c54aec865abe')
Deleted: community-i686/fix-indirect-linking.diff
===================================================================
--- community-i686/fix-indirect-linking.diff 2013-05-13 07:11:26 UTC (rev 90554)
+++ community-i686/fix-indirect-linking.diff 2013-05-13 07:12:03 UTC (rev 90555)
@@ -1,20 +0,0 @@
-Index: sauerbraten/Makefile
-===================================================================
---- sauerbraten.orig/Makefile 2010-07-29 21:24:21.000000000 -0400
-+++ sauerbraten/Makefile 2010-07-29 21:26:15.717746486 -0400
-@@ -21,11 +21,14 @@
- CLIENT_LIBS= -mwindows -Llib -lSDL -lSDL_image -lSDL_mixer -lzdll -lopengl32 -lenet -lws2_32 -lwinmm
- else
- CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
--CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
-+CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL -lX11
- endif
- ifeq ($(PLATFORM),Linux)
- CLIENT_LIBS+= -lrt
- endif
-+ifeq ($(PLATFORM),GNU/kFreeBSD)
-+CLIENT_LIBS+= -lrt
-+endif
- CLIENT_OBJS= \
- shared/crypto.o \
- shared/geom.o \
Deleted: community-i686/license.txt
===================================================================
--- community-i686/license.txt 2013-05-13 07:11:26 UTC (rev 90554)
+++ community-i686/license.txt 2013-05-13 07:12:03 UTC (rev 90555)
@@ -1,34 +0,0 @@
-LICENSE
-=======
-
-Sauerbraten game engine source code, any release.
-
-Copyright (C) 2001-2006 Wouter van Oortmerssen.
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-
-
-LICENSE NOTES
-=============
-The license covers the source code found in the "src" directory of this
-archive, the included enet network library which sauerbraten uses is covered by
-an MIT-style license, which is however compatible with the above license for all
-practical purposes.
-
-Game media included in the game (maps, textures, sounds, models etc.)
-are NOT covered by this license, and may have individual copyrights and
-distribution restrictions (see individual readmes).
Copied: sauerbraten/repos/community-i686/license.txt (from rev 90554, sauerbraten/trunk/license.txt)
===================================================================
--- community-i686/license.txt (rev 0)
+++ community-i686/license.txt 2013-05-13 07:12:03 UTC (rev 90555)
@@ -0,0 +1,34 @@
+LICENSE
+=======
+
+Sauerbraten game engine source code, any release.
+
+Copyright (C) 2001-2006 Wouter van Oortmerssen.
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+
+LICENSE NOTES
+=============
+The license covers the source code found in the "src" directory of this
+archive, the included enet network library which sauerbraten uses is covered by
+an MIT-style license, which is however compatible with the above license for all
+practical purposes.
+
+Game media included in the game (maps, textures, sounds, models etc.)
+are NOT covered by this license, and may have individual copyrights and
+distribution restrictions (see individual readmes).
Deleted: community-i686/sauerbraten-client
===================================================================
--- community-i686/sauerbraten-client 2013-05-13 07:11:26 UTC (rev 90554)
+++ community-i686/sauerbraten-client 2013-05-13 07:12:03 UTC (rev 90555)
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-cd /opt/sauerbraten
-if [ -f /usr/bin/aoss ]; then
- aoss bin/linux_client -q${HOME}/.config/sauerbraten -r
-else
- bin/linux_client -q${HOME}/.config/sauerbraten -r
-fi
-
-
Copied: sauerbraten/repos/community-i686/sauerbraten-client (from rev 90554, sauerbraten/trunk/sauerbraten-client)
===================================================================
--- community-i686/sauerbraten-client (rev 0)
+++ community-i686/sauerbraten-client 2013-05-13 07:12:03 UTC (rev 90555)
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+cd /opt/sauerbraten
+if [ -f /usr/bin/aoss ]; then
+ aoss bin/linux_client -q${HOME}/.config/sauerbraten -r
+else
+ bin/linux_client -q${HOME}/.config/sauerbraten -r
+fi
+
+
Deleted: community-i686/sauerbraten-server
===================================================================
--- community-i686/sauerbraten-server 2013-05-13 07:11:26 UTC (rev 90554)
+++ community-i686/sauerbraten-server 2013-05-13 07:12:03 UTC (rev 90555)
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-SAUER_USER=nobody
-LOGDIR=/var/log/sauerbraten
-[ -f /etc/conf.d/sauerbraten ] && . /etc/conf.d/sauerbraten
-
-cd /opt/sauerbraten
-
-if [ "$(id -u)" == "0" ]; then
- if [ ! -d "$LOGDIR" ]; then
- mkdir -p "$LOGDIR"
- chown "$SAUER_USER:log" "$LOGDIR"
- fi
-
- sudo -Hu "$SAUER_USER" \
- nohup /opt/sauerbraten/bin/linux_server \
- >> "$LOGDIR/main.log" \
- 2>> "$LOGDIR/error.log" \
- < /dev/null &
-else
- bin/linux_server
-fi
Copied: sauerbraten/repos/community-i686/sauerbraten-server (from rev 90554, sauerbraten/trunk/sauerbraten-server)
===================================================================
--- community-i686/sauerbraten-server (rev 0)
+++ community-i686/sauerbraten-server 2013-05-13 07:12:03 UTC (rev 90555)
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+SAUER_USER=nobody
+LOGDIR=/var/log/sauerbraten
+[ -f /etc/conf.d/sauerbraten ] && . /etc/conf.d/sauerbraten
+
+cd /opt/sauerbraten
+
+if [ "$(id -u)" == "0" ]; then
+ if [ ! -d "$LOGDIR" ]; then
+ mkdir -p "$LOGDIR"
+ chown "$SAUER_USER:log" "$LOGDIR"
+ fi
+
+ sudo -Hu "$SAUER_USER" \
+ nohup /opt/sauerbraten/bin/linux_server \
+ >> "$LOGDIR/main.log" \
+ 2>> "$LOGDIR/error.log" \
+ < /dev/null &
+else
+ bin/linux_server
+fi
Deleted: community-i686/sauerbraten.confd
===================================================================
--- community-i686/sauerbraten.confd 2013-05-13 07:11:26 UTC (rev 90554)
+++ community-i686/sauerbraten.confd 2013-05-13 07:12:03 UTC (rev 90555)
@@ -1,3 +0,0 @@
-# Server options
-SAUER_USER=sauerbraten
-LOGDIR=/var/log/sauerbraten
Copied: sauerbraten/repos/community-i686/sauerbraten.confd (from rev 90554, sauerbraten/trunk/sauerbraten.confd)
===================================================================
--- community-i686/sauerbraten.confd (rev 0)
+++ community-i686/sauerbraten.confd 2013-05-13 07:12:03 UTC (rev 90555)
@@ -0,0 +1,3 @@
+# Server options
+SAUER_USER=sauerbraten
+LOGDIR=/var/log/sauerbraten
Copied: sauerbraten/repos/community-i686/sauerbraten.desktop (from rev 90554, sauerbraten/trunk/sauerbraten.desktop)
===================================================================
--- community-i686/sauerbraten.desktop (rev 0)
+++ community-i686/sauerbraten.desktop 2013-05-13 07:12:03 UTC (rev 90555)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=Sauerbraten
+Comment=FPS that uses an improved version of the Cube engine
+Exec=sauerbraten-client %u
+Icon=sauerbraten
+Terminal=false
+StartupNotify=false
+Categories=Application;Game;ActionGame;
Deleted: community-i686/sauerbraten.install
===================================================================
--- community-i686/sauerbraten.install 2013-05-13 07:11:26 UTC (rev 90554)
+++ community-i686/sauerbraten.install 2013-05-13 07:12:03 UTC (rev 90555)
@@ -1,22 +0,0 @@
-# arg 1: the new package version
-post_install() {
- getent group sauerbraten >/dev/null 2>&1 || groupadd -r sauerbraten
- if getent passwd sauerbraten > /dev/null 2>&1; then
- usr/sbin/usermod -d /var/spool/sauerbraten -c 'Sauerbraten' -s /sbin/nologin sauerbraten > /dev/null 2>&1
- else
- usr/sbin/useradd -c 'Sauerbraten' -r -g sauerbraten -d /opt/sauerbraten -s /sbin/nologin sauerbraten
- fi
- passwd -l sauerbraten > /dev/null
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- post_install $1
-}
-
-# arg 1: the old package version
-pre_remove() {
- getent passwd sauerbraten >/dev/null 2>&1 && userdel sauerbraten
-}
-
Copied: sauerbraten/repos/community-i686/sauerbraten.install (from rev 90554, sauerbraten/trunk/sauerbraten.install)
===================================================================
--- community-i686/sauerbraten.install (rev 0)
+++ community-i686/sauerbraten.install 2013-05-13 07:12:03 UTC (rev 90555)
@@ -0,0 +1,22 @@
+# arg 1: the new package version
+post_install() {
+ getent group sauerbraten >/dev/null 2>&1 || groupadd -r sauerbraten
+ if getent passwd sauerbraten > /dev/null 2>&1; then
+ usr/sbin/usermod -d /var/spool/sauerbraten -c 'Sauerbraten' -s /sbin/nologin sauerbraten > /dev/null 2>&1
+ else
+ usr/sbin/useradd -c 'Sauerbraten' -r -g sauerbraten -d /opt/sauerbraten -s /sbin/nologin sauerbraten
+ fi
+ passwd -l sauerbraten > /dev/null
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+ post_install $1
+}
+
+# arg 1: the old package version
+pre_remove() {
+ getent passwd sauerbraten >/dev/null 2>&1 && userdel sauerbraten
+}
+
Deleted: community-i686/sauerbraten.png
===================================================================
(Binary files differ)
Copied: sauerbraten/repos/community-i686/sauerbraten.png (from rev 90554, sauerbraten/trunk/sauerbraten.png)
===================================================================
(Binary files differ)
Deleted: community-i686/sauerbraten.rcd
===================================================================
--- community-i686/sauerbraten.rcd 2013-05-13 07:11:26 UTC (rev 90554)
+++ community-i686/sauerbraten.rcd 2013-05-13 07:12:03 UTC (rev 90555)
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
- start)
- stat_busy "Starting sauerbraten-server"
- [ ! -f /var/run/daemons/sauerbraten ] && /usr/sbin/sauerbraten-server
- if [ $? -gt 0 ]; then
- stat_fail
- else
- pgrep -of "/opt/sauerbraten/bin/linux_server" > /var/run/sauerbraten.pid
- add_daemon sauerbraten
- stat_done
- fi
- ;;
-
- stop)
- stat_busy "Stopping sauerbraten-server"
- [ -f /var/run/sauerbraten.pid ] && kill `cat /var/run/sauerbraten.pid`
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon sauerbraten
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
Deleted: community-i686/sauerbraten.service
===================================================================
--- community-i686/sauerbraten.service 2013-05-13 07:11:26 UTC (rev 90554)
+++ community-i686/sauerbraten.service 2013-05-13 07:12:03 UTC (rev 90555)
@@ -1,13 +0,0 @@
-[Unit]
-Description=Sauerbraten dedicated server
-After=network.target
-
-[Service]
-User=nobody
-ExecStart=/opt/sauerbraten/bin/linux_server
-Restart=on-abort
-StandardOutput=syslog
-
-[Install]
-WantedBy=multi-user.target
-
Copied: sauerbraten/repos/community-i686/sauerbraten.service (from rev 90554, sauerbraten/trunk/sauerbraten.service)
===================================================================
--- community-i686/sauerbraten.service (rev 0)
+++ community-i686/sauerbraten.service 2013-05-13 07:12:03 UTC (rev 90555)
@@ -0,0 +1,13 @@
+[Unit]
+Description=Sauerbraten dedicated server
+After=network.target
+
+[Service]
+User=nobody
+ExecStart=/opt/sauerbraten/bin/linux_server
+Restart=on-abort
+StandardOutput=syslog
+
+[Install]
+WantedBy=multi-user.target
+
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-05-13 07:11:26 UTC (rev 90554)
+++ community-x86_64/PKGBUILD 2013-05-13 07:12:03 UTC (rev 90555)
@@ -1,63 +0,0 @@
-# $Id$
-# Maintainer: Laurent Carlier <lordheavym at gmail.com>
-# Contributor: Jaroslaw Swierczynski <swiergot at aur.archlinux.org>
-# Contributor: Roman Kyrylych <Roman.Kyrylych at gmail.com>
-# Contributor: Christoph Siegenthaler <csi at gmx.ch>
-# Contributor: Jesse Young <jesse at eon.jlyo.org>
-
-pkgname=sauerbraten
-pkgver=2013_02_03_collect_edition
-pkgrel=1
-pkgdesc="FPS that uses an improved version of the Cube engine"
-arch=('i686' 'x86_64')
-url="http://www.sauerbraten.org/"
-license=('ZLIB')
-makedepends=('sdl_mixer' 'sdl_image' 'mesa-libgl' 'glu' 'gendesk')
-install=sauerbraten.install
-backup=('etc/conf.d/sauerbraten')
-source=(http://downloads.sourceforge.net/$pkgname/${pkgname}_${pkgver}_linux.tar.bz2
- sauerbraten-client
- sauerbraten-server
- sauerbraten.confd
- sauerbraten.png
- sauerbraten.install
- sauerbraten.service
- license.txt)
-md5sums=('2cfbd619981402898f97b93be08d58ac'
- 'cb84f0baa72ad88b939a9e5fd0916559'
- '4a42c314d01ccdc4c76fad38d18c7434'
- 'c28be8761ede9ca82b6ab311aa7f6d42'
- '3e602f421f7342cf8c3ed16314523d6f'
- '2f7b423f49491359ff776a91414db4d8'
- '3c964cdd0906461c0404641b1eb52d96'
- 'cf46cd0148f03b7477f7c54aec865abe')
-_exec=('sauerbraten-client %u')
-
-build() {
- cd "$srcdir"
- gendesk
-
- cd "$pkgname/src"
-
- make
-}
-
-package() {
- depends=('sdl_mixer' 'sdl_image' 'libgl' 'sauerbraten-data')
-
- cd ${srcdir}/$pkgname/src
-
- make DESTDIR="${pkgdir}" install
-
- cd ..
- install -D bin_unix/native_client ${pkgdir}/opt/sauerbraten/bin/linux_client
- install -D bin_unix/native_server ${pkgdir}/opt/sauerbraten/bin/linux_server
-
- install -Dm755 ${srcdir}/sauerbraten-client ${pkgdir}/usr/bin/sauerbraten-client
- install -Dm755 ${srcdir}/sauerbraten-server ${pkgdir}/usr/sbin/sauerbraten-server
- install -Dm644 ${srcdir}/sauerbraten.confd ${pkgdir}/etc/conf.d/sauerbraten
- install -Dm644 ${srcdir}/sauerbraten.service ${pkgdir}/usr/lib/systemd/system/sauerbraten.service
- install -Dm644 ${srcdir}/sauerbraten.desktop ${pkgdir}/usr/share/applications/sauerbraten.desktop
- install -Dm644 ${srcdir}/sauerbraten.png ${pkgdir}/usr/share/pixmaps/sauerbraten.png
- install -Dm644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/sauerbraten/license.txt
-}
Copied: sauerbraten/repos/community-x86_64/PKGBUILD (from rev 90554, sauerbraten/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-05-13 07:12:03 UTC (rev 90555)
@@ -0,0 +1,73 @@
+# $Id$
+# Maintainer: Laurent Carlier <lordheavym at gmail.com>
+# Contributor: Jaroslaw Swierczynski <swiergot at aur.archlinux.org>
+# Contributor: Roman Kyrylych <Roman.Kyrylych at gmail.com>
+# Contributor: Christoph Siegenthaler <csi at gmx.ch>
+# Contributor: Jesse Young <jesse at eon.jlyo.org>
+
+pkgname=sauerbraten
+pkgver=2013_02_03_collect_edition
+pkgrel=2
+pkgdesc="FPS that uses an improved version of the Cube engine"
+arch=('i686' 'x86_64')
+url="http://www.sauerbraten.org/"
+license=('ZLIB')
+makedepends=('sdl_mixer' 'sdl_image' 'mesa-libgl' 'glu') # gendesk
+install=sauerbraten.install
+backup=('etc/conf.d/sauerbraten')
+source=(http://downloads.sourceforge.net/$pkgname/${pkgname}_${pkgver}_linux.tar.bz2
+ sauerbraten-client
+ sauerbraten-server
+ sauerbraten.confd
+ sauerbraten.png
+ sauerbraten.install
+ sauerbraten.service
+ sauerbraten.desktop
+ license.txt)
+md5sums=('2cfbd619981402898f97b93be08d58ac'
+ 'cb84f0baa72ad88b939a9e5fd0916559'
+ '4a42c314d01ccdc4c76fad38d18c7434'
+ 'c28be8761ede9ca82b6ab311aa7f6d42'
+ '3e602f421f7342cf8c3ed16314523d6f'
+ '2f7b423f49491359ff776a91414db4d8'
+ '3c964cdd0906461c0404641b1eb52d96'
+ 'cf46cd0148f03b7477f7c54aec865abe')
+#_exec=('sauerbraten-client %u')
+
+build() {
+# cd "$srcdir"
+# gendesk ## broken ##
+
+ cd "$pkgname/src"
+
+ make
+}
+
+package() {
+ depends=('sdl_mixer' 'sdl_image' 'libgl' 'sauerbraten-data')
+
+ cd ${srcdir}/$pkgname/src
+
+ make DESTDIR="${pkgdir}" install
+
+ cd ..
+ install -D bin_unix/native_client ${pkgdir}/opt/sauerbraten/bin/linux_client
+ install -D bin_unix/native_server ${pkgdir}/opt/sauerbraten/bin/linux_server
+
+ install -Dm755 ${srcdir}/sauerbraten-client ${pkgdir}/usr/bin/sauerbraten-client
+ install -Dm755 ${srcdir}/sauerbraten-server ${pkgdir}/usr/bin/sauerbraten-server
+ install -Dm644 ${srcdir}/sauerbraten.confd ${pkgdir}/etc/conf.d/sauerbraten
+ install -Dm644 ${srcdir}/sauerbraten.service ${pkgdir}/usr/lib/systemd/system/sauerbraten.service
+ install -Dm644 ${srcdir}/sauerbraten.desktop ${pkgdir}/usr/share/applications/sauerbraten.desktop
+ install -Dm644 ${srcdir}/sauerbraten.png ${pkgdir}/usr/share/pixmaps/sauerbraten.png
+ install -Dm644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/sauerbraten/license.txt
+}
+md5sums=('2cfbd619981402898f97b93be08d58ac'
+ 'cb84f0baa72ad88b939a9e5fd0916559'
+ '4a42c314d01ccdc4c76fad38d18c7434'
+ 'c28be8761ede9ca82b6ab311aa7f6d42'
+ '3e602f421f7342cf8c3ed16314523d6f'
+ '2f7b423f49491359ff776a91414db4d8'
+ '3c964cdd0906461c0404641b1eb52d96'
+ '05c1f5f33c744097c4c70f1e23738847'
+ 'cf46cd0148f03b7477f7c54aec865abe')
Deleted: community-x86_64/fix-indirect-linking.diff
===================================================================
--- community-x86_64/fix-indirect-linking.diff 2013-05-13 07:11:26 UTC (rev 90554)
+++ community-x86_64/fix-indirect-linking.diff 2013-05-13 07:12:03 UTC (rev 90555)
@@ -1,20 +0,0 @@
-Index: sauerbraten/Makefile
-===================================================================
---- sauerbraten.orig/Makefile 2010-07-29 21:24:21.000000000 -0400
-+++ sauerbraten/Makefile 2010-07-29 21:26:15.717746486 -0400
-@@ -21,11 +21,14 @@
- CLIENT_LIBS= -mwindows -Llib -lSDL -lSDL_image -lSDL_mixer -lzdll -lopengl32 -lenet -lws2_32 -lwinmm
- else
- CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
--CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
-+CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL -lX11
- endif
- ifeq ($(PLATFORM),Linux)
- CLIENT_LIBS+= -lrt
- endif
-+ifeq ($(PLATFORM),GNU/kFreeBSD)
-+CLIENT_LIBS+= -lrt
-+endif
- CLIENT_OBJS= \
- shared/crypto.o \
- shared/geom.o \
Deleted: community-x86_64/license.txt
===================================================================
--- community-x86_64/license.txt 2013-05-13 07:11:26 UTC (rev 90554)
+++ community-x86_64/license.txt 2013-05-13 07:12:03 UTC (rev 90555)
@@ -1,34 +0,0 @@
-LICENSE
-=======
-
-Sauerbraten game engine source code, any release.
-
-Copyright (C) 2001-2006 Wouter van Oortmerssen.
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-
-
-LICENSE NOTES
-=============
-The license covers the source code found in the "src" directory of this
-archive, the included enet network library which sauerbraten uses is covered by
-an MIT-style license, which is however compatible with the above license for all
-practical purposes.
-
-Game media included in the game (maps, textures, sounds, models etc.)
-are NOT covered by this license, and may have individual copyrights and
-distribution restrictions (see individual readmes).
Copied: sauerbraten/repos/community-x86_64/license.txt (from rev 90554, sauerbraten/trunk/license.txt)
===================================================================
--- community-x86_64/license.txt (rev 0)
+++ community-x86_64/license.txt 2013-05-13 07:12:03 UTC (rev 90555)
@@ -0,0 +1,34 @@
+LICENSE
+=======
+
+Sauerbraten game engine source code, any release.
+
+Copyright (C) 2001-2006 Wouter van Oortmerssen.
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+
+LICENSE NOTES
+=============
+The license covers the source code found in the "src" directory of this
+archive, the included enet network library which sauerbraten uses is covered by
+an MIT-style license, which is however compatible with the above license for all
+practical purposes.
+
+Game media included in the game (maps, textures, sounds, models etc.)
+are NOT covered by this license, and may have individual copyrights and
+distribution restrictions (see individual readmes).
Deleted: community-x86_64/sauerbraten-client
===================================================================
--- community-x86_64/sauerbraten-client 2013-05-13 07:11:26 UTC (rev 90554)
+++ community-x86_64/sauerbraten-client 2013-05-13 07:12:03 UTC (rev 90555)
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-cd /opt/sauerbraten
-if [ -f /usr/bin/aoss ]; then
- aoss bin/linux_client -q${HOME}/.config/sauerbraten -r
-else
- bin/linux_client -q${HOME}/.config/sauerbraten -r
-fi
-
-
Copied: sauerbraten/repos/community-x86_64/sauerbraten-client (from rev 90554, sauerbraten/trunk/sauerbraten-client)
===================================================================
--- community-x86_64/sauerbraten-client (rev 0)
+++ community-x86_64/sauerbraten-client 2013-05-13 07:12:03 UTC (rev 90555)
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+cd /opt/sauerbraten
+if [ -f /usr/bin/aoss ]; then
+ aoss bin/linux_client -q${HOME}/.config/sauerbraten -r
+else
+ bin/linux_client -q${HOME}/.config/sauerbraten -r
+fi
+
+
Deleted: community-x86_64/sauerbraten-server
===================================================================
--- community-x86_64/sauerbraten-server 2013-05-13 07:11:26 UTC (rev 90554)
+++ community-x86_64/sauerbraten-server 2013-05-13 07:12:03 UTC (rev 90555)
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-SAUER_USER=nobody
-LOGDIR=/var/log/sauerbraten
-[ -f /etc/conf.d/sauerbraten ] && . /etc/conf.d/sauerbraten
-
-cd /opt/sauerbraten
-
-if [ "$(id -u)" == "0" ]; then
- if [ ! -d "$LOGDIR" ]; then
- mkdir -p "$LOGDIR"
- chown "$SAUER_USER:log" "$LOGDIR"
- fi
-
- sudo -Hu "$SAUER_USER" \
- nohup /opt/sauerbraten/bin/linux_server \
- >> "$LOGDIR/main.log" \
- 2>> "$LOGDIR/error.log" \
- < /dev/null &
-else
- bin/linux_server
-fi
Copied: sauerbraten/repos/community-x86_64/sauerbraten-server (from rev 90554, sauerbraten/trunk/sauerbraten-server)
===================================================================
--- community-x86_64/sauerbraten-server (rev 0)
+++ community-x86_64/sauerbraten-server 2013-05-13 07:12:03 UTC (rev 90555)
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+SAUER_USER=nobody
+LOGDIR=/var/log/sauerbraten
+[ -f /etc/conf.d/sauerbraten ] && . /etc/conf.d/sauerbraten
+
+cd /opt/sauerbraten
+
+if [ "$(id -u)" == "0" ]; then
+ if [ ! -d "$LOGDIR" ]; then
+ mkdir -p "$LOGDIR"
+ chown "$SAUER_USER:log" "$LOGDIR"
+ fi
+
+ sudo -Hu "$SAUER_USER" \
+ nohup /opt/sauerbraten/bin/linux_server \
+ >> "$LOGDIR/main.log" \
+ 2>> "$LOGDIR/error.log" \
+ < /dev/null &
+else
+ bin/linux_server
+fi
Deleted: community-x86_64/sauerbraten.confd
===================================================================
--- community-x86_64/sauerbraten.confd 2013-05-13 07:11:26 UTC (rev 90554)
+++ community-x86_64/sauerbraten.confd 2013-05-13 07:12:03 UTC (rev 90555)
@@ -1,3 +0,0 @@
-# Server options
-SAUER_USER=sauerbraten
-LOGDIR=/var/log/sauerbraten
Copied: sauerbraten/repos/community-x86_64/sauerbraten.confd (from rev 90554, sauerbraten/trunk/sauerbraten.confd)
===================================================================
--- community-x86_64/sauerbraten.confd (rev 0)
+++ community-x86_64/sauerbraten.confd 2013-05-13 07:12:03 UTC (rev 90555)
@@ -0,0 +1,3 @@
+# Server options
+SAUER_USER=sauerbraten
+LOGDIR=/var/log/sauerbraten
Copied: sauerbraten/repos/community-x86_64/sauerbraten.desktop (from rev 90554, sauerbraten/trunk/sauerbraten.desktop)
===================================================================
--- community-x86_64/sauerbraten.desktop (rev 0)
+++ community-x86_64/sauerbraten.desktop 2013-05-13 07:12:03 UTC (rev 90555)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=Sauerbraten
+Comment=FPS that uses an improved version of the Cube engine
+Exec=sauerbraten-client %u
+Icon=sauerbraten
+Terminal=false
+StartupNotify=false
+Categories=Application;Game;ActionGame;
Deleted: community-x86_64/sauerbraten.install
===================================================================
--- community-x86_64/sauerbraten.install 2013-05-13 07:11:26 UTC (rev 90554)
+++ community-x86_64/sauerbraten.install 2013-05-13 07:12:03 UTC (rev 90555)
@@ -1,22 +0,0 @@
-# arg 1: the new package version
-post_install() {
- getent group sauerbraten >/dev/null 2>&1 || groupadd -r sauerbraten
- if getent passwd sauerbraten > /dev/null 2>&1; then
- usr/sbin/usermod -d /var/spool/sauerbraten -c 'Sauerbraten' -s /sbin/nologin sauerbraten > /dev/null 2>&1
- else
- usr/sbin/useradd -c 'Sauerbraten' -r -g sauerbraten -d /opt/sauerbraten -s /sbin/nologin sauerbraten
- fi
- passwd -l sauerbraten > /dev/null
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- post_install $1
-}
-
-# arg 1: the old package version
-pre_remove() {
- getent passwd sauerbraten >/dev/null 2>&1 && userdel sauerbraten
-}
-
Copied: sauerbraten/repos/community-x86_64/sauerbraten.install (from rev 90554, sauerbraten/trunk/sauerbraten.install)
===================================================================
--- community-x86_64/sauerbraten.install (rev 0)
+++ community-x86_64/sauerbraten.install 2013-05-13 07:12:03 UTC (rev 90555)
@@ -0,0 +1,22 @@
+# arg 1: the new package version
+post_install() {
+ getent group sauerbraten >/dev/null 2>&1 || groupadd -r sauerbraten
+ if getent passwd sauerbraten > /dev/null 2>&1; then
+ usr/sbin/usermod -d /var/spool/sauerbraten -c 'Sauerbraten' -s /sbin/nologin sauerbraten > /dev/null 2>&1
+ else
+ usr/sbin/useradd -c 'Sauerbraten' -r -g sauerbraten -d /opt/sauerbraten -s /sbin/nologin sauerbraten
+ fi
+ passwd -l sauerbraten > /dev/null
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+ post_install $1
+}
+
+# arg 1: the old package version
+pre_remove() {
+ getent passwd sauerbraten >/dev/null 2>&1 && userdel sauerbraten
+}
+
Deleted: community-x86_64/sauerbraten.png
===================================================================
(Binary files differ)
Copied: sauerbraten/repos/community-x86_64/sauerbraten.png (from rev 90554, sauerbraten/trunk/sauerbraten.png)
===================================================================
(Binary files differ)
Deleted: community-x86_64/sauerbraten.rcd
===================================================================
--- community-x86_64/sauerbraten.rcd 2013-05-13 07:11:26 UTC (rev 90554)
+++ community-x86_64/sauerbraten.rcd 2013-05-13 07:12:03 UTC (rev 90555)
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
- start)
- stat_busy "Starting sauerbraten-server"
- [ ! -f /var/run/daemons/sauerbraten ] && /usr/sbin/sauerbraten-server
- if [ $? -gt 0 ]; then
- stat_fail
- else
- pgrep -of "/opt/sauerbraten/bin/linux_server" > /var/run/sauerbraten.pid
- add_daemon sauerbraten
- stat_done
- fi
- ;;
-
- stop)
- stat_busy "Stopping sauerbraten-server"
- [ -f /var/run/sauerbraten.pid ] && kill `cat /var/run/sauerbraten.pid`
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon sauerbraten
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
Deleted: community-x86_64/sauerbraten.service
===================================================================
--- community-x86_64/sauerbraten.service 2013-05-13 07:11:26 UTC (rev 90554)
+++ community-x86_64/sauerbraten.service 2013-05-13 07:12:03 UTC (rev 90555)
@@ -1,13 +0,0 @@
-[Unit]
-Description=Sauerbraten dedicated server
-After=network.target
-
-[Service]
-User=nobody
-ExecStart=/opt/sauerbraten/bin/linux_server
-Restart=on-abort
-StandardOutput=syslog
-
-[Install]
-WantedBy=multi-user.target
-
Copied: sauerbraten/repos/community-x86_64/sauerbraten.service (from rev 90554, sauerbraten/trunk/sauerbraten.service)
===================================================================
--- community-x86_64/sauerbraten.service (rev 0)
+++ community-x86_64/sauerbraten.service 2013-05-13 07:12:03 UTC (rev 90555)
@@ -0,0 +1,13 @@
+[Unit]
+Description=Sauerbraten dedicated server
+After=network.target
+
+[Service]
+User=nobody
+ExecStart=/opt/sauerbraten/bin/linux_server
+Restart=on-abort
+StandardOutput=syslog
+
+[Install]
+WantedBy=multi-user.target
+
More information about the arch-commits
mailing list