r3461 - in packages/trunk/warsow/debian: . patches

Andres Mejia ceros-guest at alioth.debian.org
Wed Jul 25 21:29:28 UTC 2007


Author: ceros-guest
Date: 2007-07-25 21:29:28 +0000 (Wed, 25 Jul 2007)
New Revision: 3461

Added:
   packages/trunk/warsow/debian/patches/fix_different_archs.diff
   packages/trunk/warsow/debian/patches/fix_off_by_one.diff
   packages/trunk/warsow/debian/patches/makefile_modifications.diff
   packages/trunk/warsow/debian/patches/series
Removed:
   packages/trunk/warsow/debian/patches/00list
   packages/trunk/warsow/debian/patches/makefile_modifications.dpatch
Modified:
   packages/trunk/warsow/debian/changelog
   packages/trunk/warsow/debian/control
   packages/trunk/warsow/debian/rules
Log:
Checking in lots of modifications. Please see debian/changelog

Modified: packages/trunk/warsow/debian/changelog
===================================================================
--- packages/trunk/warsow/debian/changelog	2007-07-25 21:25:29 UTC (rev 3460)
+++ packages/trunk/warsow/debian/changelog	2007-07-25 21:29:28 UTC (rev 3461)
@@ -1,3 +1,25 @@
+warsow (0.31.dfsg-3) unstable; urgency=low
+
+  [ Andres Mejia ]
+  * Modified debian/rules.
+    + Setting up patch/unpatch targets to use quilt
+    + Now uses same uname commands found in Makefile BASE_ARCH variable for
+      naming shared objects.
+  * Modified makefile_modifications patch.
+    + BASE_ARCH changed from using dpkg-architecture to uname (Closes: 434131)
+  * Fixing FTBFS in ia64 (Closes: #433590)
+  * Fix off by one error for big endian systems (Thanks Michel Dänzer).
+    + (Closes: #433671)
+    + Also fix bug with powerpc not loading correct module (same bug).
+    + Also added fix for other architectures.
+  * Changed from using dpatch to using quilt.
+  * Added extra build-depends package "tofrodos".
+    + Was needed to patch some files that had DOS carraige return.
+    + Modified debian/rules to use fromdos/todos utilities.
+  * Took out build-depends of libssl-dev since it isn't needed.
+
+ -- Andres Mejia <mcitadel at gmail.com>  Sun, 22 Jul 2007 22:53:25 -0400
+
 warsow (0.31.dfsg-2) unstable; urgency=low
 
   [ Andres Mejia ]

Modified: packages/trunk/warsow/debian/control
===================================================================
--- packages/trunk/warsow/debian/control	2007-07-25 21:25:29 UTC (rev 3460)
+++ packages/trunk/warsow/debian/control	2007-07-25 21:29:28 UTC (rev 3461)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Gonéri Le Bouder <goneri at rulezlan.org>, Bruno "Fuddl" Kleinert <fuddl at gmx.de>, Andres Mejia <mcitadel at gmail.com>
-Build-Depends: debhelper (>= 5), dpatch, libopenal-dev, libjpeg62-dev, libvorbis-dev, libsdl1.2-dev, zlib1g-dev, libx11-dev, libxext-dev, libxxf86vm-dev, libxxf86dga-dev, libxinerama-dev, libcurl4-gnutls-dev | libcurl3-gnutls-dev | libcurl4-openssl-dev | libcurl3-openssl-dev, libkrb5-dev, libidn11-dev, libssl-dev
+Build-Depends: debhelper (>= 5), quilt, tofrodos, libopenal-dev, libjpeg62-dev, libvorbis-dev, libsdl1.2-dev, zlib1g-dev, libx11-dev, libxext-dev, libxxf86vm-dev, libxxf86dga-dev, libxinerama-dev, libcurl4-gnutls-dev | libcurl3-gnutls-dev | libcurl4-openssl-dev | libcurl3-openssl-dev, libkrb5-dev, libidn11-dev
 Standards-Version: 3.7.2
 
 Package: warsow

Deleted: packages/trunk/warsow/debian/patches/00list
===================================================================
--- packages/trunk/warsow/debian/patches/00list	2007-07-25 21:25:29 UTC (rev 3460)
+++ packages/trunk/warsow/debian/patches/00list	2007-07-25 21:29:28 UTC (rev 3461)
@@ -1 +0,0 @@
-makefile_modifications.dpatch

Added: packages/trunk/warsow/debian/patches/fix_different_archs.diff
===================================================================
--- packages/trunk/warsow/debian/patches/fix_different_archs.diff	                        (rev 0)
+++ packages/trunk/warsow/debian/patches/fix_different_archs.diff	2007-07-25 21:29:28 UTC (rev 3461)
@@ -0,0 +1,47 @@
+Index: Fixes some problems on other architectures.
+===================================================================
+--- ./warsow_0.31/source/game/q_shared.h~	2007-07-18 00:52:28.000000000 -0400
++++ ./warsow_0.31/source/game/q_shared.h	2007-07-18 00:53:10.000000000 -0400
+@@ -173,6 +173,33 @@
+ # elif defined(__alpha__)
+ #  define CPUSTRING "axp"
+ #  define ARCH "axp"
++# elif define(__powerpc__)
++#  define CPUSTRING "powerpc"
++#  define ARCH "powerpc"
++# elif define(__powerpc64__)
++#  define CPUSTRING "ppc64"
++#  define ARCH "ppc64"
++# elif define(__arm__)
++#  define CPUSTRING "arm"
++#  define ARCH "arm"
++# elif define(__hppa__)
++#  define CPUSTRING "hppa"
++#  define ARCH "hppa"
++# elif define(__ia64__)
++#  define CPUSTRING "ia64"
++#  define ARCH "ia64"
++# elif define(__m68k__)
++#  define CPUSTRING "m68k"
++#  define ARCH "m68k"
++# elif define(__mips__)
++#  define CPUSTRING "mips"
++#  define ARCH "mips"
++# elif define(__s390__)
++#  define CPUSTRING "s390"
++#  define ARCH "s390"
++# elif define(__sparc__)
++#  define CPUSTRING "sparc"
++#  define ARCH "sparc"
+ # else
+ #  define CPUSTRING "Unknown"
+ #  define ARCH "Unknown"
+@@ -288,7 +312,7 @@
+ # endif
+ #endif
+ 
+-#if (defined(_M_IX86) || defined(__i386__) || defined(__ia64__)) && !defined(C_ONLY)
++#if (defined(_M_IX86) || defined(__i386__)) && !defined(C_ONLY)
+ # define id386
+ #else
+ # ifdef id386

Added: packages/trunk/warsow/debian/patches/fix_off_by_one.diff
===================================================================
--- packages/trunk/warsow/debian/patches/fix_off_by_one.diff	                        (rev 0)
+++ packages/trunk/warsow/debian/patches/fix_off_by_one.diff	2007-07-25 21:29:28 UTC (rev 3461)
@@ -0,0 +1,14 @@
+Index: Fix off by one for big endian systems
+===================================================================
+diff -up -ru warsow-0.31.dfsg.orig/warsow_0.31/source/qcommon/qfiles.h warsow-0.31.dfsg/warsow_0.31/source/qcommon/qfiles.h
+--- ./warsow_0.31/source/qcommon/qfiles.h	2007-06-08 21:23:14.000000000 +0200
++++ ./warsow_0.31/source/qcommon/qfiles.h	2007-07-18 13:18:20.000000000 +0200
+@@ -425,7 +425,7 @@ typedef struct {
+ #define LUMP_VISIBILITY			16
+ #define LUMP_LIGHTARRAY			17
+ 
+-#define	HEADER_LUMPS			17		// 16 for IDBSP
++#define	HEADER_LUMPS			18		// 17 for IDBSP
+ 
+ typedef struct
+ {

Added: packages/trunk/warsow/debian/patches/makefile_modifications.diff
===================================================================
--- packages/trunk/warsow/debian/patches/makefile_modifications.diff	                        (rev 0)
+++ packages/trunk/warsow/debian/patches/makefile_modifications.diff	2007-07-25 21:29:28 UTC (rev 3461)
@@ -0,0 +1,69 @@
+Index: Some makefile modifications
+===================================================================
+--- ./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,8 +31,8 @@
+ 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
+ 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/)
+@@ -47,7 +47,7 @@
+ SHARED_LIBRARY_EXTENSION=so
+ endif
+ 
+-BUILDDIR=build$(ARCH)
++BUILDDIR=build
+ BINDIR=release
+ 
+ DEPENDFILE_CLIENT=$(BUILDDIR)/client/Makefile.d
+@@ -96,11 +96,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
+ X11BASE?=/usr/X11R6
+ 
+-CFLAGS_COMMON=$(CFLAGS) -I. -I$(LOCALBASE)/include -I$(X11BASE)/include -Wall
++CFLAGS_COMMON=$(CFLAGS) -I. -I$(X11BASE)/include -Wall
+ 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 @@
+ CFLAGS_MODULE=-DPIC -fPIC
+ 
+ ifeq ($(OS),FreeBSD)
+-LDFLAGS_COMMON=-L/usr/local/lib -lm
++LDFLAGS_COMMON=-L/usr/lib -lm
+ else
+-LDFLAGS_COMMON=-L/usr/local/lib -ldl -lm
++LDFLAGS_COMMON=-L/usr/lib -ldl -lm
+ endif
+ 
+-ifeq ($(ARCH),x86_64)
+-LIB=lib64
+-else
+ LIB=lib
+-endif
+ 
+ LDFLAGS_CLIENT=-ljpeg -lz -L$(X11BASE)/$(LIB) -lX11 -lXext -lXxf86dga -lXxf86vm -lXinerama $(shell curl-config --libs)
+ LDFLAGS_DED=-lz
+@@ -149,8 +145,8 @@
+ LDFLAGS_QF=$(shell $(SDL_CONFIG) --libs) -lvorbisfile
+ endif # BUILD_SND_QF
+ 
+-CLIENT_EXE=warsow.$(ARCH)
+-SERVER_EXE=wsw_server.$(ARCH)
++CLIENT_EXE=warsow_bin
++SERVER_EXE=wsw_server_bin
+ endif # USE_MINGW
+ 
+ ######################################################################################################


Property changes on: packages/trunk/warsow/debian/patches/makefile_modifications.diff
___________________________________________________________________
Name: svn:executable
   + *

Deleted: packages/trunk/warsow/debian/patches/makefile_modifications.dpatch
===================================================================
--- packages/trunk/warsow/debian/patches/makefile_modifications.dpatch	2007-07-25 21:25:29 UTC (rev 3460)
+++ packages/trunk/warsow/debian/patches/makefile_modifications.dpatch	2007-07-25 21:29:28 UTC (rev 3461)
@@ -1,100 +0,0 @@
-#! /bin/sh -e
-## makefile_modifications.dpatch by Andres Mejia <mcitadel at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch to modify makefile to fix certain build errors.
-
-dir=
-if [ $# -eq 3 -a "$2" = '-d' ]; then
-    pdir="-d $3"
-    dir="$3/"
-elif [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch)
-        patch $pdir -f --no-backup-if-mismatch -p0 < $0
-        ;;
-    -unpatch)
-        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
-        ;;
-    *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1
-esac
-exit 0
-
---- 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
--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_HOST_ARCH)
-+OS=$(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
- 
- ifeq ($(OS),FreeBSD)
- ARCH=freebsd_$(BASE_ARCH)
-@@ -47,7 +46,7 @@
- SHARED_LIBRARY_EXTENSION=so
- endif
- 
--BUILDDIR=build$(ARCH)
-+BUILDDIR=build
- BINDIR=release
- 
- DEPENDFILE_CLIENT=$(BUILDDIR)/client/Makefile.d
-@@ -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
- X11BASE?=/usr/X11R6
- 
--CFLAGS_COMMON=$(CFLAGS) -I. -I$(LOCALBASE)/include -I$(X11BASE)/include -Wall
-+CFLAGS_COMMON=$(CFLAGS) -I. -I$(X11BASE)/include -Wall
- CFLAGS_RELEASE=-O2 -fno-strict-aliasing -ffast-math -funroll-loops -DNDEBUG
- CFLAGS_DEBUG=-O0 -ggdb -D_DEBUG
- ifeq ($(DEBUG_BUILD),YES)
-@@ -114,16 +113,12 @@
- CFLAGS_MODULE=-DPIC -fPIC
- 
- ifeq ($(OS),FreeBSD)
--LDFLAGS_COMMON=-L/usr/local/lib -lm
-+LDFLAGS_COMMON=-L/usr/lib -lm
- else
--LDFLAGS_COMMON=-L/usr/local/lib -ldl -lm
-+LDFLAGS_COMMON=-L/usr/lib -ldl -lm
- endif
- 
--ifeq ($(ARCH),x86_64)
--LIB=lib64
--else
- LIB=lib
--endif
- 
- LDFLAGS_CLIENT=-ljpeg -lz -L$(X11BASE)/$(LIB) -lX11 -lXext -lXxf86dga -lXxf86vm -lXinerama $(shell curl-config --libs)
- LDFLAGS_DED=-lz
-@@ -149,8 +144,8 @@
- LDFLAGS_QF=$(shell $(SDL_CONFIG) --libs) -lvorbisfile
- endif # BUILD_SND_QF
- 
--CLIENT_EXE=warsow.$(ARCH)
--SERVER_EXE=wsw_server.$(ARCH)
-+CLIENT_EXE=warsow_bin
-+SERVER_EXE=wsw_server_bin
- endif # USE_MINGW
- 
- ######################################################################################################

Added: packages/trunk/warsow/debian/patches/series
===================================================================
--- packages/trunk/warsow/debian/patches/series	                        (rev 0)
+++ packages/trunk/warsow/debian/patches/series	2007-07-25 21:29:28 UTC (rev 3461)
@@ -0,0 +1,3 @@
+fix_different_archs.diff
+makefile_modifications.diff
+fix_off_by_one.diff

Modified: packages/trunk/warsow/debian/rules
===================================================================
--- packages/trunk/warsow/debian/rules	2007-07-25 21:25:29 UTC (rev 3460)
+++ packages/trunk/warsow/debian/rules	2007-07-25 21:29:28 UTC (rev 3461)
@@ -5,22 +5,32 @@
 # Needed for cross-compiling.
 DEB_HOST_GNU_TYPE=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 
-# Needed for linking proper files
+# Needed for deleting a directory when running rules clean after a build
 DPKG_ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 # Needed for deleting directory created when running rules clean twice on
 # x86_64 and other architectures.
 UNAME_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/)
 
-include /usr/share/dpatch/dpatch.make
+# This is used convert files to be patched from dos to unix EOL convention.
+from-dos:
+	dh_testdir
+	fromdos -e warsow_0.31/source/game/q_shared.h
+	fromdos -e warsow_0.31/source/qcommon/qfiles.h
 
+patch: from-dos patch-stamp
+patch-stamp:
+	dh_testdir
+	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+	touch patch-stamp
+
 build: patch build-stamp
 build-stamp:
 	dh_testdir
 	cd warsow_0.31/source && $(MAKE) BUILD_DEBUG=NO
 	touch build-stamp
 
-clean: clean-patched unpatch
+clean: clean-patched unpatch to-dos
 clean-patched:
 	dh_testdir
 	dh_testroot
@@ -29,8 +39,20 @@
 		warsow_0.31/source/build$(UNAME_ARCH) \
 		warsow_0.31/source/build$(DPKG_ARCH)
 	rm -f build-stamp
+	rm -rf .pc/
 	dh_clean
 
+unpatch:
+	dh_testdir
+	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
+	rm -f patch-stamp
+
+# Reverses from-dos target
+to-dos:
+	dh_testdir
+	todos -e warsow_0.31/source/game/q_shared.h
+	todos -e warsow_0.31/source/qcommon/qfiles.h
+
 install: build
 	dh_testdir
 	dh_testroot
@@ -45,9 +67,9 @@
 	dh_testroot
 	dh_installchangelogs 
 	dh_installdocs
-	dh_link -pwarsow usr/lib/games/warsow/basewsw/cgame_$(DPKG_ARCH).so usr/share/games/warsow/basewsw/cgame_$(DPKG_ARCH).so
-	dh_link -pwarsow usr/lib/games/warsow/basewsw/game_$(DPKG_ARCH).so usr/share/games/warsow/basewsw/game_$(DPKG_ARCH).so
-	dh_link -pwarsow usr/lib/games/warsow/basewsw/ui_$(DPKG_ARCH).so usr/share/games/warsow/basewsw/ui_$(DPKG_ARCH).so
+	dh_link -pwarsow usr/lib/games/warsow/basewsw/cgame_$(UNAME_ARCH).so usr/share/games/warsow/basewsw/cgame_$(UNAME_ARCH).so
+	dh_link -pwarsow usr/lib/games/warsow/basewsw/game_$(UNAME_ARCH).so usr/share/games/warsow/basewsw/game_$(UNAME_ARCH).so
+	dh_link -pwarsow usr/lib/games/warsow/basewsw/ui_$(UNAME_ARCH).so usr/share/games/warsow/basewsw/ui_$(UNAME_ARCH).so
 	dh_link -pwarsow usr/lib/games/warsow/libs usr/share/games/warsow/libs
 	dh_installmenu
 	dh_desktop
@@ -63,4 +85,4 @@
 	dh_builddeb
 
 binary: binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build binary-indep binary-arch binary install clean




More information about the Pkg-games-commits mailing list