[game-data-packager] 03/03: Merge branch 'jmtd'

[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 dc9eb4cdc67341b109698a16d1ab10fcad6440db
Merge: 94ced18 2f0099e
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Dec 26 12:16:31 2014 +0000

    Merge branch 'jmtd'

 .gitignore         |  8 --------
 debian/changelog   | 12 +++++++++++-
 doc/todo.mdwn      |  2 ++
 supported/q2rogue  |  3 +++
 supported/q2xatrix |  3 +++
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --cc debian/changelog
index 429c5bb,d11a663..a1a6eac
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,13 +1,25 @@@
- game-data-packager (36+) UNRELEASED; urgency=low
++game-data-packager (38) 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 (37) unstable; urgency=low
+ 
+   * q2rogue, q2xatrix: Correctly remove source tarballs when
+     cleaning up.
+   * Remove some stray placeholder targets that got into the last
+     upload by accident.
+   * Upload to unstable.
+ 
+  -- Jonathan Dowland <jmtd at debian.org>  Mon, 18 Nov 2013 21:20:50 +0000
+ 
  game-data-packager (36) experimental; urgency=low
  
    * Add support for Quake 2 Mission Pack: The Reckoning and

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