[game-data-packager] 195/293: Merge tag 'debian/5'

[Simon McVittie]

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

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

commit 66c84dc7ce1c21353952140a478a63ab2647ddd2
Merge: 7942723 6df7990
Author: Simon McVittie <smcv at debian.org>
Date:   Mon Dec 2 09:38:55 2013 +0000

    Merge tag 'debian/5'
    
    Conflicts:
    	debian/changelog

 debian/changelog | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index b70bfa2,6876d87..5773231
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,10 +1,17 @@@
 +quake (5) UNRELEASED; urgency=low
 +
 +  * Generate recoloured icons for Quake mission packs
 +  * Put built files in build/
-   * quake2: change fallback dependency from quake-engine to the
-     correct quake2-engine (Closes: #728506)
 +
 + -- Simon McVittie <smcv at debian.org>  Sun, 29 Sep 2013 17:28:47 +0100
 +
+ quake (5) experimental; urgency=low
+ 
+   * Team upload.
+   * Fix quake2 dependency to be quake2-engine, not quake-engine.
+ 
+  -- Jonathan Dowland <jmtd at debian.org>  Mon, 11 Nov 2013 15:03:41 +0000
+ 
  quake (4) experimental; urgency=low
  
    * Add support for Quake II

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