This is an automated email from the git hooks/post-receive script. mgilbert pushed a commit to branch master in repository deng.
commit fe44f1e5d04d0d274ce337197191e0216f9f9329 Author: Michael Gilbert <[email protected]> Date: Sun Jan 3 04:13:20 2016 +0000 release 1.15.7-1 --- debian/changelog | 9 ++++ debian/doomsday-common.lintian-overrides | 3 +- debian/patches/freedoom.patch | 82 -------------------------------- debian/patches/series | 1 - debian/patches/spelling.patch | 33 +++++++++++++ 5 files changed, 43 insertions(+), 85 deletions(-) diff --git a/debian/changelog b/debian/changelog index 559ea8e..fce9dc6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +doomsday (1.15.7-1) unstable; urgency=medium + + * New upstream release. + - Build failure fixed (closes: #809266). + - Support for freedoom (drop freedoom.patch). + * Add more spelling corrections. + + -- Michael Gilbert <[email protected]> Sun, 03 Jan 2016 01:24:11 +0000 + doomsday (1.15.5-1) unstable; urgency=medium * New upstream release. diff --git a/debian/doomsday-common.lintian-overrides b/debian/doomsday-common.lintian-overrides index fd6c324..a5bca46 100644 --- a/debian/doomsday-common.lintian-overrides +++ b/debian/doomsday-common.lintian-overrides @@ -1,5 +1,4 @@ # no upstream changelog provided no-upstream-changelog -# debhelper bug causes these -postrm-has-useless-call-to-ldconfig +# debhelper bug causes this postinst-has-useless-call-to-ldconfig diff --git a/debian/patches/freedoom.patch b/debian/patches/freedoom.patch deleted file mode 100644 index 811c800..0000000 --- a/debian/patches/freedoom.patch +++ /dev/null @@ -1,82 +0,0 @@ -description: add support for loading freedoom wads - ---- a/doomsday/plugins/doom/src/d_api.c -+++ b/doomsday/plugins/doom/src/d_api.c -@@ -69,6 +69,15 @@ int G_RegisterGames(int hookType, int pa - #define LEGACYSAVEGAMENAMEEXP "^(?:DoomSav)[0-9]{1,1}(?:.dsg)" - #define LEGACYSAVEGAMESUBFOLDER "savegame" - -+ GameDef const freedoom2Def = { -+ "freedoom2", "doom", "Freedoom: Phase 2", "Contributors to the Freedoom project" -+ }; -+ GameDef const freedoom1Def = { -+ "freedoom1", "doom", "Freedoom: Phase 1", "Contributors to the Freedoom project" -+ }; -+ GameDef const freedmDef = { -+ "freedm", "doom", "FreeDM", "Contributors to the Freedoom project" -+ }; - GameDef const hacxDef = { - "hacx", "hacx", - "HACX - Twitch 'n Kill", "Banjo Software", -@@ -120,6 +129,24 @@ int G_RegisterGames(int hookType, int pa - - DENG_UNUSED(hookType); DENG_UNUSED(param); DENG_UNUSED(data); - -+ /* Freedoom: Phase 2 */ -+ gameIds[doom2_freedoom2] = DD_DefineGame(&freedoom2Def); -+ DD_AddGameResource(GID(doom2_freedoom2), RC_PACKAGE, FF_STARTUP, STARTUPPK3, 0); -+ DD_AddGameResource(GID(doom2_freedoom2), RC_PACKAGE, FF_STARTUP, "freedoom.wad;freedoom2.wad", "MAP01;FREEDOOM"); -+ DD_AddGameResource(GID(doom2_freedoom2), RC_DEFINITION, 0, "doom2.ded", 0); -+ -+ /* Freedoom: Phase 1 */ -+ gameIds[doom_freedoom1] = DD_DefineGame(&freedoom1Def); -+ DD_AddGameResource(GID(doom_freedoom1), RC_PACKAGE, FF_STARTUP, STARTUPPK3, 0); -+ DD_AddGameResource(GID(doom_freedoom1), RC_PACKAGE, FF_STARTUP, "freedoomu.wad;freedoom1.wad", "E1M1;E4M1;FREEDOOM"); -+ DD_AddGameResource(GID(doom_freedoom1), RC_DEFINITION, 0, "doom1-ultimate.ded", 0); -+ -+ /* FreeDM */ -+ gameIds[doom2_freedm] = DD_DefineGame(&freedmDef); -+ DD_AddGameResource(GID(doom2_freedm), RC_PACKAGE, FF_STARTUP, STARTUPPK3, 0); -+ DD_AddGameResource(GID(doom2_freedm), RC_PACKAGE, FF_STARTUP, "freedm.wad", "MAP01;FREEDOOM;FREEDM"); -+ DD_AddGameResource(GID(doom2_freedm), RC_DEFINITION, 0, "doom2.ded", 0); -+ - /* HacX */ - gameIds[doom2_hacx] = DD_DefineGame(&hacxDef); - DD_AddGameResource(GID(doom2_hacx), RC_PACKAGE, FF_STARTUP, STARTUPPK3, 0); -@@ -186,6 +213,9 @@ void DP_Load(void) - gameIds[doom2_tnt] = DD_GameIdForKey("doom2-tnt"); - gameIds[doom2_plut] = DD_GameIdForKey("doom2-plut"); - gameIds[doom2_hacx] = DD_GameIdForKey("hacx"); -+ gameIds[doom2_freedoom2] = DD_GameIdForKey("freedoom2"); -+ gameIds[doom_freedoom1] = DD_GameIdForKey("freedoom1"); -+ gameIds[doom2_freedm] = DD_GameIdForKey("freedm"); - - Plug_AddHook(HOOK_VIEWPORT_RESHAPE, R_UpdateViewport); - } ---- a/doomsday/plugins/doom/include/doomdef.h -+++ b/doomsday/plugins/doom/include/doomdef.h -@@ -72,6 +72,9 @@ typedef enum { - doom2_plut, - doom2_tnt, - doom2_hacx, -+ doom2_freedoom2, -+ doom_freedoom1, -+ doom2_freedm, - NUM_GAME_MODES - } gamemode_t; - -@@ -84,9 +87,12 @@ typedef enum { - #define GM_DOOM2_PLUT 0x20 - #define GM_DOOM2_TNT 0x40 - #define GM_DOOM2_HACX 0x80 -+#define GM_DOOM2_FREEDOOM2 0x100 -+#define GM_DOOM_FREEDOOM1 0x200 -+#define GM_DOOM2_FREEDM 0x400 - --#define GM_ANY_DOOM (GM_DOOM|GM_DOOM_SHAREWARE|GM_DOOM_ULTIMATE|GM_DOOM_CHEX) --#define GM_ANY_DOOM2 (GM_DOOM2|GM_DOOM2_PLUT|GM_DOOM2_TNT|GM_DOOM2_HACX) -+#define GM_ANY_DOOM (GM_DOOM|GM_DOOM_SHAREWARE|GM_DOOM_ULTIMATE|GM_DOOM_CHEX|GM_DOOM_FREEDOOM1) -+#define GM_ANY_DOOM2 (GM_DOOM2|GM_DOOM2_PLUT|GM_DOOM2_TNT|GM_DOOM2_HACX|GM_DOOM2_FREEDOOM2|GM_DOOM2_FREEDM) - #define GM_ANY (GM_ANY_DOOM|GM_ANY_DOOM2) - - #define SCREENWIDTH 320 diff --git a/debian/patches/series b/debian/patches/series index 5b58267..a3ca383 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,7 +5,6 @@ packs.patch manpages.patch spelling.patch -freedoom.patch no-libexample.patch no-timestamps.patch diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch index 333ac67..61ec9d0 100644 --- a/debian/patches/spelling.patch +++ b/debian/patches/spelling.patch @@ -57,3 +57,36 @@ author: Michael Gilbert <[email protected]> DENG2_FOR_EACH(Things, i, things) { dint idx = i - things.begin(); +--- a/doomsday/client/src/sys_system.cpp ++++ b/doomsday/client/src/sys_system.cpp +@@ -194,7 +194,7 @@ int Sys_CriticalMessage(const char* msg) + + int Sys_CriticalMessagef(const char* format, ...) + { +- static const char* unknownMsg = "Unknown critical issue occured."; ++ static const char* unknownMsg = "Unknown critical issue occurred."; + const size_t BUF_SIZE = 655365; + const char* msg; + char* buf = 0; +--- a/doomsday/client/src/ui/infine/finaleinterpreter.cpp ++++ b/doomsday/client/src/ui/infine/finaleinterpreter.cpp +@@ -918,7 +918,7 @@ void FinaleInterpreter::loadScript(char + + if(!d->executeCommand(d->token, FID_ONLOAD)) + App_Error("FinaleInterpreter::LoadScript: Unknown error" +- "occured executing directive \"OnLoad\"."); ++ "occurred executing directive \"OnLoad\"."); + } + d->findEnd(); + end_read: +--- a/doomsday/plugins/common/src/p_xgline.cpp ++++ b/doomsday/plugins/common/src/p_xgline.cpp +@@ -1309,7 +1309,7 @@ int XL_ValidateLineRef(Line *line, int r + + if(!P_ToXLine(line)->xg->info.actTag) + { +- LOG_MAP_MSG_XGDEVONLY("REFERENCE DOESNT HAVE AN ACT TAG"); ++ LOG_MAP_MSG_XGDEVONLY("REFERENCE DOESN'T HAVE AN ACT TAG"); + break; + } + -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/deng.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
