[SCM] Packaging of the Nexuiz game data branch, master, updated. debian/2.5.2-1-7-g1f2b9c4

[Bruno Kleinert]

The following commit has been merged in the master branch:
commit 1f2b9c4a3f9744305a6211c43c44ef830b1f1a37
Author: Bruno Kleinert <fuddl at tauware.de>
Date:   Sat Nov 21 00:11:09 2009 +0100

    Split up nexuiz-data
    
    Split the binary package nexuiz-data into nexuiz-data and nexuiz-textures. This
    should close #557218, so the game is redistributable in binary form on CD-ROMs
    again.

diff --git a/debian/changelog b/debian/changelog
index bb95f26..1052d4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,11 @@ nexuiz-data (2.5.2-3) unstable; urgency=low
     * Purge quilt calls from rules file
   * Correct URLs in Vcs-* fields in the control file, since I moved this package
     into Git
+  * Ship textures in the binary package nexuiz-textures. This reduces the size
+    of nexuiz-data, it's possible to put Nexuiz on CD-ROMs again and we can
+    (Closes: #557218)
 
- -- Bruno "Fuddl" Kleinert <fuddl at debian.org>  Fri, 20 Nov 2009 17:12:17 +0100
+ -- Bruno "Fuddl" Kleinert <fuddl at debian.org>  Fri, 20 Nov 2009 19:58:30 +0100
 
 nexuiz-data (2.5.2-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index cdeb4b1..79e460c 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-games/nexuiz-data.git;a=summary
 
 Package: nexuiz-data
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, nexuiz-textures (= ${source:Version})
 Conflicts: nexuiz (<< ${source:Upstream-Version}), nexuiz-server (<< ${source:Upstream-Version})
 Suggests: nexuiz-music (>= ${source:Upstream-Version}), nexuiz (>= ${source:Upstream-Version}) | nexuiz-server (>= ${source:Upstream-Version})
 Description: Nexuiz game data files
@@ -25,6 +25,19 @@ Description: Nexuiz game data files
  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-textures
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: nexuiz (>= ${source:Upstream-Version})
+Description: Textures for Nexuiz
+ 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 textures for maps, models and so on. If you want
+ to play the game you need to install the package "nexuiz".
+
 Package: nexuiz-music
 Architecture: all
 Depends: ${misc:Depends}
diff --git a/debian/nexuiz-textures.install b/debian/nexuiz-textures.install
new file mode 100644
index 0000000..0ae5813
--- /dev/null
+++ b/debian/nexuiz-textures.install
@@ -0,0 +1 @@
+data/textures.pk3 usr/share/games/nexuiz/data
diff --git a/debian/patches/04_exclude_music_in_datapk3.diff b/debian/patches/exclude_textures_from_data.pk3.diff
similarity index 54%
copy from debian/patches/04_exclude_music_in_datapk3.diff
copy to debian/patches/exclude_textures_from_data.pk3.diff
index a6bf65a..3ab09c8 100644
--- a/debian/patches/04_exclude_music_in_datapk3.diff
+++ b/debian/patches/exclude_textures_from_data.pk3.diff
@@ -1,13 +1,13 @@
-Index: nexuiz-data-2.5.2/data/Makefile
+Index: nexuiz-data/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
+--- nexuiz-data.orig/data/Makefile	2009-11-20 17:40:02.000000000 +0100
++++ nexuiz-data/data/Makefile	2009-11-20 17:40:24.000000000 +0100
 @@ -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
+-ZIPEXCLUDE ?= -x\!*.pk3 -xr\!\.svn -x\!qcsrc -x\!sound/cdtracks
++ZIPEXCLUDE ?= -x\!*.pk3 -xr\!\.svn -x\!qcsrc -x\!sound/cdtracks -x\!textures
  DIFF ?= diff
  
  FTEQCCFLAGS ?= -Werror -Wall -Wno-mundane -O3 -Ono-c -Ono-cs -flo
diff --git a/debian/patches/series b/debian/patches/series
index 492f69c..81d6ee0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 03_no_datapk3_timestamp.diff
 04_exclude_music_in_datapk3.diff
 05_disable_development_warning.diff
+exclude_textures_from_data.pk3.diff
diff --git a/debian/rules b/debian/rules
index 2b6ea30..959563d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,8 @@ build-stamp:
 	mkdir -p tmp/sound
 	cp -r data/sound/cdtracks tmp/sound
 	cd tmp && 7za a -tzip -mx=0 music.pk3 sound
+	# Same thing for the textures
+	cd data && 7za a -tzip -mx=9 textures.pk3 textures
 	touch build-stamp
 
 clean:
@@ -21,7 +23,8 @@ clean:
 	$(MAKE) -C data clean
 	rm -f build-stamp configure-stamp
 	rm -rf debian/tmp tmp
-	rm -f data/data.pk3
+	rm -f data/data.pk3 \
+		data/textures.pk3
 	rm -f data/qcsrc/menu/fteqcc.log data/qcsrc/server/fteqcc.log \
 		data/qcsrc/client/fteqcc.log
 	dh_clean

-- 
Packaging of the Nexuiz game data