Author: fuddl-guest Date: 2009-09-11 17:42:09 +0000 (Fri, 11 Sep 2009) New Revision: 10337
Added: packages/trunk/nexuiz/debian/README.source packages/trunk/nexuiz/debian/patches/10_ambiguous_keyboard_bindings.patch packages/trunk/nexuiz/debian/patches/10_detect_gnu-kfreebsd.patch packages/trunk/nexuiz/debian/patches/20_nostrip_support.patch packages/trunk/nexuiz/debian/patches/series Removed: packages/trunk/nexuiz/debian/nexuiz-server.examples packages/trunk/nexuiz/debian/nexuiz_pro.desktop packages/trunk/nexuiz/debian/patches/00list packages/trunk/nexuiz/debian/patches/10_ambiguous_keyboard_bindings.dpatch packages/trunk/nexuiz/debian/patches/10_detect_gnu-kfreebsd.dpatch packages/trunk/nexuiz/debian/patches/20_nostrip_support.dpatch Modified: packages/trunk/nexuiz/debian/NEWS.Debian packages/trunk/nexuiz/debian/changelog packages/trunk/nexuiz/debian/control packages/trunk/nexuiz/debian/copyright packages/trunk/nexuiz/debian/nexuiz-server.6 packages/trunk/nexuiz/debian/nexuiz-server.docs packages/trunk/nexuiz/debian/nexuiz.6 packages/trunk/nexuiz/debian/nexuiz.docs packages/trunk/nexuiz/debian/nexuiz.install packages/trunk/nexuiz/debian/nexuiz.menu packages/trunk/nexuiz/debian/rules Log: Prepare nexuiz 2.5.1 Refreshed, dropped patches Bumped standards version Updated email address Modified: packages/trunk/nexuiz/debian/NEWS.Debian =================================================================== --- packages/trunk/nexuiz/debian/NEWS.Debian 2009-09-11 16:43:34 UTC (rev 10336) +++ packages/trunk/nexuiz/debian/NEWS.Debian 2009-09-11 17:42:09 UTC (rev 10337) @@ -1,3 +1,10 @@ +nexuiz (2.5.1-1) unstable; urgency=low + + Upstream removed the "pro" mode. So nexuiz -game pro won't work any longer and + you won't be able to find "pro" mode entries in your desktop menu. + + -- Bruno "Fuddl" Kleinert <[email protected]> Fri, 11 Sep 2009 14:54:11 +0200 + nexuiz (2.4.2-1) unstable; urgency=low From this version on, the Debian Nexuiz packages include the "pro" extension Added: packages/trunk/nexuiz/debian/README.source =================================================================== --- packages/trunk/nexuiz/debian/README.source (rev 0) +++ packages/trunk/nexuiz/debian/README.source 2009-09-11 17:42:09 UTC (rev 10337) @@ -0,0 +1,6 @@ +This package uses 'quilt' to manage Debian specific patches against the original +upstream sources. + +Please install the package 'quilt' on your System and read +/usr/share/doc/quilt/README.source how to obtain the actual compiled source code +of nexuiz. Modified: packages/trunk/nexuiz/debian/changelog =================================================================== --- packages/trunk/nexuiz/debian/changelog 2009-09-11 16:43:34 UTC (rev 10336) +++ packages/trunk/nexuiz/debian/changelog 2009-09-11 17:42:09 UTC (rev 10337) @@ -1,9 +1,32 @@ -nexuiz (2.4.2-2) UNRELEASE; urgency=low +nexuiz (2.5.1-1) UNRELEASE; urgency=low - * xqf is not mandatoried to run the game. downgrade xqf dependency form + [ Bruno "Fuddl" Kleinert ] + * New upstream release (Closes: #522514) + * Drop menu entries for "pro" game mode. It got removed upstream (Also see + /usr/share/doc/nexuiz/NEWS.Debian) + * Remove nexuiz_pro.desktop + * Remove pro mode entry in nexuiz.menu + * Update my email address where necessary + * Use quilt as patch management system. This adds quilt and drops dpatch as a + build dependency + * Refresh 10_ambiguous_keyboard_bindings.dpatch and rename it to + 10_ambiguous_keyboard_bindings.patch + * Refresh debian/nexuiz.docs and debian/nexuiz-server.docs + * Drop debian/nexuiz-server.examples. Upstream moved these files elsewhere. I + will fix this in another upload. + * Add README.source, since we are using quilt as patch management system + * Update copyright years in debian/copyright + * Update standards version to 3.8.3: + * Replace "copyright" with © in debian/copyright + * Move *-dbg packages into Section: debug + * Add code snippet from our policy into rules file, so we can build nexuiz in + parallel on SMP machines + + [ Gonéri Le Bouder ] + * xqf is not mandatoried to run the game. Downgrade xqf dependency from recommends to suggests. Thanks FTF 3k3 (Closes: #512456) - -- Gonéri Le Bouder <[email protected]> Fri, 14 Aug 2009 21:16:28 +0200 + -- Bruno "Fuddl" Kleinert <[email protected]> Fri, 11 Sep 2009 19:35:39 +0200 nexuiz (2.4.2-1) unstable; urgency=low Modified: packages/trunk/nexuiz/debian/control =================================================================== --- packages/trunk/nexuiz/debian/control 2009-09-11 16:43:34 UTC (rev 10336) +++ packages/trunk/nexuiz/debian/control 2009-09-11 17:42:09 UTC (rev 10337) @@ -2,9 +2,9 @@ Section: games Priority: optional Maintainer: Debian Games Team <[email protected]> -Uploaders: Bruno "Fuddl" Kleinert <[email protected]>, Gonéri Le Bouder <[email protected]>, Gerfried Fuchs <[email protected]> -Build-Depends: debhelper (>= 5.0.51), libsdl1.2-dev, imagemagick, dpatch -Standards-Version: 3.7.3 +Uploaders: Bruno "Fuddl" Kleinert <[email protected]>, Gonéri Le Bouder <[email protected]>, Gerfried Fuchs <[email protected]> +Build-Depends: debhelper (>= 5.0.51), libsdl1.2-dev, imagemagick, quilt +Standards-Version: 3.8.3 Homepage: http://www.nexuiz.com/ Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/nexuiz/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/nexuiz/?op=log @@ -12,7 +12,7 @@ Package: nexuiz Architecture: any Depends: ${shlibs:Depends}, nexuiz-data (>= ${source:Upstream-Version}), libvorbisfile3, libcurl3 -Recommends: nexuiz-music (>= ${source:Upstream-Version}), xqf +Recommends: nexuiz-music (>= ${source:Upstream-Version}) Suggests: xqf Description: A fast-paced 3D first-person shooter Nexuiz is a fast-paced 3D deathmatch game with high-end and complex graphics @@ -42,6 +42,7 @@ This package installs the standalone server. Package: nexuiz-dbg +Section: debug Priority: extra Architecture: any Depends: nexuiz (= ${binary:Version}) @@ -59,6 +60,7 @@ This package installs the debug symbols for the client to play the game. Package: nexuiz-server-dbg +Section: debug Priority: extra Architecture: any Depends: nexuiz-server (= ${binary:Version}) Modified: packages/trunk/nexuiz/debian/copyright =================================================================== --- packages/trunk/nexuiz/debian/copyright 2009-09-11 16:43:34 UTC (rev 10336) +++ packages/trunk/nexuiz/debian/copyright 2009-09-11 17:42:09 UTC (rev 10337) @@ -1,9 +1,9 @@ -This package was debianized by Bruno "Fuddl" Kleinert <[email protected]> on +This package was debianized by Bruno "Fuddl" Kleinert <[email protected]> on Wed, 19 Oct 2005 12:47:13 +0200. It was downloaded from http://www.nexuiz.com -Copyright 2002 - 2006 Alientrap <[email protected]> +Nexuiz is © 2002 - 2009 Alientrap, Lee Vermeulen <[email protected]> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License Modified: packages/trunk/nexuiz/debian/nexuiz-server.6 =================================================================== --- packages/trunk/nexuiz/debian/nexuiz-server.6 2009-09-11 16:43:34 UTC (rev 10336) +++ packages/trunk/nexuiz/debian/nexuiz-server.6 2009-09-11 17:42:09 UTC (rev 10337) @@ -37,6 +37,6 @@ .SH AUTHOR The Nexuiz dedicated server was written by Alientrap. .PP -This manual page was written by Bruno "Fuddl" Kleinert <[email protected]> for the Debian project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 any later version published by the Free Software Foundation. +This manual page was written by Bruno "Fuddl" Kleinert <[email protected]> for the Debian project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 any later version published by the Free Software Foundation. .PP On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL. Modified: packages/trunk/nexuiz/debian/nexuiz-server.docs =================================================================== --- packages/trunk/nexuiz/debian/nexuiz-server.docs 2009-09-11 16:43:34 UTC (rev 10336) +++ packages/trunk/nexuiz/debian/nexuiz-server.docs 2009-09-11 17:42:09 UTC (rev 10337) @@ -1,10 +1,11 @@ -Docs/basics.html -Docs/cvars.txt Docs/darkplaces.txt +Docs/egyptsoc Docs/eventlog.txt -Docs/FAQ.html -Docs/gamemodes.txt +Docs/faq.html +Docs/htmlfiles +Docs/irc.html Docs/mapdownload.txt -Docs/Readme.htm +Docs/mapping.txt +Docs/say-esc.html Docs/scorelog.txt debian/README.Debian Deleted: packages/trunk/nexuiz/debian/nexuiz-server.examples =================================================================== --- packages/trunk/nexuiz/debian/nexuiz-server.examples 2009-09-11 16:43:34 UTC (rev 10336) +++ packages/trunk/nexuiz/debian/nexuiz-server.examples 2009-09-11 17:42:09 UTC (rev 10337) @@ -1,3 +0,0 @@ -Docs/server/server.cfg -Docs/server/rcon.pl -Docs/server/rcon2irc Modified: packages/trunk/nexuiz/debian/nexuiz.6 =================================================================== --- packages/trunk/nexuiz/debian/nexuiz.6 2009-09-11 16:43:34 UTC (rev 10336) +++ packages/trunk/nexuiz/debian/nexuiz.6 2009-09-11 17:42:09 UTC (rev 10337) @@ -38,6 +38,6 @@ .SH AUTHOR Nexuiz was written by Alientrap. .PP -This manual page was written by Bruno "Fuddl" Kleinert <[email protected]> for the Debian project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 any later version published by the Free Software Foundation. +This manual page was written by Bruno "Fuddl" Kleinert <[email protected]> for the Debian project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 any later version published by the Free Software Foundation. .PP On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL. Modified: packages/trunk/nexuiz/debian/nexuiz.docs =================================================================== --- packages/trunk/nexuiz/debian/nexuiz.docs 2009-09-11 16:43:34 UTC (rev 10336) +++ packages/trunk/nexuiz/debian/nexuiz.docs 2009-09-11 17:42:09 UTC (rev 10337) @@ -1,12 +1,13 @@ Docs/basics.html -Docs/cvars.txt +Docs/darkplaces.txt +Docs/egyptsoc Docs/eventlog.txt -Docs/FAQ.html -Docs/gamemodes.txt +Docs/faq.html +Docs/htmlfiles +Docs/irc.html Docs/mapdownload.txt Docs/mapping.txt -Docs/Readme.htm -Docs/say-escapes.txt +Docs/say-esc.html Docs/scorelog.txt debian/README.Debian debian/NEWS.Debian Modified: packages/trunk/nexuiz/debian/nexuiz.install =================================================================== --- packages/trunk/nexuiz/debian/nexuiz.install 2009-09-11 16:43:34 UTC (rev 10336) +++ packages/trunk/nexuiz/debian/nexuiz.install 2009-09-11 17:42:09 UTC (rev 10337) @@ -1,5 +1,4 @@ debian/tmp/nexuiz48x48.png usr/share/icons/hicolor/48x48/apps debian/tmp/nexuiz.xpm usr/share/pixmaps debian/nexuiz.desktop usr/share/applications -debian/nexuiz_pro.desktop usr/share/applications debian/tmp/nexuiz usr/games Modified: packages/trunk/nexuiz/debian/nexuiz.menu =================================================================== --- packages/trunk/nexuiz/debian/nexuiz.menu 2009-09-11 16:43:34 UTC (rev 10336) +++ packages/trunk/nexuiz/debian/nexuiz.menu 2009-09-11 17:42:09 UTC (rev 10337) @@ -4,10 +4,3 @@ title="Nexuiz" \ longtitle="A networked 3D first person shooter game with high-quality graphic effects" \ command="/usr/games/nexuiz" - -?package(nexuiz):needs="X11" \ - section="Games/Action" \ - icon="/usr/share/pixmaps/nexuiz.xpm" \ - title="Nexuiz (pro mode)" \ - longtitle="A networked 3D first person shooter game with high-quality graphic effects" \ - command="/usr/games/nexuiz -game pro" Deleted: packages/trunk/nexuiz/debian/nexuiz_pro.desktop =================================================================== --- packages/trunk/nexuiz/debian/nexuiz_pro.desktop 2009-09-11 16:43:34 UTC (rev 10336) +++ packages/trunk/nexuiz/debian/nexuiz_pro.desktop 2009-09-11 17:42:09 UTC (rev 10337) @@ -1,12 +0,0 @@ -[Desktop Entry] -Name=Nexuiz (pro mode) -Comment=A networked 3D first person shooter game with high-quality graphic effects -Comment[de]=Ein netzwerkfähiges 3D Ego-Shooter Spiel mit aufwändigen Grafikeffekten -Comment[fr_FR]=Un Ego-Shooter en 3D pouvant être joué en réseau -Comment[pl_PL]=Gra sieciowa 3D, strzelanka, w pierwszej osobie z efektami graficznymi wysokiej jakosci -Comment[ro_RO]=Un joc 3D cu împuşcături, perspectivă personală şi efecte grafice de înaltă calitate -Exec=nexuiz -game pro -Icon=nexuiz48x48 -Terminal=false -Type=Application -Categories=Game;ArcadeGame; Deleted: packages/trunk/nexuiz/debian/patches/00list =================================================================== --- packages/trunk/nexuiz/debian/patches/00list 2009-09-11 16:43:34 UTC (rev 10336) +++ packages/trunk/nexuiz/debian/patches/00list 2009-09-11 17:42:09 UTC (rev 10337) @@ -1,3 +0,0 @@ -10_ambiguous_keyboard_bindings.dpatch -10_detect_gnu-kfreebsd.dpatch -20_nostrip_support.dpatch Deleted: packages/trunk/nexuiz/debian/patches/10_ambiguous_keyboard_bindings.dpatch =================================================================== --- packages/trunk/nexuiz/debian/patches/10_ambiguous_keyboard_bindings.dpatch 2009-09-11 16:43:34 UTC (rev 10336) +++ packages/trunk/nexuiz/debian/patches/10_ambiguous_keyboard_bindings.dpatch 2009-09-11 17:42:09 UTC (rev 10337) @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 10_ambiguous_keyboard_bindings.dpatch by Bruno "Fuddl" Kleinert <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Don't suggest ambiguous and deprecated keys, as we removed them from nexuiz-data's default.cfg - -...@dpatch@ -diff -urNad nexuiz-2.4.2~/Docs/FAQ.html nexuiz-2.4.2/Docs/FAQ.html ---- nexuiz-2.4.2~/Docs/FAQ.html 2008-05-11 16:09:09.000000000 +0200 -+++ nexuiz-2.4.2/Docs/FAQ.html 2008-05-16 10:45:24.629641828 +0200 -@@ -263,7 +263,7 @@ - <!--End Section 2--> - <h3><a name="How do I open the console?">How do I open the console?</a></h3> - <p class="Body"> --Press <tt>[shift]+[escape]</tt>. To close it press <tt>[escape]</tt>. While playing ` or ^ will also open the console. -+Press <tt>[shift]+[escape]</tt>. To close it press <tt>[escape]</tt>. - </p> - <!--End Section 2--> - <h3><a name="What console commands/variables are there?">What console commands/variables are there?</a></h3> Copied: packages/trunk/nexuiz/debian/patches/10_ambiguous_keyboard_bindings.patch (from rev 10331, packages/trunk/nexuiz/debian/patches/10_ambiguous_keyboard_bindings.dpatch) =================================================================== --- packages/trunk/nexuiz/debian/patches/10_ambiguous_keyboard_bindings.patch (rev 0) +++ packages/trunk/nexuiz/debian/patches/10_ambiguous_keyboard_bindings.patch 2009-09-11 17:42:09 UTC (rev 10337) @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_ambiguous_keyboard_bindings.dpatch by Bruno "Fuddl" Kleinert <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Don't suggest ambiguous and deprecated keys, as we removed them from nexuiz-data's default.cfg + +Index: nexuiz-2.5.1/Docs/faq.html +=================================================================== +--- nexuiz-2.5.1.orig/Docs/faq.html 2009-03-31 07:24:19.000000000 +0200 ++++ nexuiz-2.5.1/Docs/faq.html 2009-09-11 17:21:39.000000000 +0200 +@@ -226,7 +226,7 @@ + <!--End Section 2--> + <h3><a name="How do I open the console?">How do I open the console?</a></h3> + <p class="Body"> +-Press <tt>[shift]+[escape]</tt>. To close it press <tt>[escape]</tt>. While playing ` or ^ will also open the console. ++Press <tt>[shift]+[escape]</tt>. To close it press <tt>[escape]</tt>. + </p> + <!--End Section 2--> + <h3><a name="What console commands/variables are there?">What console commands/variables are there?</a></h3> Deleted: packages/trunk/nexuiz/debian/patches/10_detect_gnu-kfreebsd.dpatch =================================================================== --- packages/trunk/nexuiz/debian/patches/10_detect_gnu-kfreebsd.dpatch 2009-09-11 16:43:34 UTC (rev 10336) +++ packages/trunk/nexuiz/debian/patches/10_detect_gnu-kfreebsd.dpatch 2009-09-11 17:42:09 UTC (rev 10337) @@ -1,29 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 10_detec_gnu-kfreebsd.dpatch by Bruno "Fuddl" Kleinert <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix OS detection of darkplaces' makefile to not think it's on BSD on GNU/kFreeBSD - -...@dpatch@ -diff -urNad nexuiz-2.2.1~/darkplaces/makefile nexuiz-2.2.1/darkplaces/makefile ---- nexuiz-2.2.1~/darkplaces/makefile 2006-12-05 14:12:52.000000000 +0100 -+++ nexuiz-2.2.1/darkplaces/makefile 2006-12-26 12:24:24.637350250 +0100 -@@ -9,6 +9,10 @@ - - # UNIXes - DP_ARCH:=$(shell uname) -+ifeq ($(DP_ARCH), GNU/kFreeBSD) -+ # same userspace as Linux, not a BSDish one -+ DP_MAKE_TARGET=linux -+else - ifneq ($(filter %BSD,$(DP_ARCH)),) - DP_MAKE_TARGET=bsd - else -@@ -23,6 +27,7 @@ - endif # ifeq ($(DP_ARCH), SunOS) - endif # ifeq ($(DP_ARCH), Darwin) - endif # ifneq ($(filter %BSD,$(DP_ARCH)),) -+endif # ifeq ($(DP_ARCH), GNU/kFreeBSD) - endif # ifdef windir - endif # ifndef DP_MAKE_TARGET - Copied: packages/trunk/nexuiz/debian/patches/10_detect_gnu-kfreebsd.patch (from rev 10331, packages/trunk/nexuiz/debian/patches/10_detect_gnu-kfreebsd.dpatch) =================================================================== --- packages/trunk/nexuiz/debian/patches/10_detect_gnu-kfreebsd.patch (rev 0) +++ packages/trunk/nexuiz/debian/patches/10_detect_gnu-kfreebsd.patch 2009-09-11 17:42:09 UTC (rev 10337) @@ -0,0 +1,29 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_detec_gnu-kfreebsd.dpatch by Bruno "Fuddl" Kleinert <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix OS detection of darkplaces' makefile to not think it's on BSD on GNU/kFreeBSD + +...@dpatch@ +diff -urNad nexuiz-2.2.1~/darkplaces/makefile nexuiz-2.2.1/darkplaces/makefile +--- nexuiz-2.2.1~/darkplaces/makefile 2006-12-05 14:12:52.000000000 +0100 ++++ nexuiz-2.2.1/darkplaces/makefile 2006-12-26 12:24:24.637350250 +0100 +@@ -9,6 +9,10 @@ + + # UNIXes + DP_ARCH:=$(shell uname) ++ifeq ($(DP_ARCH), GNU/kFreeBSD) ++ # same userspace as Linux, not a BSDish one ++ DP_MAKE_TARGET=linux ++else + ifneq ($(filter %BSD,$(DP_ARCH)),) + DP_MAKE_TARGET=bsd + else +@@ -23,6 +27,7 @@ + endif # ifeq ($(DP_ARCH), SunOS) + endif # ifeq ($(DP_ARCH), Darwin) + endif # ifneq ($(filter %BSD,$(DP_ARCH)),) ++endif # ifeq ($(DP_ARCH), GNU/kFreeBSD) + endif # ifdef windir + endif # ifndef DP_MAKE_TARGET + Deleted: packages/trunk/nexuiz/debian/patches/20_nostrip_support.dpatch =================================================================== --- packages/trunk/nexuiz/debian/patches/20_nostrip_support.dpatch 2009-09-11 16:43:34 UTC (rev 10336) +++ packages/trunk/nexuiz/debian/patches/20_nostrip_support.dpatch 2009-09-11 17:42:09 UTC (rev 10337) @@ -1,18 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 20_nostrip_support.dpatch by Bruno "Fuddl" Kleinert <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Don't strip debug symbols from binaries by default - -...@dpatch@ -diff -urNad nexuiz-2.4~/darkplaces/makefile.inc nexuiz-2.4/darkplaces/makefile.inc ---- nexuiz-2.4~/darkplaces/makefile.inc 2008-01-18 16:38:00.000000000 +0100 -+++ nexuiz-2.4/darkplaces/makefile.inc 2008-03-02 23:57:12.637218522 +0100 -@@ -399,7 +399,6 @@ - DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ - CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_EXTRA) $(CFLAGS_RELEASE) $(OPTIM_RELEASE)"\ - LDFLAGS="$(LDFLAGS_RELEASE) $(LDFLAGS_COMMON)" -- $(STRIP) $(EXE) - - snd_modplug.o: snd_modplug.c - $(DO_CC) $(CFLAGS_SND_MODPLUG) Copied: packages/trunk/nexuiz/debian/patches/20_nostrip_support.patch (from rev 10331, packages/trunk/nexuiz/debian/patches/20_nostrip_support.dpatch) =================================================================== --- packages/trunk/nexuiz/debian/patches/20_nostrip_support.patch (rev 0) +++ packages/trunk/nexuiz/debian/patches/20_nostrip_support.patch 2009-09-11 17:42:09 UTC (rev 10337) @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20_nostrip_support.dpatch by Bruno "Fuddl" Kleinert <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Don't strip debug symbols from binaries by default + +...@dpatch@ +diff -urNad nexuiz-2.4~/darkplaces/makefile.inc nexuiz-2.4/darkplaces/makefile.inc +--- nexuiz-2.4~/darkplaces/makefile.inc 2008-01-18 16:38:00.000000000 +0100 ++++ nexuiz-2.4/darkplaces/makefile.inc 2008-03-02 23:57:12.637218522 +0100 +@@ -399,7 +399,6 @@ + DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ + CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_EXTRA) $(CFLAGS_RELEASE) $(OPTIM_RELEASE)"\ + LDFLAGS="$(LDFLAGS_RELEASE) $(LDFLAGS_COMMON)" +- $(STRIP) $(EXE) + + snd_modplug.o: snd_modplug.c + $(DO_CC) $(CFLAGS_SND_MODPLUG) Copied: packages/trunk/nexuiz/debian/patches/series (from rev 10331, packages/trunk/nexuiz/debian/patches/00list) =================================================================== --- packages/trunk/nexuiz/debian/patches/series (rev 0) +++ packages/trunk/nexuiz/debian/patches/series 2009-09-11 17:42:09 UTC (rev 10337) @@ -0,0 +1,2 @@ +10_ambiguous_keyboard_bindings.patch +10_detect_gnu-kfreebsd.patch Modified: packages/trunk/nexuiz/debian/rules =================================================================== --- packages/trunk/nexuiz/debian/rules 2009-09-11 16:43:34 UTC (rev 10336) +++ packages/trunk/nexuiz/debian/rules 2009-09-11 17:42:09 UTC (rev 10337) @@ -1,10 +1,18 @@ #!/usr/bin/make -f #export DH_VERBOSE=1 -include /usr/share/dpatch/dpatch.make +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + MAKEFLAGS += -j$(NUMJOBS) +endif +patch: patch-stamp +patch-stamp: + $(MAKE) -f /usr/share/quilt/quilt.make patch + touch $@ + build: build-stamp -build-stamp: patch +build-stamp: patch-stamp dh_testdir $(MAKE) -C darkplaces \ CFLAGS_DEBUG="$(CFLAGS)" \ @@ -19,8 +27,12 @@ rm -f build-stamp configure-stamp rm -rf debian/tmp $(MAKE) -C darkplaces clean - dh_clean + dh_clean +unpatch: + $(MAKE) -f /usr/share/quilt/quilt.make unpatch + rm -rf patch-stamp .pc + install: build dh_testdir dh_testroot _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
