[SCM] Packaging for OpenArena data branch, openarena-maps, updated. 2f55078c8c806bf4365c672995fe511d2edbb08f

[Simon McVittie]

The following commit has been merged in the openarena-maps branch:
commit 2f55078c8c806bf4365c672995fe511d2edbb08f
Merge: 0825cd03c717d52e56547517ad788593fd262f5b e0b6ed9aa33629d644f8156b81fa2f64bd4aba8a
Author: Simon McVittie <smcv at debian.org>
Date:   Sat May 28 23:19:30 2011 +0100

    Merge branch 'master' into openarena-maps
    
    Conflicts:
    	debian/control

diff --combined debian/changelog
index 2e5de45,0635782..021a962
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,3 +1,10 @@@
 +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>  Sun, 01 May 2011 23:12:05 +0100
++ -- 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
@@@ -24,7 -17,7 +24,7 @@@
    * Target experimental, since this package will be uninstallable until
      the other packages complete NEW processing
  
-  -- Simon McVittie <smcv at debian.org>  Sun, 01 May 2011 21:47:36 +0100
+  -- Simon McVittie <smcv at debian.org>  Sat, 28 May 2011 20:12:21 +0100
  
  openarena-data (0.8.5-3) unstable; urgency=low
  
diff --combined debian/control
index f4596c3,61608f8..5f71a4e
--- a/debian/control
+++ b/debian/control
@@@ -1,4 -1,4 +1,4 @@@
 -Source: openarena-data
 +Source: openarena-maps
  Section: games
  Priority: optional
  Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
@@@ -8,17 -8,24 +8,17 @@@ Build-Depends: debhelper (>= 8
  Build-Depends-Indep: libarchive-zip-perl, zip, zlib1g-dev
  Standards-Version: 3.9.2
  Homepage: http://www.openarena.ws/
- Vcs-Git: git://git.debian.org/git/pkg-games/openarena-data.git
- Vcs-Browser: http://git.debian.org/?p=pkg-games/openarena-data.git;h=openarena-maps
+ Vcs-Git: git://anonscm.debian.org/pkg-games/openarena-data.git
 -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/openarena-data.git
++Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/openarena-data.git;h=openarena-maps
  
 -Package: openarena-data
 +Package: openarena-081-maps
  Architecture: all
 -Depends: ${misc:Depends},
 -         openarena-081-maps,
 -         openarena-081-players,
 -         openarena-081-players-mature,
 -         openarena-081-textures,
 -         openarena-081-misc,
 -         openarena-085-data
 -Breaks: openarena-server (<< 0.8.1-8~), openarena (<< 0.8.1-8~)
 -Description: OpenArena game data
 +Depends: ${misc:Depends}
 +Replaces: openarena-data (<< 0.8.5split)
 +Description: OpenArena game data - maps from 0.8.1
   OpenArena is an open-source content package for the Quake III
   engine, effectively creating a free stand-alone game similar to
   Quake III Arena.
   .
   In Debian, OpenArena game data are divided into several packages.
 - This package contains the basic game content from OpenArena 0.8.1,
 - and depends on the rest of the game data from OpenArena 0.8.1 and 0.8.5.
 + This package contains maps from OpenArena 0.8.1.

-- 
Packaging for OpenArena data