r2951 - in packages/trunk/warsow/debian: . patches scripts
Andres Mejia
ceros-guest at alioth.debian.org
Sat Jun 16 17:09:03 UTC 2007
Author: ceros-guest
Date: 2007-06-16 17:09:03 +0000 (Sat, 16 Jun 2007)
New Revision: 2951
Added:
packages/trunk/warsow/debian/docs
packages/trunk/warsow/debian/patches/
packages/trunk/warsow/debian/patches/00list
packages/trunk/warsow/debian/patches/makefile_modifications.dpatch
packages/trunk/warsow/debian/warsow-server.install
packages/trunk/warsow/debian/warsow.install
Modified:
packages/trunk/warsow/debian/control
packages/trunk/warsow/debian/copyright
packages/trunk/warsow/debian/rules
packages/trunk/warsow/debian/scripts/warsow-server
Log:
Fixing up debianization. Adding patches for makefile.
Modified: packages/trunk/warsow/debian/control
===================================================================
--- packages/trunk/warsow/debian/control 2007-06-16 17:04:33 UTC (rev 2950)
+++ packages/trunk/warsow/debian/control 2007-06-16 17:09:03 UTC (rev 2951)
@@ -2,15 +2,13 @@
Section: contrib/games
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>
-Build-Depends: debhelper (>= 5.0.0), libopenal-dev, zlib1g-dev, libcurl3-dev, libx11-dev,
- x11proto-xf86vidmode-dev, x11proto-xinerama-dev, mesa-common-dev, libxxf86vm-dev,
- libjpeg62-dev, libxxf86dga-dev, libxinerama-dev, libvorbis-dev, libsdl1.2-dev
+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-dev | libcurl3-dev, libkrb5-dev, libidn11-dev, libssl-dev
Standards-Version: 3.7.2
Package: warsow
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, warsow-data (>= 0.21-1)
+Depends: ${shlibs:Depends}, warsow-data (>= 0.3), warsow-data (<< 0.4)
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
@@ -20,11 +18,11 @@
.
This package installs the client to play Warsow.
.
- Homepage: http://www.warsow.net/
+ Homepage: http://www.warsow.net/
Package: warsow-server
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, warsow-data (>= 0.21-1)
+Depends: ${shlibs:Depends}, warsow-data (>= 0.3), warsow-data (<< 0.4)
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
@@ -34,4 +32,4 @@
.
This package installs the standalone server for Warsow.
.
- Homepage: http://www.warsow.net/
+ Homepage: http://www.warsow.net/
Modified: packages/trunk/warsow/debian/copyright
===================================================================
--- packages/trunk/warsow/debian/copyright 2007-06-16 17:04:33 UTC (rev 2950)
+++ packages/trunk/warsow/debian/copyright 2007-06-16 17:09:03 UTC (rev 2951)
@@ -2,6 +2,8 @@
Sat, 24 Jun 2006 22:50:33 +0200
It was downloaded from http://www.warsow.net
+The upstream source for this package is the warsow sdk tarball.
+Certain documents from warsow binary tarball were included with this package.
The actual maintainer is the Debian Games Team:
http://wiki.debian.org/Games/Development
Added: packages/trunk/warsow/debian/docs
===================================================================
--- packages/trunk/warsow/debian/docs (rev 0)
+++ packages/trunk/warsow/debian/docs 2007-06-16 17:09:03 UTC (rev 2951)
@@ -0,0 +1 @@
+docs/*
Added: packages/trunk/warsow/debian/patches/00list
===================================================================
--- packages/trunk/warsow/debian/patches/00list (rev 0)
+++ packages/trunk/warsow/debian/patches/00list 2007-06-16 17:09:03 UTC (rev 2951)
@@ -0,0 +1 @@
+makefile_modifications.dpatch
Added: packages/trunk/warsow/debian/patches/makefile_modifications.dpatch
===================================================================
--- packages/trunk/warsow/debian/patches/makefile_modifications.dpatch (rev 0)
+++ packages/trunk/warsow/debian/patches/makefile_modifications.dpatch 2007-06-16 17:09:03 UTC (rev 2951)
@@ -0,0 +1,111 @@
+#! /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
+
+--- source/Makefile~ 2007-06-15 21:13:12.000000000 -0400
++++ source/Makefile 2007-06-16 00:32:35.000000000 -0400
+@@ -32,22 +32,19 @@
+ LD=i586-mingw32msvc-gcc
+ else
+ CC?=gcc
+-LD=gcc
++LD?=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)
++# We'll use dpkg-architecture to determine the next three variables
++BASE_ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
++OS=$(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
++DEB_BUILD_GNU_TYPE=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+-ifeq ($(OS),FreeBSD)
+-ARCH=freebsd_$(BASE_ARCH)
+-else
+ ARCH=$(BASE_ARCH)
+-endif
+
+ SHARED_LIBRARY_EXTENSION=so
+ endif
+
+-BUILDDIR=build$(ARCH)
++BUILDDIR=build
+ BINDIR=release
+
+ DEPENDFILE_CLIENT=$(BUILDDIR)/client/Makefile.d
+@@ -96,11 +93,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)
+@@ -113,17 +110,18 @@
+ CFLAGS_DED=-DDEDICATED_ONLY -DC_ONLY
+ CFLAGS_MODULE=-DPIC -fPIC
+
++# Adding all possible paths to libgcc.a for linking
++GCC_SEARCH_PATHS=-L/usr/lib/gcc/$(DEB_BUILD_GNU_TYPE)/4.1.2 \
++ -L/usr/lib/gcc/$(DEB_BUILD_GNU_TYPE)/4.1.1 \
++ -L/usr/lib/gcc/$(DEB_BUILD_GNU_TYPE)/4.1
++
+ 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 $(GCC_SEARCH_PATHS) -ldl -lm -lc -lgcc
+ 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,9 +147,9 @@
+ LDFLAGS_QF=$(shell $(SDL_CONFIG) --libs) -lvorbisfile
+ endif # BUILD_SND_QF
+
+-CLIENT_EXE=warsow.$(ARCH)
+-SERVER_EXE=wsw_server.$(ARCH)
+-endif # USE_MINGW
++CLIENT_EXE=warsow.bin
++SERVER_EXE=wsw_server.bin
++endif # end if statement of ($(USE_MINGW),YES)
+
+ ######################################################################################################
+ # Helper functions
Modified: packages/trunk/warsow/debian/rules
===================================================================
--- packages/trunk/warsow/debian/rules 2007-06-16 17:04:33 UTC (rev 2950)
+++ packages/trunk/warsow/debian/rules 2007-06-16 17:09:03 UTC (rev 2951)
@@ -2,71 +2,48 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# Nasty, but compatible with q2engine/warsow makefile
-Q2ARCH=$(shell uname -m | sed -e s/i.86/i386/)
+# Needed for q2engine/warsow makefile
+Q2ARCH=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
-build: build-stamp
-build-stamp:
+include /usr/share/dpatch/dpatch.make
+
+build: patch build-stamp
+build-stamp:
dh_testdir
- cd source && $(MAKE)
+ cd source && $(MAKE) BUILD_DEBUG=NO
touch build-stamp
-clean:
+clean: clean-patched unpatch
+clean-patched:
dh_testdir
dh_testroot
cd source && $(MAKE) clean
- rm -rf source/release warsow.bin warsow-server.bin
- rm -f build-stamp configure-stamp
- dh_clean
+ rm -rf source/build source/release source/build$(Q2ARCH)
+ rm -f build-stamp
+ dh_clean
install: build
dh_testdir
dh_testroot
dh_clean -k
- dh_installdirs
- cp source/release/warsow.$(Q2ARCH) warsow.bin
- dh_install -pwarsow warsow.bin usr/lib/games/warsow
- dh_install -pwarsow source/release/libs usr/lib/games/warsow
- dh_install -pwarsow source/release/basewsw usr/lib/games/warsow
- dh_install -pwarsow debian/scripts/warsow usr/games
- dh_install -pwarsow debian/warsow.xpm usr/share/pixmaps
- dh_install -pwarsow debian/warsow.desktop usr/share/applications
- cp source/release/wsw_server.$(Q2ARCH) warsow-server.bin
- dh_install -pwarsow-server warsow-server.bin usr/lib/games/warsow
- dh_install -pwarsow-server debian/scripts/warsow-server usr/games
+ dh_install
-binary-indep: build install
+binary-indep:
+#Nothing to be done for binary-indep
+
binary-arch: build install
dh_testdir
dh_testroot
dh_installchangelogs
dh_installdocs
- dh_installexamples
- dh_install
dh_link -pwarsow usr/lib/games/warsow/basewsw/cgame_$(Q2ARCH).so usr/share/games/warsow/basewsw/cgame_$(Q2ARCH).so
dh_link -pwarsow usr/lib/games/warsow/basewsw/game_$(Q2ARCH).so usr/share/games/warsow/basewsw/game_$(Q2ARCH).so
dh_link -pwarsow usr/lib/games/warsow/basewsw/ui_$(Q2ARCH).so usr/share/games/warsow/basewsw/ui_$(Q2ARCH).so
- dh_link -pwarsow usr/lib/games/warsow/libs/irc_$(Q2ARCH).so usr/share/games/warsow/libs/irc_$(Q2ARCH).so
- dh_link -pwarsow usr/lib/games/warsow/libs/snd_openal_$(Q2ARCH).so usr/share/games/warsow/libs/snd_openal_$(Q2ARCH).so
- dh_link -pwarsow usr/lib/games/warsow/libs/snd_qf_$(Q2ARCH).so usr/share/games/warsow/libs/snd_qf_$(Q2ARCH).so
- dh_link -pwarsow usr/share/doc/warsow-data/bots_navigation.txt usr/share/doc/warsow/bots_navigation.txt
- dh_link -pwarsow usr/share/doc/warsow-data/contact.txt usr/share/doc/warsow/contact.txt
- dh_link -pwarsow-server usr/share/doc/warsow-data/dedicated_server_quide.txt usr/share/doc/warsow-server/dedicated_server_quide.txt
- dh_link -pwarsow usr/share/doc/warsow-data/demoavi.txt usr/share/doc/warsow/demoavi.txt
- dh_link -pwarsow usr/share/doc/warsow-data/features.txt.gz usr/share/doc/warsow/features.txt.gz
- dh_link -pwarsow usr/share/doc/warsow-data/huds.txt.gz usr/share/doc/warsow/huds.txt.gz
- dh_link -pwarsow usr/share/doc/warsow-data/license.txt usr/share/doc/warsow/license.txt
- dh_link -pwarsow usr/share/doc/warsow-data/linux_sound_sdl.txt usr/share/doc/warsow/linux_sound_sdl.txt
- dh_link -pwarsow usr/share/doc/warsow-data/mousefilter.txt usr/share/doc/warsow/mousefilter.txt
- dh_link -pwarsow usr/share/doc/warsow-data/new_features.txt usr/share/doc/warsow/new_features.txt
- dh_link -pwarsow usr/share/doc/warsow-data/old_changelog.txt.gz usr/share/doc/warsow/old_changelog.txt.gz
- dh_link -pwarsow usr/share/doc/warsow-data/query_protocols.txt.gz usr/share/doc/warsow/query_protocols.txt.gz
- dh_link -pwarsow usr/share/doc/warsow-data/Shader_Manual.rtf.gz usr/share/doc/warsow/Shader_Manual.rtf.gz
+ dh_link -pwarsow usr/lib/games/warsow/libs usr/share/games/warsow/libs
dh_installmenu
+ dh_desktop
dh_installman -pwarsow debian/warsow.6
dh_installman -pwarsow-server debian/warsow-server.6
- dh_desktop -pwarsow
- dh_link
dh_strip
dh_compress
dh_fixperms
@@ -76,5 +53,5 @@
dh_md5sums
dh_builddeb
-binary: binary-indep binary-arch
+binary: binary-arch
.PHONY: build clean binary-indep binary-arch binary install
Modified: packages/trunk/warsow/debian/scripts/warsow-server
===================================================================
--- packages/trunk/warsow/debian/scripts/warsow-server 2007-06-16 17:04:33 UTC (rev 2950)
+++ packages/trunk/warsow/debian/scripts/warsow-server 2007-06-16 17:09:03 UTC (rev 2951)
@@ -36,4 +36,4 @@
;;
esac
-exec /usr/lib/games/warsow/warsow-server.bin $PARAMS "$@"
+exec /usr/lib/games/warsow/wsw_server.bin $PARAMS "$@"
Added: packages/trunk/warsow/debian/warsow-server.install
===================================================================
--- packages/trunk/warsow/debian/warsow-server.install (rev 0)
+++ packages/trunk/warsow/debian/warsow-server.install 2007-06-16 17:09:03 UTC (rev 2951)
@@ -0,0 +1,2 @@
+source/release/wsw_server.bin usr/lib/games/warsow
+debian/scripts/warsow-server usr/games
Added: packages/trunk/warsow/debian/warsow.install
===================================================================
--- packages/trunk/warsow/debian/warsow.install (rev 0)
+++ packages/trunk/warsow/debian/warsow.install 2007-06-16 17:09:03 UTC (rev 2951)
@@ -0,0 +1,6 @@
+source/release/warsow.bin usr/lib/games/warsow
+source/release/libs usr/lib/games/warsow
+source/release/basewsw usr/lib/games/warsow
+debian/scripts/warsow usr/games
+debian/warsow.xpm usr/share/pixmaps
+debian/warsow.desktop usr/share/applications
More information about the Pkg-games-commits
mailing list