[arch-commits] Commit in tuxracer/repos (6 files)

Sun Mar 15 00:57:15 UTC 2009

Date: Saturday, March 14, 2009 @ 20:57:15
  Author: allan
Revision: 29961

fix svn conflict

Added:
  tuxracer/repos/extra-i686/tuxracer-datadir.patch
    (from rev 29960, tuxracer/trunk/tuxracer-datadir.patch)
  tuxracer/repos/extra-i686/tuxracer.desktop
    (from rev 29960, tuxracer/trunk/tuxracer.desktop)
  tuxracer/repos/extra-i686/tuxracer.png
    (from rev 29960, tuxracer/trunk/tuxracer.png)
Modified:
  tuxracer/repos/extra-i686/	(properties)
  tuxracer/repos/extra-i686/PKGBUILD
Deleted:
  tuxracer/repos/extra-i686/tuxracer-0.61.patch.bz2

------------------------+
 PKGBUILD               |   57 +++++++++++++++++----------
 tuxracer-datadir.patch |   11 +++++
 tuxracer.desktop       |   96 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 143 insertions(+), 21 deletions(-)


Property changes on: tuxracer/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /tuxracer/trunk:1
   + /tuxracer/trunk:1-29960

Modified: extra-i686/PKGBUILD
===================================================================

--- extra-i686/PKGBUILD	2009-03-15 00:55:37 UTC (rev 29960)
+++ extra-i686/PKGBUILD	2009-03-15 00:57:15 UTC (rev 29961)
@@ -1,31 +1,46 @@
 # $Id$
-# Maintainer: arjan <arjan at archlinux.org>
+# Maintainer: Allan McRae <allan at archlinux.org>
 # Contributor: Sarah Hay <sarahhay at mb.sympatico.ca> and patched by orelien <aurelien.foret at wanadoo.fr>
 
 pkgname=tuxracer
 pkgver=0.61
-pkgrel=7
-pkgdesc="Tux Racer lets you take on the role of Tux the Linux Penguin as he races down steep, snow-covered mountains."
-arch=(i686 x86_64)
+pkgrel=8
+pkgdesc="Take on the role of Tux as he races down steep, snow-covered mountains."
+arch=('i686' 'x86_64')
+url="http://tuxracer.sourceforge.net/"
 license=('GPL')
