[icebreaker] 14/22: Merge branch 'ubuntu'

[Andreas Gnau]

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

rondom-guest pushed a commit to branch master
in repository icebreaker.

commit a6257cb8ce500af801ff4a114b203d2315726038
Merge: 3954163 508debd
Author: Andreas Gnau <Rondom at Rondom.de>
Date:   Thu Aug 10 16:25:22 2017 -0400

    Merge branch 'ubuntu'

 debian/changelog | 14 ++++++++++++++
 debian/compat    |  1 +
 debian/control   |  2 +-
 debian/rules     |  3 ---
 options.c        |  4 ++--
 5 files changed, 18 insertions(+), 6 deletions(-)

diff --cc debian/control
index 79c0f98,9608ac2..a94cd08
--- a/debian/control
+++ b/debian/control
@@@ -1,8 -1,9 +1,8 @@@
  Source: icebreaker
  Section: games
  Priority: optional
 -Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
 -XSBC-Original-Maintainer: LaMont Jones <lamont at debian.org>
 +Maintainer: LaMont Jones <lamont at debian.org>
- Build-Depends: debhelper, libsdl-mixer1.2-dev (>= 1.2.0-1.1)
+ Build-Depends: debhelper (>= 9), libsdl-mixer1.2-dev (>= 1.2.0-1.1)
  Standards-Version: 3.1.1
  XS-Vcs-Browser: http://git.debian.org/?p=users/lamont/icebreaker.git
  XS-Vcs-Git: git://git.debian.org/~lamont/icebreaker.git

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