[prboom+] branch master updated (4c3ff4e -> be95392)

[Fabian Greffrath]

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

fabian-guest pushed a change to branch master
in repository prboom+.

      from  4c3ff4e   Bump Standards-Version to 3.9.6
       new  a06ccef   prepare new upstream snapshot
       new  c7884cb   Imported Upstream version 2.5.1.4~svn4425+dfsg1
       new  57fa742   Merge tag 'upstream/2.5.1.4_svn4425+dfsg1'
       new  51ce46e   Condense Debian-specific changes to the default configuration into a single patch.
       new  be95392   update debian/changelog

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 data/lumps/glfp.lmp                   |  3 +-
 debian/README.source                  |  2 +-
 debian/changelog                      | 14 +++++---
 debian/patches/cap_soundcommand.patch | 14 --------
 debian/patches/config-debian.patch    | 30 ++++++++++++++++
 debian/patches/series                 |  4 +--
 debian/patches/snd_midiplayer.patch   | 15 --------
 debian/patches/snd_soundfont.patch    | 14 --------
 src/MUSIC/flplayer.c                  |  3 ++
 src/SDL/i_sound.c                     |  2 ++
 src/am_map.c                          |  8 ++---
 src/i_sound.h                         |  2 ++
 src/m_misc.c                          |  2 ++
 src/r_main.c                          |  4 +--
 src/r_main.h                          |  2 +-
 src/r_plane.c                         | 64 +++++++----------------------------
 src/r_segs.c                          | 26 +++++++-------
 src/r_things.c                        |  6 ++--
 18 files changed, 89 insertions(+), 126 deletions(-)
 delete mode 100644 debian/patches/cap_soundcommand.patch
 create mode 100644 debian/patches/config-debian.patch
 delete mode 100644 debian/patches/snd_midiplayer.patch
 delete mode 100644 debian/patches/snd_soundfont.patch

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