[game-data-packager] 01/03: Merge tag '36' of ssh://anonscm.debian.org/git/pkg-games/game-data-packager

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch master
in repository game-data-packager.

commit 94ced18d2aea943ec915fe0f9d37a2c1a8fdcc28
Merge: 90f1c2e 31dddc2
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Dec 26 12:11:33 2014 +0000

    Merge tag '36' of ssh://anonscm.debian.org/git/pkg-games/game-data-packager
    
    tagging 36

 Makefile                       |  4 +++
 debian/changelog               | 10 ++++++-
 debian/control                 |  8 +++--
 lib/game-data-packager-shared  | 50 ++++++++++++++++++++++++++++---
 lib/q2mp-common                | 53 ++++++++++++++++++++++++++++++++
 quake2.mk                      |  6 ++++
 quake2/quake2-rogue.control    | 14 +++++++++
 quake2/quake2-rogue.copyright  | 22 ++++++++++++++
 quake2/quake2-xatrix.control   | 14 +++++++++
 quake2/quake2-xatrix.copyright | 22 ++++++++++++++
 supported/doom2                |  2 +-
 supported/hexen2               |  2 +-
 supported/lgeneral             |  5 +---
 supported/q2rogue              | 64 +++++++++++++++++++++++++++++++++++++++
 supported/q2xatrix             | 68 ++++++++++++++++++++++++++++++++++++++++++
 supported/quake                | 15 ++++------
 supported/quake2               |  5 ++--
 supported/wolf3d               |  1 +
 tests/lib/require_program      | 13 ++++++++
 tests/runtests                 |  7 +++++
 20 files changed, 360 insertions(+), 25 deletions(-)

diff --cc debian/changelog
index e1fc301,793b4c9..429c5bb
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,11 +1,23 @@@
- game-data-packager (35+nmu1) UNRELEASED; urgency=low
++game-data-packager (36+) UNRELEASED; urgency=low
 +
 +  * Team upload.
 +  * Add Multi-Arch: foreign fields to all Architecture: all packages.
 +  * Prefer chocolate-doom over other engines providing doom-engine,
 +    heretic engine or hexen-engine, respectively. Add Breaks against
 +    versions of chocolate-doom not providing hertic-engine or hexen-engine.
 +  * Start heretic and hexen by calling the binaries of the same names in the
 +    respective desktop files.
 +
 + -- Fabian Greffrath <fabian+debian at greffrath.com>  Mon, 25 Nov 2013 11:24:57 +0100
 +
+ game-data-packager (36) experimental; urgency=low
+ 
+   * Add support for Quake 2 Mission Pack: The Reckoning and
+     Quake 2 Mission Pack: Ground Zero.
+   * Tweak long description a bit.
+ 
+  -- Jonathan Dowland <jmtd at debian.org>  Wed, 23 Oct 2013 21:43:17 +0100
+ 
  game-data-packager (35) unstable; urgency=low
  
    * Stop conflict/providing/replacing "doom-package": the old one

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git