r8087 - in packages/trunk/openarena/debian: . patches

[Ansgar Burchardt]

Author: ansgar-guest
Date: 2008-09-05 18:28:43 +0000 (Fri, 05 Sep 2008)
New Revision: 8087

Modified:
   packages/trunk/openarena/debian/changelog
   packages/trunk/openarena/debian/control
   packages/trunk/openarena/debian/patches/10_fix_build_and_binary_on_alpha.dpatch
   packages/trunk/openarena/debian/rules
Log:
* Remove non-free code/tools/lcc (Closes: #496346)
  + Remove hunk from patch 10_fix_build_and_binary_on_alpha
  + debian/rules: Add BUILD_GAME_QVM=0 to $(MAKE) call
    (thanks to Peter De Wachter)
* Remove code/libs containing binary libraries for Mac OS X and Win32
* debian/rules: replace ${source:Upstream-Version} by 0.7.7
  because the variable also cotains the `+ds1' part
* Add -fsigned-char to compiler options (Closes: #487970)
  (thanks to Peter De Wachter)
* Add myself to Uploaders

Modified: packages/trunk/openarena/debian/changelog
===================================================================
--- packages/trunk/openarena/debian/changelog	2008-09-05 18:01:34 UTC (rev 8086)
+++ packages/trunk/openarena/debian/changelog	2008-09-05 18:28:43 UTC (rev 8087)
@@ -1,5 +1,15 @@
-openarena (0.7.7-2) UNRELEASED; urgency=low
+openarena (0.7.7+ds1-1) UNRELEASED; urgency=low
 
+  * Remove non-free code/tools/lcc (Closes: #496346)
+    + Remove hunk from patch 10_fix_build_and_binary_on_alpha
+    + debian/rules: Add BUILD_GAME_QVM=0 to $(MAKE) call
+      (thanks to Peter De Wachter)
+  * Remove code/libs containing binary libraries for Mac OS X and Win32
+  * debian/rules: replace ${source:Upstream-Version} by 0.7.7
+    because the variable also cotains the `+ds1' part
+  * Add -fsigned-char to compiler options (Closes: #487970)
+    (thanks to Peter De Wachter)
+  * Add myself to Uploaders
   * debian/control: Remove article from beginning of short description,
     don't start short description with a capital letter
 

Modified: packages/trunk/openarena/debian/control
===================================================================
--- packages/trunk/openarena/debian/control	2008-09-05 18:01:34 UTC (rev 8086)
+++ packages/trunk/openarena/debian/control	2008-09-05 18:28:43 UTC (rev 8087)
@@ -2,7 +2,7 @@
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Bruno "Fuddl" Kleinert <fuddl at tauware.de>
+Uploaders: Bruno "Fuddl" Kleinert <fuddl at tauware.de>, Ansgar Burchardt <ansgar at 43-1.org>
 Build-Depends: debhelper (>= 5.0.51), libsdl1.2-dev, libopenal-dev, imagemagick, libcurl4-gnutls-dev, sharutils, dpatch, libvorbis-dev
 Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/openarena/
@@ -11,7 +11,7 @@
 
 Package: openarena
 Architecture: any
-Depends: ${shlibs:Depends}, openarena-data (>= ${source:Upstream-Version})
+Depends: ${shlibs:Depends}, openarena-data (>= 0.7.7)
 Description: fast-paced 3D first-person shooter
  OpenArena is an open-source content package for ioQuake3 licensed under the
  GPL, effectively creating a free stand-alone game. Though OpenArena is a free
@@ -24,7 +24,7 @@
 
 Package: openarena-server
 Architecture: any
-Depends: ${shlibs:Depends}, openarena-data (>= ${source:Upstream-Version})
+Depends: ${shlibs:Depends}, openarena-data (>= 0.7.7)
 Description: game server for the game OpenArena
  OpenArena is an open-source content package for ioQuake3 licensed under the
  GPL, effectively creating a free stand-alone game. Though OpenArena is a free

Modified: packages/trunk/openarena/debian/patches/10_fix_build_and_binary_on_alpha.dpatch
===================================================================
--- packages/trunk/openarena/debian/patches/10_fix_build_and_binary_on_alpha.dpatch	2008-09-05 18:01:34 UTC (rev 8086)
+++ packages/trunk/openarena/debian/patches/10_fix_build_and_binary_on_alpha.dpatch	2008-09-05 18:28:43 UTC (rev 8087)
@@ -46,16 +46,3 @@
      BASE_CFLAGS += -DNO_VM_COMPILED
      RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -ffast-math -funroll-loops \
        -fomit-frame-pointer -fexpensive-optimizations
-diff -urNad openarena-0.7.6~/code/tools/lcc/cpp/cpp.h openarena-0.7.6/code/tools/lcc/cpp/cpp.h
---- openarena-0.7.6~/code/tools/lcc/cpp/cpp.h	2008-04-05 00:16:32.000000000 +0200
-+++ openarena-0.7.6/code/tools/lcc/cpp/cpp.h	2008-04-23 23:18:40.364923667 +0200
-@@ -10,9 +10,7 @@
- #define NULL	0
- #endif
- 
--#ifndef __alpha
- typedef unsigned char uchar;
--#endif
- 
- enum toktype { END, UNCLASS, NAME, NUMBER, STRING, CCON, NL, WS, DSHARP,
- 		EQ, NEQ, LEQ, GEQ, LSH, RSH, LAND, LOR, PPLUS, MMINUS,

Modified: packages/trunk/openarena/debian/rules
===================================================================
--- packages/trunk/openarena/debian/rules	2008-09-05 18:01:34 UTC (rev 8086)
+++ packages/trunk/openarena/debian/rules	2008-09-05 18:28:43 UTC (rev 8087)
@@ -6,6 +6,8 @@
 # copied from ioq3 make scripts
 Q3ARCH=$(shell uname -m | sed -e s/i.86/i386/)
 
+CFLAGS += -fsigned-char
+
 build: build-stamp
 build-stamp: patch
 	dh_testdir
@@ -13,6 +15,7 @@
 			USE_OPENAL=1 \
 			USE_OPENAL_DLOPEN=0 \
 			USE_CODEC_VORBIS=1 \
+			BUILD_GAME_QVM=0 \
 			DEFAULT_BASEDIR=/usr/share/games/openarena
 	touch $@