This is an automated email from the git hooks/post-receive script. fabian pushed a commit to branch master in repository prboom+.
commit bd73a82534ae377ddd7b95f1d1df91b8719f1235 Author: Fabian Greffrath <[email protected]> Date: Sun Jan 24 17:49:38 2016 +0100 Refresh patches --- debian/changelog | 3 ++- debian/patches/config-debian.patch | 6 +++--- debian/patches/reproducible-build.patch | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8b47d3f..f71ca08 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ prboom-plus (2:2.5.1.5~svn4462+dfsg1-1) unstable; urgency=medium * Imported Upstream version 2.5.1.5~svn4462+dfsg1 + This includes the 2.5.1.4 upstream release (r4459). * Restrict Build-Depends on libportmidi-dev to [linux-any]. + * Refresh patches. - -- Fabian Greffrath <[email protected]> Sun, 24 Jan 2016 17:44:41 +0100 + -- Fabian Greffrath <[email protected]> Sun, 24 Jan 2016 17:49:12 +0100 prboom-plus (2:2.5.1.4~svn4457+dfsg1-1) unstable; urgency=medium diff --git a/debian/patches/config-debian.patch b/debian/patches/config-debian.patch index 0cc6481..b1e0f4f 100644 --- a/debian/patches/config-debian.patch +++ b/debian/patches/config-debian.patch @@ -7,7 +7,7 @@ Description: Debian-specific changes to the default configuration --- a/src/m_misc.c +++ b/src/m_misc.c -@@ -380,9 +380,9 @@ default_t defaults[] = +@@ -376,9 +376,9 @@ default_t defaults[] = #ifdef _WIN32 {"snd_midiplayer",{NULL, &snd_midiplayer},{0,"fluidsynth"},UL,UL,def_str,ss_none}, #else @@ -19,12 +19,12 @@ Description: Debian-specific changes to the default configuration {"snd_mididev",{NULL, &snd_mididev},{0,""},UL,UL,def_str,ss_none}, // midi device to use for portmidiplayer #ifdef _WIN32 -@@ -983,7 +983,7 @@ default_t defaults[] = +@@ -979,7 +979,7 @@ default_t defaults[] = // NSM {"Video capture encoding settings",{NULL},{0},UL,UL,def_none,ss_none}, - {"cap_soundcommand",{NULL, &cap_soundcommand},{0,"oggenc2 -r -R %s -q 5 - -o output.ogg"},UL,UL,def_str,ss_none}, + {"cap_soundcommand",{NULL, &cap_soundcommand},{0,"oggenc -r -R %s -q 5 - -o output.ogg"},UL,UL,def_str,ss_none}, - {"cap_videocommand",{NULL, &cap_videocommand},{0,"x264 -o output.mp4 --crf 22 --muxer mp4 --demuxer raw --input-csp rgb --input-depth 8 --input-res %wx%h --fps 35 -"},UL,UL,def_str,ss_none}, + {"cap_videocommand",{NULL, &cap_videocommand},{0,"x264 -o output.mp4 --crf 18 --muxer mp4 --demuxer raw --input-csp rgb --input-depth 8 --input-res %wx%h --fps %r -"},UL,UL,def_str,ss_none}, {"cap_muxcommand",{NULL, &cap_muxcommand},{0,"mkvmerge -o %f output.mp4 output.ogg"},UL,UL,def_str,ss_none}, {"cap_tempfile1",{NULL, &cap_tempfile1},{0,"output.ogg"},UL,UL,def_str,ss_none}, diff --git a/debian/patches/reproducible-build.patch b/debian/patches/reproducible-build.patch index e6ea25e..843635d 100644 --- a/debian/patches/reproducible-build.patch +++ b/debian/patches/reproducible-build.patch @@ -13,7 +13,7 @@ Author: Fabian Greffrath <[email protected]> -const char version_date[] = __DATE__ " " __TIME__; --- a/src/d_main.c +++ b/src/d_main.c -@@ -1466,11 +1466,11 @@ static void D_DoomMainSetup(void) +@@ -1480,11 +1480,11 @@ static void D_DoomMainSetup(void) } /* cphipps - the main display. This shows the build date, copyright, and game type */ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/prboom+.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
