r7649 - in packages/trunk/worldofpadman/debian: . patches

[Jack Coulter]

Author: jscinoz-guest
Date: 2008-07-01 13:50:00 +0000 (Tue, 01 Jul 2008)
New Revision: 7649

Added:
   packages/trunk/worldofpadman/debian/patches/
   packages/trunk/worldofpadman/debian/patches/remove-werror
   packages/trunk/worldofpadman/debian/patches/series
Modified:
   packages/trunk/worldofpadman/debian/control
   packages/trunk/worldofpadman/debian/rules
Log:
remove werror from q3asm makefile

Modified: packages/trunk/worldofpadman/debian/control
===================================================================
--- packages/trunk/worldofpadman/debian/control	2008-07-01 13:39:18 UTC (rev 7648)
+++ packages/trunk/worldofpadman/debian/control	2008-07-01 13:50:00 UTC (rev 7649)
@@ -2,7 +2,8 @@
 Section: contrib/games
 Priority: optional
 Maintainer: Jack Coulter <jscinoz at gmail.com>
-Build-Depends: debhelper (>= 5.0.51~), libsdl1.2-dev (>= 1.2.13), libvorbis-dev (>= 1.2.0), libopenal-dev (>= 1.0.0.8)
+Build-Depends: debhelper (>= 5.0.51~), libsdl1.2-dev (>= 1.2.13),
+libvorbis-dev (>= 1.2.0), libopenal-dev (>= 1.0.0.8), quilt
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/worldofpadman
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/worldofpadman/?op=log
 Homepage: http://www.worldofpadman.com/

Added: packages/trunk/worldofpadman/debian/patches/remove-werror
===================================================================
--- packages/trunk/worldofpadman/debian/patches/remove-werror	                        (rev 0)
+++ packages/trunk/worldofpadman/debian/patches/remove-werror	2008-07-01 13:50:00 UTC (rev 7649)
@@ -0,0 +1,13 @@
+Index: worldofpadman-1.1/code/tools/asm/Makefile
+===================================================================
+--- worldofpadman-1.1.orig/code/tools/asm/Makefile	2008-07-01 23:46:40.000000000 +1000
++++ worldofpadman-1.1/code/tools/asm/Makefile	2008-07-01 23:46:50.000000000 +1000
+@@ -13,7 +13,7 @@
+ endif
+ 
+ CC=gcc
+-Q3ASM_CFLAGS=-O2 -Wall -Werror -fno-strict-aliasing
++Q3ASM_CFLAGS=-O2 -Wall -fno-strict-aliasing
+ 
+ ifeq ($(PLATFORM),darwin)
+   LCC_CFLAGS += -DMACOS_X=1

Added: packages/trunk/worldofpadman/debian/patches/series
===================================================================
--- packages/trunk/worldofpadman/debian/patches/series	                        (rev 0)
+++ packages/trunk/worldofpadman/debian/patches/series	2008-07-01 13:50:00 UTC (rev 7649)
@@ -0,0 +1 @@
+remove-werror

Modified: packages/trunk/worldofpadman/debian/rules
===================================================================
--- packages/trunk/worldofpadman/debian/rules	2008-07-01 13:39:18 UTC (rev 7648)
+++ packages/trunk/worldofpadman/debian/rules	2008-07-01 13:50:00 UTC (rev 7649)
@@ -9,6 +9,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/quilt/quilt.make
+
 DEBIAN_DIR:=$(shell echo ${MAKEFILE_LIST} | awk '{print $$1}' | xargs dirname)
 DEB_SOURCE_PACKAGE:=$(shell dpkg-parsechangelog | grep Source |cut -f2 -d" ")
 VERSION:=$(shell dpkg-parsechangelog | grep Version | cut -d" " -f2|cut -d"-" -f1)
@@ -35,11 +37,11 @@
 
 build: build-arch
 build-arch: build-arch-stamp
-build-arch-stamp:
+build-arch-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 	BUILD_GAME_SO=0 BUILD_GAME_QVM=0 $(MAKE) $(BUILD_FLAGS) # We don't need these
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f wop-engine wopded