[SCM] Packaging for the OpenArena engine branch, master, updated. debian/0.8.5-7-5-g8867603

[Simon McVittie]

The following commit has been merged in the master branch:
commit 88676031333d817099fece39b2f4d1d57697f40a
Merge: 98f41fa2b572ede640a56fc213b161861bf81e73 db8a76afcded496ef726196d2b878309beb7f08d
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Jul 24 00:00:24 2011 +0100

    Merge remote-tracking branch 'origin/master'
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index e2a3322,ae0bbc2..6d2a0b0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,11 +1,22 @@@
 -openarena (0.8.5-9) unstable; urgency=low
++openarena (0.8.5-10) UNRELEASED; urgency=low
+ 
+   [ Bruno "Fuddl" Kleinert ]
+   * As the package uses debhelper (>= 8) the parallel=N stuff can be removed
+     from debian/rules
+ 
+  -- Bruno "Fuddl" Kleinert <fuddl at debian.org>  Fri, 25 Mar 2011 18:15:00 +0100
+ 
 +openarena (0.8.5-9) unstable; urgency=low
 +
 +  * Remove build-dependencies that were only there to support the engine,
 +    which we no longer build from this source package
 +    - in particular, libjpeg62-dev (Closes: #635089)
 +  * Force CFLAGS from SDL to not be used, even if it's installed, to make
 +    sure builds are consistent
 +  * Standards-Version: 3.9.2 (no changes)
 +
 + -- Simon McVittie <smcv at debian.org>  Sat, 23 Jul 2011 19:12:43 +0100
 +
  openarena (0.8.5-8) unstable; urgency=low
  
    * Team upload
diff --combined debian/rules
index 9ffd42c,c09f623..6548daf
--- a/debian/rules
+++ b/debian/rules
@@@ -1,11 -1,6 +1,6 @@@
  #!/usr/bin/make -f
  #export DH_VERBOSE=1
  
- ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-     NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-     MAKEFLAGS += -j$(NUMJOBS)
- endif
- 
  Q3ARCH             := $(shell /usr/share/ioquake3/q3arch arch     HOST)
  Q3PLATFORM         := $(shell /usr/share/ioquake3/q3arch platform HOST)
  Q3COMPILE_ARCH     := $(shell /usr/share/ioquake3/q3arch arch     BUILD)
@@@ -28,9 -23,7 +23,9 @@@ GENERAL_OPTIONS = 
  	ARCH=$(Q3ARCH) \
  	PLATFORM=$(Q3PLATFORM) \
  	COMPILE_ARCH=$(Q3COMPILE_ARCH) \
 -	COMPILE_PLATFORM=$(Q3COMPILE_PLATFORM)
 +	COMPILE_PLATFORM=$(Q3COMPILE_PLATFORM) \
 +	SDL_CFLAGS= \
 +	$(NULL)
  
  TARGET = release
  

-- 
Packaging for the OpenArena engine