[game-data-packager] 179/293: Merge remote-tracking branch 'origin/master'

[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 005af776ed0cb64c81d74147a94c21ee6348f0a9
Merge: eca264e f77e453
Author: Simon McVittie <smcv at debian.org>
Date:   Mon Sep 16 23:49:29 2013 +0100

    Merge remote-tracking branch 'origin/master'
    
    Conflicts:
    	debian/changelog

 debian/changelog         | 9 +++++++++
 debian/compat            | 2 +-
 debian/control           | 4 ++--
 debian/quake-server.init | 8 ++++++--
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --cc debian/changelog
index a55d926,d3d0cc3..b116ac9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,12 +1,22 @@@
 -quake (2) UNRELEASED; urgency=low
++quake (3) UNRELEASED; urgency=low
+ 
+   * Add LSB description field to init script.
+   * Add status action to init script (ported from quake3 package).
+   * Bump debhelper compat version to 9 to avoid python warning.
+   * Bump standards version to the latest version, 3.9.3.
+ 
+  -- David Banks <amoebae at gmail.com>  Thu, 18 Oct 2012 12:23:51 +0100
+ 
 +quake (2) unstable; urgency=low
 +
 +  [ David Banks ]
 +  * Suggest correct path to darkplaces
 +
 +  [ Simon McVittie ]
 +  * Upload to unstable
 +
 + -- Simon McVittie <smcv at debian.org>  Wed, 09 Nov 2011 18:16:05 +0000
 +
  quake (1) experimental; urgency=low
  
    [ David Banks ]

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