r10413 - in packages/trunk/nexuiz/debian: . patches

Fri Oct 16 11:19:41 UTC 2009

Author: fuddl-guest
Date: 2009-10-16 11:19:40 +0000 (Fri, 16 Oct 2009)
New Revision: 10413

Modified:
   packages/trunk/nexuiz/debian/NEWS.Debian
   packages/trunk/nexuiz/debian/changelog
   packages/trunk/nexuiz/debian/nexuiz-server.docs
   packages/trunk/nexuiz/debian/nexuiz.docs
   packages/trunk/nexuiz/debian/patches/10_detect_gnu-kfreebsd.patch
   packages/trunk/nexuiz/debian/patches/series
   packages/trunk/nexuiz/debian/rules
Log:
Prepare for Nexuiz 2.5.2

No longer install upstream Docs, it's not part of the engine, but of nexuiz-data

Sources are now in the tarball root, not in the darkplaces directory. So make
debian/rules do things in . instead of darkplaces/.


Modified: packages/trunk/nexuiz/debian/NEWS.Debian
===================================================================

--- packages/trunk/nexuiz/debian/NEWS.Debian	2009-10-13 02:19:02 UTC (rev 10412)
+++ packages/trunk/nexuiz/debian/NEWS.Debian	2009-10-16 11:19:40 UTC (rev 10413)
@@ -1,9 +1,9 @@
-nexuiz (2.5.1-1) unstable; urgency=low
+nexuiz (2.5.2-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 <fuddl at debian.org>  Fri, 11 Sep 2009 14:54:11 +0200
+ -- Bruno "Fuddl" Kleinert <fuddl at debian.org>  Fri, 16 Oct 2009 12:53:47 +0200
 
 nexuiz (2.4.2-1) unstable; urgency=low
 

Modified: packages/trunk/nexuiz/debian/changelog
===================================================================
--- packages/trunk/nexuiz/debian/changelog	2009-10-13 02:19:02 UTC (rev 10412)
+++ packages/trunk/nexuiz/debian/changelog	2009-10-16 11:19:40 UTC (rev 10413)
@@ -1,4 +1,4 @@
-nexuiz (2.5.1-1) UNRELEASE; urgency=low
+nexuiz (2.5.2-1) UNRELEASED; urgency=low
 
   [ Bruno "Fuddl" Kleinert ]
   * New upstream release (Closes: #522514)
@@ -9,8 +9,8 @@
   * 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
+  * Drop 10_ambiguous_keyboard_bindings.dpatch since we no longer keep Nexuiz
+    specific documentation in this package anymore.
   * 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.
@@ -21,12 +21,16 @@
     * 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
+  * Obtain source from upstream Subversion repository. In previous packages we
+    always used the sources archive within nexuiz-VERSION.zip.
+  * Refresh 10_detect_gnu-kfreebsd.patch because we don't keep the sources in
+    darkplaces/ anymore.
 
   [ Gonéri Le Bouder ]
   * xqf is not mandatoried to run the game. Downgrade xqf dependency from
     recommends to suggests. Thanks FTF 3k3 (Closes: #512456)
 
- -- Bruno "Fuddl" Kleinert <fuddl at debian.org>  Fri, 11 Sep 2009 19:35:39 +0200
+ -- Bruno "Fuddl" Kleinert <fuddl at debian.org>  Fri, 16 Oct 2009 12:52:25 +0200
 
 nexuiz (2.4.2-1) unstable; urgency=low
 

Modified: packages/trunk/nexuiz/debian/nexuiz-server.docs
===================================================================
--- packages/trunk/nexuiz/debian/nexuiz-server.docs	2009-10-13 02:19:02 UTC (rev 10412)
+++ packages/trunk/nexuiz/debian/nexuiz-server.docs	2009-10-16 11:19:40 UTC (rev 10413)
@@ -1,11 +1 @@
-Docs/darkplaces.txt
-Docs/egyptsoc
-Docs/eventlog.txt
-Docs/faq.html
-Docs/htmlfiles
-Docs/irc.html
-Docs/mapdownload.txt
-Docs/mapping.txt
-Docs/say-esc.html
-Docs/scorelog.txt
 debian/README.Debian

Modified: packages/trunk/nexuiz/debian/nexuiz.docs
===================================================================
--- packages/trunk/nexuiz/debian/nexuiz.docs	2009-10-13 02:19:02 UTC (rev 10412)
+++ packages/trunk/nexuiz/debian/nexuiz.docs	2009-10-16 11:19:40 UTC (rev 10413)
@@ -1,13 +1,2 @@
-Docs/basics.html
-Docs/darkplaces.txt
-Docs/egyptsoc
-Docs/eventlog.txt
-Docs/faq.html
-Docs/htmlfiles
-Docs/irc.html
-Docs/mapdownload.txt
-Docs/mapping.txt
-Docs/say-esc.html
-Docs/scorelog.txt
 debian/README.Debian
 debian/NEWS.Debian

Modified: packages/trunk/nexuiz/debian/patches/10_detect_gnu-kfreebsd.patch
===================================================================
--- packages/trunk/nexuiz/debian/patches/10_detect_gnu-kfreebsd.patch	2009-10-13 02:19:02 UTC (rev 10412)
+++ packages/trunk/nexuiz/debian/patches/10_detect_gnu-kfreebsd.patch	2009-10-16 11:19:40 UTC (rev 10413)
@@ -5,9 +5,9 @@
 ## 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
+diff -urNad nexuiz-2.2.1~/makefile nexuiz-2.2.1/makefile
+--- nexuiz-2.2.1~/makefile	2006-12-05 14:12:52.000000000 +0100
++++ nexuiz-2.2.1/makefile	2006-12-26 12:24:24.637350250 +0100
 @@ -9,6 +9,10 @@
  
  # UNIXes

Modified: packages/trunk/nexuiz/debian/patches/series
===================================================================
--- packages/trunk/nexuiz/debian/patches/series	2009-10-13 02:19:02 UTC (rev 10412)
+++ packages/trunk/nexuiz/debian/patches/series	2009-10-16 11:19:40 UTC (rev 10413)
@@ -1,2 +1 @@
-10_ambiguous_keyboard_bindings.patch
 10_detect_gnu-kfreebsd.patch

Modified: packages/trunk/nexuiz/debian/rules
===================================================================
--- packages/trunk/nexuiz/debian/rules	2009-10-13 02:19:02 UTC (rev 10412)
+++ packages/trunk/nexuiz/debian/rules	2009-10-16 11:19:40 UTC (rev 10413)
@@ -14,8 +14,7 @@
 build: build-stamp
 build-stamp: patch-stamp
 	dh_testdir
-	$(MAKE) -C darkplaces \
-			CFLAGS_DEBUG="$(CFLAGS)" \
+	$(MAKE) CFLAGS_DEBUG="$(CFLAGS)" \
 			DP_FS_BASEDIR=/usr/share/games/nexuiz \
 			sdl-debug sv-debug
 	touch build-stamp
@@ -26,7 +25,7 @@
 	dh_testroot
 	rm -f build-stamp configure-stamp
 	rm -rf debian/tmp
-	$(MAKE) -C darkplaces clean
+	$(MAKE) clean
 	dh_clean
 
 unpatch:
@@ -39,10 +38,10 @@
 	dh_clean -k 
 	dh_installdirs
 	mkdir -p debian/tmp
-	cp darkplaces/darkplaces-sdl debian/tmp/nexuiz
-	cp darkplaces/darkplaces-dedicated debian/tmp/nexuiz-server
-	convert darkplaces/nexuiz.xpm debian/tmp/nexuiz48x48.png
-	convert -scale 32x32 darkplaces/nexuiz.xpm debian/tmp/nexuiz.xpm
+	cp darkplaces-sdl debian/tmp/nexuiz
+	cp darkplaces-dedicated debian/tmp/nexuiz-server
+	convert nexuiz.xpm debian/tmp/nexuiz48x48.png
+	convert -scale 32x32 nexuiz.xpm debian/tmp/nexuiz.xpm
 	dh_install
 	
 binary-indep: build install


