r10415 - in packages/trunk/nexuiz-data/debian: . patches
Bruno Fuddl-guestquot; Fuddl" Kleinert
fuddl-guest at alioth.debian.org
Fri Oct 16 17:02:56 UTC 2009
Author: fuddl-guest
Date: 2009-10-16 17:02:53 +0000 (Fri, 16 Oct 2009)
New Revision: 10415
Added:
packages/trunk/nexuiz-data/debian/patches/03_no_datapk3_timestamp.diff
Modified:
packages/trunk/nexuiz-data/debian/changelog
packages/trunk/nexuiz-data/debian/control
packages/trunk/nexuiz-data/debian/patches/01_remove_broken_keys.diff
packages/trunk/nexuiz-data/debian/patches/02_disable_update_check.diff
packages/trunk/nexuiz-data/debian/patches/series
packages/trunk/nexuiz-data/debian/rules
Log:
Prepare for Nexuiz 2.5.2
This commit breaks the package!!
Sources MUST be obtained from upstream repository to get the Makefile which
builds the QuakeC sources (It's NOT included in the upstream nexuiz-VERSION.zip
distribution... *sigh*).
Disabled nexuiz-music binary package for testing purposes only! But at least I
was able to start the game.
Build dependend on latest fteqcc snapshot.
Modified: packages/trunk/nexuiz-data/debian/changelog
===================================================================
--- packages/trunk/nexuiz-data/debian/changelog 2009-10-16 15:22:53 UTC (rev 10414)
+++ packages/trunk/nexuiz-data/debian/changelog 2009-10-16 17:02:53 UTC (rev 10415)
@@ -1,4 +1,4 @@
-nexuiz-data (2.5.1-1) UNRELEASED; urgency=low
+nexuiz-data (2.5.2-1) UNRELEASED; urgency=low
[ Gerfried Fuchs ]
* Also clean qcsrc/menu/fteqcc.log and qcsrc/server/fteqcc.log.
@@ -14,13 +14,15 @@
* Refresh 02_disable_update_check.diff. Upstream added a variable to turn off
searching for new release, so we can simply disable it in defaultNexuiz.cfg.
BUT this patch isn't applied at the moment, bceause of the md5 checksumming
- * Bump build dependency of fteqcc to at least version 3343+svn3223-1
+ * Bump build dependency of fteqcc to at least version 3343+svn3400
* Also clean qcsrc/client/fteqcc.log
* Update my email address in Uploaders field
* Add ${misc:Depends} as dependency to nexuiz-data and nexuiz-music. Thanks to
lintian! ;)
+ * Replace build dependency of zip by p7zip-full. Upstream uses it in its
+ Makefile.
- -- Bruno "Fuddl" Kleinert <fuddl at debian.org> Tue, 15 Sep 2009 12:55:25 +0200
+ -- Bruno "Fuddl" Kleinert <fuddl at debian.org> Fri, 16 Oct 2009 16:01:27 +0200
nexuiz-data (2.4.2-2) unstable; urgency=low
Modified: packages/trunk/nexuiz-data/debian/control
===================================================================
--- packages/trunk/nexuiz-data/debian/control 2009-10-16 15:22:53 UTC (rev 10414)
+++ packages/trunk/nexuiz-data/debian/control 2009-10-16 17:02:53 UTC (rev 10415)
@@ -4,8 +4,8 @@
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Bruno "Fuddl" Kleinert <fuddl at debian.org>,
Gonéri Le Bouder <goneri at rulezlan.org>, Gerfried Fuchs <rhonda at debian.at>
-Build-Depends: debhelper (>= 5.0.0), quilt, fteqcc (>= 3343+svn3223)
-Build-Depends-Indep: zip
+Build-Depends: debhelper (>= 5.0.0), quilt, fteqcc (>= 3343+svn3400)
+Build-Depends-Indep: p7zip-full
Standards-Version: 3.8.3
Homepage: http://www.nexuiz.com/
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/nexuiz-data/
@@ -26,15 +26,15 @@
This package contains only data files like levels and sounds. If you want to
play the game you need to install the package "nexuiz".
-Package: nexuiz-music
-Architecture: all
-Depends: ${misc:Depends}
-Suggests: nexuiz (>= ${source:Upstream-Version})
-Description: Nexuiz music files
- Nexuiz is a 3d deathmatch game made entirely over the internet. The purpose of
- the game is to bring deathmatch back to the basics, with perfect weapon
- balancing and fast paced action, keeping itself away from the current trend of
- realistic shooters.
- .
- This package contains only the in-game music files. If you want to play the
- game you need to install the package "nexuiz".
+#Package: nexuiz-music
+#Architecture: all
+#Depends: ${misc:Depends}
+#Suggests: nexuiz (>= ${source:Upstream-Version})
+#Description: Nexuiz music files
+# Nexuiz is a 3d deathmatch game made entirely over the internet. The purpose of
+# the game is to bring deathmatch back to the basics, with perfect weapon
+# balancing and fast paced action, keeping itself away from the current trend of
+# realistic shooters.
+# .
+# This package contains only the in-game music files. If you want to play the
+# game you need to install the package "nexuiz".
Modified: packages/trunk/nexuiz-data/debian/patches/01_remove_broken_keys.diff
===================================================================
--- packages/trunk/nexuiz-data/debian/patches/01_remove_broken_keys.diff 2009-10-16 15:22:53 UTC (rev 10414)
+++ packages/trunk/nexuiz-data/debian/patches/01_remove_broken_keys.diff 2009-10-16 17:02:53 UTC (rev 10415)
@@ -1,8 +1,8 @@
-Index: nexuiz-data-2.5.1/data/defaultNexuiz.cfg
+Index: nexuiz-data-2.5.2/data/defaultNexuiz.cfg
===================================================================
---- nexuiz-data-2.5.1.orig/data/defaultNexuiz.cfg 2009-09-11 13:25:31.000000000 +0200
-+++ nexuiz-data-2.5.1/data/defaultNexuiz.cfg 2009-09-11 13:25:48.000000000 +0200
-@@ -803,8 +803,6 @@
+--- nexuiz-data-2.5.2.orig/data/defaultNexuiz.cfg 2009-10-16 16:41:34.000000000 +0200
++++ nexuiz-data-2.5.2/data/defaultNexuiz.cfg 2009-10-16 16:41:38.000000000 +0200
+@@ -886,8 +886,6 @@
// misc
bind e +hook
Modified: packages/trunk/nexuiz-data/debian/patches/02_disable_update_check.diff
===================================================================
--- packages/trunk/nexuiz-data/debian/patches/02_disable_update_check.diff 2009-10-16 15:22:53 UTC (rev 10414)
+++ packages/trunk/nexuiz-data/debian/patches/02_disable_update_check.diff 2009-10-16 17:02:53 UTC (rev 10415)
@@ -1,15 +1,16 @@
Author: Gerfried Fuchs <rhonda at debian.at> vim:ft=diff:
Description: Disable update check so it won't nag users (closes: #522738)
-Index: nexuiz-data-2.5.1/data/defaultNexuiz.cfg
+Index: nexuiz-data-2.5.2/data/defaultNexuiz.cfg
===================================================================
---- nexuiz-data-2.5.1.orig/data/defaultNexuiz.cfg 2009-09-11 13:39:47.000000000 +0200
-+++ nexuiz-data-2.5.1/data/defaultNexuiz.cfg 2009-09-11 13:40:02.000000000 +0200
-@@ -1449,6 +1449,6 @@
+--- nexuiz-data-2.5.2.orig/data/defaultNexuiz.cfg 2009-10-16 16:41:48.000000000 +0200
++++ nexuiz-data-2.5.2/data/defaultNexuiz.cfg 2009-10-16 16:42:05.000000000 +0200
+@@ -1553,7 +1553,7 @@
rcon_secure 1
-set menu_updatecheck 1
+set menu_updatecheck 0
-
+ set bot_navigation_ignoreplayers 0 // FIXME remove this once the issue is solved
+ set bot_sound_monopoly 0 "when enabled, only bots can make any noise"
Added: packages/trunk/nexuiz-data/debian/patches/03_no_datapk3_timestamp.diff
===================================================================
--- packages/trunk/nexuiz-data/debian/patches/03_no_datapk3_timestamp.diff (rev 0)
+++ packages/trunk/nexuiz-data/debian/patches/03_no_datapk3_timestamp.diff 2009-10-16 17:02:53 UTC (rev 10415)
@@ -0,0 +1,12 @@
+Index: nexuiz-data-2.5.2/data/Makefile
+===================================================================
+--- nexuiz-data-2.5.2.orig/data/Makefile 2009-10-16 17:27:05.000000000 +0200
++++ nexuiz-data-2.5.2/data/Makefile 2009-10-16 17:27:33.000000000 +0200
+@@ -1,6 +1,6 @@
+ FTEQCC ?= fteqcc
+ PERL ?= perl
+-PK3NAME ?= `date +../data%Y%m%d.pk3`
++PK3NAME ?= data.pk3
+ ZIP ?= 7za a -tzip -mx=9
+ ZIPEXCLUDE ?= -x\!*.pk3 -xr\!\.svn -x\!qcsrc
+ DIFF ?= diff
Modified: packages/trunk/nexuiz-data/debian/patches/series
===================================================================
--- packages/trunk/nexuiz-data/debian/patches/series 2009-10-16 15:22:53 UTC (rev 10414)
+++ packages/trunk/nexuiz-data/debian/patches/series 2009-10-16 17:02:53 UTC (rev 10415)
@@ -0,0 +1,3 @@
+01_remove_broken_keys.diff
+02_disable_update_check.diff
+03_no_datapk3_timestamp.diff
Modified: packages/trunk/nexuiz-data/debian/rules
===================================================================
--- packages/trunk/nexuiz-data/debian/rules 2009-10-16 15:22:53 UTC (rev 10414)
+++ packages/trunk/nexuiz-data/debian/rules 2009-10-16 17:02:53 UTC (rev 10415)
@@ -16,26 +16,33 @@
build-stamp: patch-stamp
dh_testdir
touch build-stamp
- cd qcsrc/menu && fteqcc
- cd qcsrc/server && fteqcc
- mv *.dat *.lno data
- cd data && zip -r ../data.pk3 * -9 -x sound/cdtracks/\*
+ #cd qcsrc/menu && fteqcc
+ #cd qcsrc/server && fteqcc
+ #mv *.dat *.lno data
+ #cd data && zip -r ../data.pk3 * -9 -x sound/cdtracks/\*
#cd pro && zip -r ../datapro.pk3 * -9
- mkdir -p debian/tmp/nexuiz-music/sound
- cp -r data/sound/cdtracks debian/tmp/nexuiz-music/sound
- cd debian/tmp/nexuiz-music && zip -r ../../../music.pk3 sound
+ #
+ # Builds QuakeC and the uge data.zip archive. In case of emergency, i.e. if
+ # Nexuiz complains about wrong cvar checksums also call the update-cvarcount
+ # target, but be careful with modifies in-tree files!
+ make -C data pk3here
+ #mkdir -p debian/tmp/nexuiz-music/sound
+ #cp -r data/sound/cdtracks debian/tmp/nexuiz-music/sound
+ #cd debian/tmp/nexuiz-music && zip -r ../../../music.pk3 sound
touch build-stamp
clean: clean-patched unpatch
clean-patched:
dh_testdir
dh_testroot
+ $(MAKE) -C data clean
rm -f build-stamp configure-stamp
- rm -rf *.dat *.lno debian/tmp data/*.dat data/*.lno
+ rm -rf debian/tmp data/*.dat
#rm -f data.pk3 datapro.pk3 music.pk3
- rm -f data.pk3 music.pk3
- rm -f qcsrc/menu/fteqcc.log qcsrc/server/fteqcc.log \
- qcsrc/client/fteqcc.log
+ rm -f data/data.pk3 #\
+ # music.pk3
+ rm -f data/qcsrc/menu/fteqcc.log data/qcsrc/server/fteqcc.log \
+ data/qcsrc/client/fteqcc.log
dh_clean
install: build
@@ -43,9 +50,9 @@
dh_testroot
dh_clean -k
dh_installdirs
- dh_install -pnexuiz-data data.pk3 usr/share/games/nexuiz/data
+ dh_install -pnexuiz-data data/data.pk3 usr/share/games/nexuiz/data
#dh_install -pnexuiz-data datapro.pk3 usr/share/games/nexuiz/pro
- dh_install -pnexuiz-music music.pk3 usr/share/games/nexuiz/data
+ #dh_install -pnexuiz-music music.pk3 usr/share/games/nexuiz/data
binary-arch: build install
binary-indep: build install
More information about the Pkg-games-commits
mailing list