r3195 - in packages/trunk/warsow/debian: . patches scripts

Andres Mejia ceros-guest at alioth.debian.org
Mon Jul 2 21:05:24 UTC 2007 

Author: ceros-guest
Date: 2007-07-02 21:05:23 +0000 (Mon, 02 Jul 2007)
New Revision: 3195

Modified:
   packages/trunk/warsow/debian/
   packages/trunk/warsow/debian/changelog
   packages/trunk/warsow/debian/control
   packages/trunk/warsow/debian/patches/makefile_modifications.dpatch
   packages/trunk/warsow/debian/rules
   packages/trunk/warsow/debian/scripts/warsow
   packages/trunk/warsow/debian/warsow-server.6
   packages/trunk/warsow/debian/warsow-server.install
   packages/trunk/warsow/debian/warsow.6
   packages/trunk/warsow/debian/warsow.desktop
   packages/trunk/warsow/debian/warsow.install
   packages/trunk/warsow/debian/warsow.menu
Log:
New version (0.31) was released.


Property changes on: packages/trunk/warsow/debian
___________________________________________________________________
Name: svn-bp:origUrl
   + http://pkg-games.alioth.debian.org/tarballs/warsow_0.31.orig.tar.gz

Modified: packages/trunk/warsow/debian/changelog
===================================================================
--- packages/trunk/warsow/debian/changelog	2007-07-02 20:47:29 UTC (rev 3194)
+++ packages/trunk/warsow/debian/changelog	2007-07-02 21:05:23 UTC (rev 3195)
@@ -1,4 +1,4 @@
-warsow (0.3-1) UNRELEASED; urgency=low
+warsow (0.31-1) UNRELEASED; urgency=low
 
   * Initial release (Closes: #375430)
 

Modified: packages/trunk/warsow/debian/control
===================================================================
--- packages/trunk/warsow/debian/control	2007-07-02 20:47:29 UTC (rev 3194)
+++ packages/trunk/warsow/debian/control	2007-07-02 21:05:23 UTC (rev 3195)
@@ -8,7 +8,7 @@
 
 Package: warsow
 Architecture: any
-Depends: ${shlibs:Depends}, warsow-data (>= 0.3), warsow-data (<< 0.4)
+Depends: ${shlibs:Depends}, warsow-data (>= 0.31), warsow-data (<< 0.32)
 Description: A comic-style fast-paced 3D ego-shooter
  Warsow is a fast-paced 3D ego-shooter with colorful graphics which look like 
  in comic (black lines around things; deliberatly surrealistic graphics) or 
@@ -22,7 +22,7 @@
 
 Package: warsow-server
 Architecture: any
-Depends: ${shlibs:Depends}, warsow-data (>= 0.3), warsow-data (<< 0.4)
+Depends: ${shlibs:Depends}, warsow-data (>= 0.31), warsow-data (<< 0.32)
 Description: Server for the Warsow 3D ego-shooter game
  Warsow is a fast-paced 3D ego-shooter with colorful graphics which look like 
  in comic (black lines around things; deliberatly surrealistic graphics) or 

Modified: packages/trunk/warsow/debian/patches/makefile_modifications.dpatch
===================================================================
--- packages/trunk/warsow/debian/patches/makefile_modifications.dpatch	2007-07-02 20:47:29 UTC (rev 3194)
+++ packages/trunk/warsow/debian/patches/makefile_modifications.dpatch	2007-07-02 21:05:23 UTC (rev 3195)
@@ -25,20 +25,26 @@
 esac
 exit 0
 
---- source/Makefile~	2007-06-15 21:13:12.000000000 -0400
-+++ source/Makefile	2007-06-16 00:32:35.000000000 -0400
-@@ -35,8 +35,8 @@
- LD=gcc
+--- warsow_0.31/source/Makefile~	2007-07-02 13:25:19.000000000 -0400
++++ warsow_0.31/source/Makefile	2007-07-02 13:40:51.000000000 -0400
+@@ -31,12 +31,11 @@
+ CC=i586-mingw32msvc-gcc
+ LD=i586-mingw32msvc-gcc
+ else
+-CC?=gcc
+-LD=gcc
++CC=$(DEB_HOST_GNU_TYPE)-gcc
++LD=$(DEB_HOST_GNU_TYPE)-gcc
  
- # this nice line comes from the linux kernel makefile
+-# this nice line comes from the linux kernel makefile
 -BASE_ARCH:=$(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc/ -e s/sparc64/sparc/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/alpha/axp/)
 -OS=$(shell uname)
-+BASE_ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
-+OS=$(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
++BASE_ARCH:=$(shell dpkg-architecture -qDEB_HOST_ARCH)
++OS=$(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
  
  ifeq ($(OS),FreeBSD)
  ARCH=freebsd_$(BASE_ARCH)
-@@ -47,7 +47,7 @@
+@@ -47,7 +46,7 @@
  SHARED_LIBRARY_EXTENSION=so
  endif
  
@@ -47,14 +53,14 @@
  BINDIR=release
  
  DEPENDFILE_CLIENT=$(BUILDDIR)/client/Makefile.d
-@@ -96,11 +96,11 @@
+@@ -96,11 +95,11 @@
  
  CLIENT_EXE=warsow_$(ARCH).exe
  SERVER_EXE=wsw_server_$(ARCH).exe
 -else # USE_MINGW
 -LOCALBASE?=/usr/local
 +else # when USE_MINGW=NO
-+#LOCALBASE?=/usr/local //shouldn't be using /usr/local
++#LOCALBASE?=/usr/local #shouldn't be using /usr/local
  X11BASE?=/usr/X11R6
  
 -CFLAGS_COMMON=$(CFLAGS) -I. -I$(LOCALBASE)/include -I$(X11BASE)/include -Wall
@@ -62,7 +68,7 @@
  CFLAGS_RELEASE=-O2 -fno-strict-aliasing -ffast-math -funroll-loops -DNDEBUG
  CFLAGS_DEBUG=-O0 -ggdb -D_DEBUG
  ifeq ($(DEBUG_BUILD),YES)
-@@ -114,16 +114,12 @@
+@@ -114,16 +113,12 @@
  CFLAGS_MODULE=-DPIC -fPIC
  
  ifeq ($(OS),FreeBSD)
@@ -81,7 +87,7 @@
  
  LDFLAGS_CLIENT=-ljpeg -lz -L$(X11BASE)/$(LIB) -lX11 -lXext -lXxf86dga -lXxf86vm -lXinerama $(shell curl-config --libs)
  LDFLAGS_DED=-lz
-@@ -149,8 +145,8 @@
+@@ -149,8 +144,8 @@
  LDFLAGS_QF=$(shell $(SDL_CONFIG) --libs) -lvorbisfile
  endif # BUILD_SND_QF
  

Modified: packages/trunk/warsow/debian/rules
===================================================================
--- packages/trunk/warsow/debian/rules	2007-07-02 20:47:29 UTC (rev 3194)
+++ packages/trunk/warsow/debian/rules	2007-07-02 21:05:23 UTC (rev 3195)
@@ -2,23 +2,27 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# Needed for q2engine/warsow makefile
-Q2ARCH=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
+# Needed for cross-compiling.
+DEB_HOST_GNU_TYPE=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 
+# Needed for linking proper files
+Q2ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
+
 include /usr/share/dpatch/dpatch.make
 
 build: patch build-stamp
 build-stamp:
 	dh_testdir
-	cd source && $(MAKE) BUILD_DEBUG=NO
+	cd warsow_0.31/source && $(MAKE) BUILD_DEBUG=NO
 	touch build-stamp
 
 clean: clean-patched unpatch
 clean-patched:
 	dh_testdir
 	dh_testroot
-	cd source && $(MAKE) clean
-	rm -rf source/build source/release source/build$(Q2ARCH)
+	cd warsow_0.31/source && $(MAKE) clean
+	rm -rf warsow_0.31/source/build warsow_0.31/source/release \
+		warsow_0.31/source/build$(Q2ARCH)
 	rm -f build-stamp
 	dh_clean
 

Modified: packages/trunk/warsow/debian/scripts/warsow
===================================================================
--- packages/trunk/warsow/debian/scripts/warsow	2007-07-02 20:47:29 UTC (rev 3194)
+++ packages/trunk/warsow/debian/scripts/warsow	2007-07-02 21:05:23 UTC (rev 3195)
@@ -29,11 +29,21 @@
  -h, --help              Display this text\n\
  +<internal command> ... Pass engine commands to the binary\n"
 
+QUIET=0
+
 case "$1" in
 	-h|--help)
 		echo -e ${HELP}
 		exit 0
 		;;
+	-q|--quiet)
+		QUIET=1
+		shift
+		;;
 esac
 
-exec /usr/lib/games/warsow/warsow_bin $PARAMS "$@"
+if [ ${QUIET} = 1 ]; then
+	exec /usr/lib/games/warsow/warsow_bin $PARAMS "$@" >/dev/null 2>&1
+else
+	exec /usr/lib/games/warsow/warsow_bin $PARAMS "$@"
+fi

Modified: packages/trunk/warsow/debian/warsow-server.6
===================================================================
--- packages/trunk/warsow/debian/warsow-server.6	2007-07-02 20:47:29 UTC (rev 3194)
+++ packages/trunk/warsow/debian/warsow-server.6	2007-07-02 21:05:23 UTC (rev 3195)
@@ -18,7 +18,7 @@
 Display a short help summary
 .PP
 For further available options passed to the Warsow server binary, look into the files in /usr/share/doc/warsow-data.
-.BR
+.PP
 .SH SEE ALSO
 .BR warsow (6)
 .br

Modified: packages/trunk/warsow/debian/warsow-server.install
===================================================================
--- packages/trunk/warsow/debian/warsow-server.install	2007-07-02 20:47:29 UTC (rev 3194)
+++ packages/trunk/warsow/debian/warsow-server.install	2007-07-02 21:05:23 UTC (rev 3195)
@@ -1,2 +1,2 @@
-source/release/wsw_server_bin usr/lib/games/warsow
+warsow_0.31/source/release/wsw_server_bin usr/lib/games/warsow
 debian/scripts/warsow-server usr/games

Modified: packages/trunk/warsow/debian/warsow.6
===================================================================
--- packages/trunk/warsow/debian/warsow.6	2007-07-02 20:47:29 UTC (rev 3194)
+++ packages/trunk/warsow/debian/warsow.6	2007-07-02 21:05:23 UTC (rev 3195)
@@ -16,9 +16,12 @@
 .TP
 \fB\-h\fR, \fB\-\-help\fR
 Display a short help summary
+.TP
+\fB\-q\fR, \fB\-\-quiet\fR
+Disable console output.
 .PP
 For further available options passed to the Warsow binary, look into the files in /usr/share/doc/warsow.
-.BR
+.PP
 .SH SEE ALSO
 .BR warsow-server (6)
 .br

Modified: packages/trunk/warsow/debian/warsow.desktop
===================================================================
--- packages/trunk/warsow/debian/warsow.desktop	2007-07-02 20:47:29 UTC (rev 3194)
+++ packages/trunk/warsow/debian/warsow.desktop	2007-07-02 21:05:23 UTC (rev 3195)
@@ -3,8 +3,8 @@
 Comment=A fast-paced, networked 3D first person shooter game with Tron-like graphics
 Comment[de]=Ein netzwerkfähiges, hektisches 3D Ego-Shooter Spiel mit Tron-artiger Grafik
 Comment[ro_RO]=Un joc alert cu împuşcături, perspectivă personală şi cu grafică similară lui Tron
-Exec=/usr/games/warsow
-Icon=warsow.xpm
+Exec=/usr/games/warsow --quiet
+Icon=warsow
 Terminal=false
 Type=Application
 Categories=Game;ArcadeGame;

Modified: packages/trunk/warsow/debian/warsow.install
===================================================================
--- packages/trunk/warsow/debian/warsow.install	2007-07-02 20:47:29 UTC (rev 3194)
+++ packages/trunk/warsow/debian/warsow.install	2007-07-02 21:05:23 UTC (rev 3195)
@@ -1,6 +1,6 @@
-source/release/warsow_bin usr/lib/games/warsow
-source/release/libs usr/lib/games/warsow
-source/release/basewsw usr/lib/games/warsow
+warsow_0.31/source/release/warsow_bin usr/lib/games/warsow
+warsow_0.31/source/release/libs usr/lib/games/warsow
+warsow_0.31/source/release/basewsw usr/lib/games/warsow
 debian/scripts/warsow usr/games
 debian/warsow.xpm usr/share/pixmaps
 debian/warsow.desktop usr/share/applications

Modified: packages/trunk/warsow/debian/warsow.menu
===================================================================
--- packages/trunk/warsow/debian/warsow.menu	2007-07-02 20:47:29 UTC (rev 3194)
+++ packages/trunk/warsow/debian/warsow.menu	2007-07-02 21:05:23 UTC (rev 3195)
@@ -1,5 +1,5 @@
 ?package(warsow):needs="X11" \
   section="Games/Arcade" \
-  title="Warsow" command="/usr/games/warsow" \
+  title="Warsow" command="/usr/games/warsow --quiet" \
   longtitle="A fast-paced, networked 3D first person shooter game with Tron-like graphics" \
   icon="warsow.xpm"

More information about the Pkg-games-commits mailing list