[SCM] Packaging for OpenArena data branch, openarena-085-data, updated. 3bf5b76e225949f8e7e0fa107710b619b66ddf4e

[Simon McVittie]

The following commit has been merged in the openarena-085-data branch:
commit 8adc9b1dc96c661caad952b218c9b9cc5eeb714c
Merge: 32b0604fc3873b6c831f99963dcdec49dfdf67d3 b156c4668e94301c404db83c0d11e100de2dae25
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Jun 11 23:36:33 2011 +0100

    Merge branch 'master' into openarena-085-data
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index 029cb81,a9908a2..b1d2c12
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,12 +1,21 @@@
 -openarena-data (0.8.5split-2) UNRELEASED; urgency=low
++openarena-085-data (0.8.5split-2) UNRELEASED; urgency=low
+ 
 -  * Apply patch from Ubuntu to fix linking with more recent ld
 -    (Closes: #629893, LP: #794941)
 -  * Don't build qvmbrute unless we actually need to replace QVM files in
 -    this particular package (only -data, -misc and -085-data actually need it)
++  * Merge from openarena-data:
++    - Apply patch from Ubuntu to fix linking with more recent ld
++      (Closes: #629893, LP: #794941)
++    - Don't build qvmbrute unless we actually need to replace QVM files in
++      this particular package (only -data, -misc and -085-data actually need
++      it)
+ 
+  -- Simon McVittie <smcv at debian.org>  Sat, 11 Jun 2011 22:53:31 +0100
+ 
 +openarena-085-data (0.8.5split-1) unstable; urgency=low
 +
 +  * New source package partially replacing openarena-data, to split up the
 +    game content into more manageable pieces which fit on CDs better
 +
 + -- Simon McVittie <smcv at debian.org>  Sat, 28 May 2011 23:12:01 +0100
 +
  openarena-data (0.8.5split-1) experimental; urgency=low
  
    * Fix misspelling in Description (Closes: #609493) and make it less shouty

-- 
Packaging for OpenArena data