Author: fuddl-guest
Date: 2009-10-20 17:50:45 +0000 (Tue, 20 Oct 2009)
New Revision: 10442
Added:
packages/trunk/nexuiz-data/debian/patches/04_exclude_music_in_datapk3.diff
packages/trunk/nexuiz-data/debian/patches/05_disable_development_warning.diff
Modified:
packages/trunk/nexuiz-data/debian/changelog
packages/trunk/nexuiz-data/debian/control
packages/trunk/nexuiz-data/debian/patches/series
packages/trunk/nexuiz-data/debian/rules
Log:
Add another two patches, fix nexuiz-music package
Modified: packages/trunk/nexuiz-data/debian/changelog
===================================================================
--- packages/trunk/nexuiz-data/debian/changelog 2009-10-20 16:47:49 UTC (rev
10441)
+++ packages/trunk/nexuiz-data/debian/changelog 2009-10-20 17:50:45 UTC (rev
10442)
@@ -21,8 +21,13 @@
lintian! ;)
* Replace build dependency of zip by p7zip-full. Upstream uses it in its
Makefile.
+ * Add 04_exclude_music_in_datapk3.diff. It makes the upstream Makefile
exclude
+ the music files to be excluded from the big data.pk3 ZIP-archive.
+ * Add patches/05_disable_development_warning.diff to make nexuiz not complain
+ about being a development snapshot. This is necessary because we fetch
+ sources from the upstream Subversion repository.
- -- Bruno "Fuddl" Kleinert <[email protected]> Fri, 16 Oct 2009 16:01:27 +0200
+ -- Bruno "Fuddl" Kleinert <[email protected]> Tue, 20 Oct 2009 19:46:24 +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-20 16:47:49 UTC (rev
10441)
+++ packages/trunk/nexuiz-data/debian/control 2009-10-20 17:50:45 UTC (rev
10442)
@@ -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".
Added:
packages/trunk/nexuiz-data/debian/patches/04_exclude_music_in_datapk3.diff
===================================================================
--- packages/trunk/nexuiz-data/debian/patches/04_exclude_music_in_datapk3.diff
(rev 0)
+++ packages/trunk/nexuiz-data/debian/patches/04_exclude_music_in_datapk3.diff
2009-10-20 17:50:45 UTC (rev 10442)
@@ -0,0 +1,13 @@
+Index: nexuiz-data-2.5.2/data/Makefile
+===================================================================
+--- nexuiz-data-2.5.2.orig/data/Makefile 2009-10-20 16:20:36.000000000
+0200
++++ nexuiz-data-2.5.2/data/Makefile 2009-10-20 16:29:32.000000000 +0200
+@@ -2,7 +2,7 @@
+ PERL ?= perl
+ PK3NAME ?= data.pk3
+ ZIP ?= 7za a -tzip -mx=9
+-ZIPEXCLUDE ?= -x\!*.pk3 -xr\!\.svn -x\!qcsrc
++ZIPEXCLUDE ?= -x\!*.pk3 -xr\!\.svn -x\!qcsrc -x\!sound/cdtracks
+ DIFF ?= diff
+
+ FTEQCCFLAGS ?= -Werror -Wall -Wno-mundane -O3 -Ono-c -Ono-cs -flo
Added:
packages/trunk/nexuiz-data/debian/patches/05_disable_development_warning.diff
===================================================================
---
packages/trunk/nexuiz-data/debian/patches/05_disable_development_warning.diff
(rev 0)
+++
packages/trunk/nexuiz-data/debian/patches/05_disable_development_warning.diff
2009-10-20 17:50:45 UTC (rev 10442)
@@ -0,0 +1,23 @@
+Index: nexuiz-data-2.5.2/data/defaultNexuiz.cfg
+===================================================================
+--- nexuiz-data-2.5.2.orig/data/defaultNexuiz.cfg 2009-10-20
18:36:44.000000000 +0200
++++ nexuiz-data-2.5.2/data/defaultNexuiz.cfg 2009-10-20 18:37:32.000000000
+0200
+@@ -1,16 +1,6 @@
+-set g_nexuizversion 2.5svn "Nexuiz version (formatted for humans)"
++set g_nexuizversion 2.5.2 "Nexuiz version (formatted for humans)"
+
+-//!<showbrand
+-showbrand 3
+-echo
+-echo A warning about this being a SVN development version was set up.
+-echo This build shall be used for development and testing only!
+-echo
+-echo If you want to disable this warning, add the line
+-echo showbrand 0
+-echo to your autoexec.cfg.
+-echo
+-//!>showbrand
++showbrand 0
+
+ // changes a cvar and reports it to the server (for the menu to notify the
+ // server about changes)
Modified: packages/trunk/nexuiz-data/debian/patches/series
===================================================================
--- packages/trunk/nexuiz-data/debian/patches/series 2009-10-20 16:47:49 UTC
(rev 10441)
+++ packages/trunk/nexuiz-data/debian/patches/series 2009-10-20 17:50:45 UTC
(rev 10442)
@@ -1,3 +1,5 @@
01_remove_broken_keys.diff
02_disable_update_check.diff
03_no_datapk3_timestamp.diff
+04_exclude_music_in_datapk3.diff
+05_disable_development_warning.diff
Modified: packages/trunk/nexuiz-data/debian/rules
===================================================================
--- packages/trunk/nexuiz-data/debian/rules 2009-10-20 16:47:49 UTC (rev
10441)
+++ packages/trunk/nexuiz-data/debian/rules 2009-10-20 17:50:45 UTC (rev
10442)
@@ -16,19 +16,13 @@
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 pro && zip -r ../datapro.pk3 * -9
- #
# 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
+ mkdir -p tmp/sound
+ cp -r data/sound/cdtracks tmp/sound
+ cd tmp && 7za a -tzip -mx=0 music.pk3 sound
touch build-stamp
clean: clean-patched unpatch
@@ -37,10 +31,8 @@
dh_testroot
$(MAKE) -C data clean
rm -f build-stamp configure-stamp
- rm -rf debian/tmp data/*.dat
- #rm -f data.pk3 datapro.pk3 music.pk3
- rm -f data/data.pk3 #\
- # music.pk3
+ rm -rf debian/tmp tmp
+ rm -f data/data.pk3
rm -f data/qcsrc/menu/fteqcc.log data/qcsrc/server/fteqcc.log \
data/qcsrc/client/fteqcc.log
dh_clean
@@ -48,11 +40,10 @@
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
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 tmp/music.pk3 usr/share/games/nexuiz/data
binary-arch: build install
binary-indep: build install
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