-depends=('sdl' 'sdl_mixer' 'tcl>=8.5.0' 'glibc' 'audiofile' 'gcc-libs' 'libogg' 'libvorbis' 'libxi' 'libxmu' 'mesa' 'libgl')
-install=
-source=(http://downloads.sourceforge.net/tuxracer/$pkgname-$pkgver.tar.gz http://downloads.sourceforge.net/tuxracer/tuxracer-data-0.61.tar.gz $pkgname-$pkgver.patch.bz2 $pkgname-pasting.patch)
-md5sums=('206e8197ceaf0f00b25d4e2b4156e563' 'aef877fee9e1a56483ff01fbdfb1e4b3'\
-         '785d5ec7b8353a8f6d03152b610c8dd8' '9cab49d96fb17aff1ab67d755885242f')
-url="http://tuxracer.sourceforge.net/"
+depends=('sdl' 'sdl_mixer' 'tcl>=8.5.0' 'glibc' 'audiofile' 'libogg' 'libvorbis' 'libxi' 'libxmu' 'mesa' 'libgl')
+source=(http://downloads.sourceforge.net/tuxracer/$pkgname-$pkgver.tar.gz
+        http://downloads.sourceforge.net/tuxracer/tuxracer-data-0.61.tar.gz 
+        $pkgname-datadir.patch
+        $pkgname-pasting.patch
+        $pkgname.desktop
+        $pkgname.png)
+md5sums=('206e8197ceaf0f00b25d4e2b4156e563'
+         'aef877fee9e1a56483ff01fbdfb1e4b3'
+         'a96a26d6e22b91b5f3f3b0fb29cef589'
+         '9cab49d96fb17aff1ab67d755885242f'
+         'c23baf2f2bad6286b1d3c6e4b9bd457d'
+         'd62cbbea6264826ad10ee1991e05f62f')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  bzip2 -d ../$pkgname-$pkgver.patch.bz2
-  patch -Np1 -i ../$pkgname-$pkgver.patch
-  patch -Np1 -i ../$pkgname-pasting.patch
-  CFLAGS="$CFLAGS -DGLX_GLXEXT_LEGACY" ./configure --prefix=/usr --with-tcl-lib-name=tcl8.5 --with-tcl-header=tcl.h
+  cd $srcdir/$pkgname-$pkgver
+  patch -Np1 -i $srcdir/$pkgname-datadir.patch
+  patch -Np1 -i $srcdir/$pkgname-pasting.patch
+  
+  CFLAGS="$CFLAGS -DGLX_GLXEXT_LEGACY" \
+    ./configure --prefix=/usr --with-tcl-lib-name=tcl8.5 --with-tcl-header=tcl.h
   make || return 1
-  make prefix=$startdir/pkg/usr install
-  mkdir -p $startdir/pkg/usr/share/tuxracer
-  mv $startdir/src/$pkgname-data-$pkgver/* $startdir/pkg/usr/share/tuxracer
-  chown -R root:root $startdir/pkg/usr/share
-  find $startdir/pkg/usr/share -type f -exec chmod 644 {} \;
-  find $startdir/pkg/usr/share -type d -exec chmod 755 {} \;
+  make prefix=$pkgdir/usr install
+  
+  # install data
+  install -dm755 $pkgdir/usr/share/tuxracer
+  mv $srcdir/$pkgname-data-$pkgver/* $pkgdir/usr/share/tuxracer
+  find $pkgdir/usr/share/tuxracer -type f -exec chmod 644 {} \;
+  find $pkgdir/usr/share/tuxracer -type d -exec chmod 755 {} \;
+
+  # install .desktop file and icon
+  install -dm755 $pkgdir/usr/share/{applications,pixmaps}
+  install -m644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications
+  install -m644 $srcdir/$pkgname.png $pkgdir/usr/share/pixmaps
 }

Deleted: extra-i686/tuxracer-0.61.patch.bz2
===================================================================
(Binary files differ)

Copied: tuxracer/repos/extra-i686/tuxracer-datadir.patch (from rev 29960, tuxracer/trunk/tuxracer-datadir.patch)
===================================================================
--- extra-i686/tuxracer-datadir.patch	                        (rev 0)
+++ extra-i686/tuxracer-datadir.patch	2009-03-15 00:57:15 UTC (rev 29961)
@@ -0,0 +1,11 @@
+--- tuxracer-0.61/src/game_config.c	2003-01-09 22:47:54.000000000 +0000
++++ tuxracer-0.61-new/src/game_config.c	2003-01-09 22:48:41.000000000 +0000
+@@ -79,7 +79,7 @@
+ #  if defined( WIN32 )
+ #    define DATA_DIR "."
+ #  else
+-#    define DATA_DIR "/usr/local/share/tuxracer"
++#    define DATA_DIR "/usr/share/tuxracer"
+ #  endif /* defined( WIN32 ) */
+ #endif
+ 

Copied: tuxracer/repos/extra-i686/tuxracer.desktop (from rev 29960, tuxracer/trunk/tuxracer.desktop)
===================================================================
--- extra-i686/tuxracer.desktop	                        (rev 0)
+++ extra-i686/tuxracer.desktop	2009-03-15 00:57:15 UTC (rev 29961)
@@ -0,0 +1,96 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Tux Racer
+Exec=tuxracer
+Icon=tuxracer
+Terminal=false
+Type=Application
+Categories=Game;ArcadeGame;
+StartupNotify=false
+Comment=An OpenGL racing game featuring Tux, the Linux mascot
+Comment[de]=Ein OpenGL-Rennen mit Tux, dem Linux-Maskottchen
+Comment[hu]=OpenGL-es lesiklójáték Tuxszal, a Linux-pingvinnel
+Comment[nn]=Eit OpenGL-basert akespel med Linux-maskoten Tux.
+Comment[pl]=Gra wyścigowa z pingwinem Tuksem w roli głównej
+GenericName=Racing Game
+GenericName[af]=Resies Speletjie
+GenericName[ar]=لعبة سباق
+GenericName[az]=Yarış Oyunu
+GenericName[be]=Гонкі
+GenericName[bg]=Рали с пингвин
+GenericName[bn]=রেস খেলা
+GenericName[bs]=Trkaća igra
+GenericName[ca]=Joc de carreres
+GenericName[cs]=Závodní hra
+GenericName[csb]=Gòńbë
+GenericName[cy]=Gêm Rasio
+GenericName[da]=Racerspil
+GenericName[de]=Ein Wettrennen
+GenericName[el]=Παιχνίδι αγώνων ταχύτητας
+GenericName[eo]=Skikonkura ludo kun pingveno
+GenericName[es]=Juego de carreras
+GenericName[et]=Kihutamismäng
+GenericName[eu]=Lasterketa jokoa
+GenericName[fa]=بازی مسابقه
+GenericName[fi]=Kilpa-autopeli
+GenericName[fo]=Kappkoyringarspæl
+GenericName[fr]=Jeu de course
+GenericName[fy]=Racespul
+GenericName[ga]=Cluiche Rásála
+GenericName[gl]=Xogo de Carreiras
+GenericName[he]=משחק מירוצים
+GenericName[hi]=दौड़ का खेल
+GenericName[hr]=Trkačka igra
+GenericName[hsb]=Napřemojězdźenja
+GenericName[hu]=Lesiklójáték
+GenericName[id]=Permainan Balap
+GenericName[is]=Tux á fleygiferð
+GenericName[it]=Gara di corsa
+GenericName[ja]=レースゲーム
+GenericName[ka]=თამაში რბოლა
+GenericName[kk]=Бәйге ойыны
+GenericName[km]=ល្បែងប្រណាំង
+GenericName[ko]=레이싱 게임
+GenericName[lo]=ເກມແຂ່ງຂັນຄວາມໄວ
+GenericName[lt]=Lenktynių žaidimas
+GenericName[lv]=Braukšanas Spēle
+GenericName[mk]=Тркачка игра
+GenericName[mn]=Уралдааны тоглоом
+GenericName[ms]=Permainan Lumba
+GenericName[mt]=Logħba ta' tiġrijiet
+GenericName[nb]=Bilspill
+GenericName[nds]=Wettrenn-Speel
+GenericName[ne]=दौडने खेल
+GenericName[nl]=Racespel
+GenericName[nn]=Racerspel
+GenericName[nso]=Papadi yago Kitimisana
+GenericName[pa]=ਦੌੜ
+GenericName[pl]=Wyścigi
+GenericName[pt]=Jogo de Corridas
+GenericName[pt_BR]=Corrida
+GenericName[ro]=Joc de raliu
+GenericName[ru]=Игра-гонки
+GenericName[rw]=Umukino Isiganwa
+GenericName[se]=Racerspeallu
+GenericName[sk]=Závody
+GenericName[sl]=Dirkalna igra
+GenericName[sr]=Тркачка игра
+GenericName[sr at Latn]=Trkačka igra
+GenericName[ss]=Umdlalo wekugijimisa
+GenericName[sv]=Racerspel
+GenericName[ta]=ரேசிங் விளையாட்டு
+GenericName[te]=రేసింగ్ ఆట
+GenericName[tg]=Бозии рониш
+GenericName[th]=เกมแข่งขันความเร็ว
+GenericName[tr]=Yarış oyunu
+GenericName[tt]=Uzış Uyını
+GenericName[uk]=Гра в перегони
+GenericName[uz]=Poyga oʻyini
+GenericName[uz at cyrillic]=Пойга ўйини
+GenericName[ven]=Ramitatisano wa Mutambo
+GenericName[vi]=Trò đua xe
+GenericName[wa]=Djeu d' coûsse
+GenericName[xh]=Umdlalo Wogqatso
+GenericName[zh_CN]=企鹅滑雪游戏
+GenericName[zh_TW]=賽車遊戲
+GenericName[zu]=Umdlalo Womjaho

Copied: tuxracer/repos/extra-i686/tuxracer.png (from rev 29960, tuxracer/trunk/tuxracer.png)
===================================================================
(Binary files differ)


