[arch-commits] Commit in sauerbraten/trunk (4 files)

[Laurent Carlier]

    Date: Monday, May 13, 2013 @ 09:11:26
  Author: lcarlier
Revision: 90554

upgpkg: sauerbraten 2013_02_03_collect_edition-2

Move sauerbraten-server file to /usr/bin

Added:
  sauerbraten/trunk/sauerbraten.desktop
Modified:
  sauerbraten/trunk/PKGBUILD
Deleted:
  sauerbraten/trunk/fix-indirect-linking.diff
  sauerbraten/trunk/sauerbraten.rcd

---------------------------+
 PKGBUILD                  |   24 +++++++++++++++++-------
 fix-indirect-linking.diff |   20 --------------------
 sauerbraten.desktop       |   10 ++++++++++
 sauerbraten.rcd           |   37 -------------------------------------
 4 files changed, 27 insertions(+), 64 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-13 06:52:07 UTC (rev 90553)
+++ PKGBUILD	2013-05-13 07:11:26 UTC (rev 90554)
@@ -7,12 +7,12 @@
 
 pkgname=sauerbraten
 pkgver=2013_02_03_collect_edition
-pkgrel=1
+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')
+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
@@ -22,6 +22,7 @@
 	sauerbraten.png
 	sauerbraten.install
 	sauerbraten.service
+	sauerbraten.desktop
 	license.txt)
 md5sums=('2cfbd619981402898f97b93be08d58ac'
          'cb84f0baa72ad88b939a9e5fd0916559'
@@ -31,12 +32,12 @@
          '2f7b423f49491359ff776a91414db4d8'
          '3c964cdd0906461c0404641b1eb52d96'
          'cf46cd0148f03b7477f7c54aec865abe')
-_exec=('sauerbraten-client %u')
+#_exec=('sauerbraten-client %u')
 
 build() {
-  cd "$srcdir"
-  gendesk
-  
+#  cd "$srcdir"
+#  gendesk ## broken ##
+
   cd "$pkgname/src"
 
   make
@@ -54,10 +55,19 @@
   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 -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: fix-indirect-linking.diff
===================================================================
--- fix-indirect-linking.diff	2013-05-13 06:52:07 UTC (rev 90553)
+++ fix-indirect-linking.diff	2013-05-13 07:11:26 UTC (rev 90554)
@@ -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 \

Added: sauerbraten.desktop
===================================================================
--- sauerbraten.desktop	                        (rev 0)
+++ sauerbraten.desktop	2013-05-13 07:11:26 UTC (rev 90554)
@@ -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: sauerbraten.rcd
===================================================================
--- sauerbraten.rcd	2013-05-13 06:52:07 UTC (rev 90553)
+++ sauerbraten.rcd	2013-05-13 07:11:26 UTC (rev 90554)
@@ -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