[SCM] Packaging for OpenArena data branch, openarena-maps, updated. 3aaaa1bc9988c4686869e5c4ab567913cd58f00c

[Simon McVittie]

The following commit has been merged in the openarena-maps branch:
commit fa8add97a16cdcff573927cce5c1396293a3cdf7
Merge: 2f55078c8c806bf4365c672995fe511d2edbb08f bea1d1e2ef60b8e933ba81bcfbd472adc3831ddb
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Jul 16 14:57:35 2011 +0100

    Merge branch 'master' into openarena-maps

diff --combined debian/changelog
index 021a962,2900c06..14d9e09
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,13 +1,20 @@@
+ openarena-data (0.8.5split-2) unstable; 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)
+   * Move the split version of openarena-data to unstable
+ 
+  -- Simon McVittie <smcv at debian.org>  Tue, 12 Jul 2011 08:42:08 +0100
+ 
 +openarena-maps (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:19:16 +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