This is an automated email from the git hooks/post-receive script. mgilbert pushed a commit to branch master in repository deng.
commit 8c24c6cd6f1b899ee7c64701da63e9573ee15843 Author: Michael Gilbert <[email protected]> Date: Tue Jul 7 03:19:11 2015 +0000 release 1.15.1-1 --- debian/changelog | 8 + debian/copyright | 3 + .../{noexample.patch => no-libexample.patch} | 0 .../{exit-calls.patch => no-shlibexits.patch} | 49 +++++ debian/patches/no-timestamps.patch | 203 +++++++++++++++++++++ debian/patches/series | 5 +- debian/{ => source}/lintian-overrides | 0 7 files changed, 266 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 651fe88..7b0b982 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +doomsday (1.15.1-1) unstable; urgency=medium + + * New upstream release. + * Remove timestamp macros. + * Replace more shared library exit calls. + + -- Michael Gilbert <[email protected]> Mon, 06 Jul 2015 19:01:53 +0000 + doomsday (1.15.0-1) unstable; urgency=medium * New upstream release. diff --git a/debian/copyright b/debian/copyright index ace2e89..6ffeb03 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,6 +5,9 @@ Upstream-Contact: http://dengine.net/forums Files-Excluded: distrib snowberry + doomsday/client/res + doomsday/libcore/res + doomsday/tools/shell/shell-gui/res doomsday/external/zlib doomsday/external/assimp doomsday/external/fluidsynth diff --git a/debian/patches/noexample.patch b/debian/patches/no-libexample.patch similarity index 100% rename from debian/patches/noexample.patch rename to debian/patches/no-libexample.patch diff --git a/debian/patches/exit-calls.patch b/debian/patches/no-shlibexits.patch similarity index 82% rename from debian/patches/exit-calls.patch rename to debian/patches/no-shlibexits.patch index bf60dd5..d885ca0 100644 --- a/debian/patches/exit-calls.patch +++ b/debian/patches/no-shlibexits.patch @@ -197,3 +197,52 @@ author: Michael Gilbert <[email protected]> } int ST_ChatResponder(int player, event_t* ev) +--- a/doomsday/libdoomsday/src/console/knownword.cpp ++++ b/doomsday/libdoomsday/src/console/knownword.cpp +@@ -64,7 +64,7 @@ static bool compareKnownWordByName(known + + default: + App_FatalError("compareKnownWordByName: Invalid type %i for word A.", wA->type); +- exit(1); // Unreachable ++ abort(); // Unreachable + } + + switch(wB->type) +@@ -76,7 +76,7 @@ static bool compareKnownWordByName(known + + default: + App_FatalError("compareKnownWordByName: Invalid type %i for word B.", wB->type); +- exit(1); // Unreachable ++ abort(); // Unreachable + } + + return Str_CompareIgnoreCase(textA, Str_Text(textB)) < 0; +@@ -98,7 +98,7 @@ static AutoStr *textForKnownWord(knownwo + + default: + App_FatalError("textForKnownWord: Invalid type %i for word.", word->type); +- exit(1); // Unreachable ++ abort(); // Unreachable + } + + return text; +--- a/doomsday/libdoomsday/src/filesys/filehandle.cpp ++++ b/doomsday/libdoomsday/src/filesys/filehandle.cpp +@@ -67,7 +67,7 @@ struct FileHandle::Instance + static void errorIfNotValid(FileHandle const &file, char const * /*callerName*/) + { + DENG2_ASSERT(file.isValid()); +- if(!file.isValid()) exit(1); ++ if(!file.isValid()) abort(); + } + + FileHandle::FileHandle() +--- a/doomsday/liblegacy/src/liblegacy.c ++++ b/doomsday/liblegacy/src/liblegacy.c +@@ -44,5 +44,5 @@ void Libdeng_Shutdown(void) + + void Libdeng_BadAlloc(void) + { +- exit(-1); ++ abort(); + } diff --git a/debian/patches/no-timestamps.patch b/debian/patches/no-timestamps.patch new file mode 100644 index 0000000..b1aa4a9 --- /dev/null +++ b/debian/patches/no-timestamps.patch @@ -0,0 +1,203 @@ +description: avoid timestamp macros +author: Michael Gilbert <[email protected]> + +--- a/doomsday/client/include/dd_def.h ++++ b/doomsday/client/include/dd_def.h +@@ -77,7 +77,7 @@ extern "C" { + + #define DOOMSDAY_VER_ID DOOMSDAY_RELEASE_TYPE DOOMSDAY_VER_ID_64BIT DOOMSDAY_VER_ID_DEBUG DOOMSDAY_VER_ID_RANGECHECK DOOMSDAY_VER_ID_BUILD + +-#define DOOMSDAY_VERSION_FULLTEXT DOOMSDAY_VERSION_TEXT " (" DOOMSDAY_VER_ID ") " __DATE__ " " __TIME__ ++#define DOOMSDAY_VERSION_FULLTEXT DOOMSDAY_VERSION_TEXT " (" DOOMSDAY_VER_ID ") " + + #define SAFEDIV(x,y) (!(y) || !((x)/(y))? 1 : (x)/(y)) + #define ORDER(x,y,a,b) ( (x)<(y)? ((a)=(x),(b)=(y)) : ((b)=(x),(a)=(y)) ) +--- a/doomsday/client/src/ui/dialogs/aboutdialog.cpp ++++ b/doomsday/client/src/ui/dialogs/aboutdialog.cpp +@@ -75,7 +75,7 @@ AboutDialog::AboutDialog() : DialogWidge + title->setSizePolicy(ui::Fixed, ui::Expand); + + LabelWidget *info = new LabelWidget; +- String txt = String(_E(b) "%4 %5 #%6" _E(.) "\n%7\n\n%1 (%2-%8)%3") ++ String txt = String(_E(b) "%4 %5 #%6" _E(.) "\n%7\n\n%1 (%2-%7)%3") + .arg(ver2.operatingSystem() == "windows"? tr("Windows") : + ver2.operatingSystem() == "macx"? tr("Mac OS X") : tr("Unix")) + .arg(ver2.cpuBits()) +@@ -83,8 +83,6 @@ AboutDialog::AboutDialog() : DialogWidge + .arg(DOOMSDAY_RELEASE_TYPE) + .arg(version.base()) + .arg(ver2.build) +- .arg(Time::fromText(__DATE__ " " __TIME__, Time::CompilerDateTime) +- .asDateTime().toString(Qt::SystemLocaleShortDate)) + .arg(tr("bit")); + info->setText(txt); + info->setSizePolicy(ui::Fixed, ui::Expand); +--- a/doomsday/plugins/dehread/include/version.h ++++ b/doomsday/plugins/dehread/include/version.h +@@ -39,7 +39,7 @@ + #define PLUGIN_DETAILS "Doomsday plugin for reading DeHackEd patches." + + #define PLUGIN_VERSION_TEXT "2.0.0" +-#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " " __DATE__ " (" DEHREAD_VER_ID ")" ++#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " (" DEHREAD_VER_ID ")" + #define PLUGIN_VERSION_NUMBER 2,0,0,0 // For WIN32 version info. + + #endif // LIBDEHREAD_VERSION_H +--- a/doomsday/plugins/directsound/include/version.h ++++ b/doomsday/plugins/directsound/include/version.h +@@ -46,7 +46,7 @@ + #define PLUGIN_DETAILS "Doomsday plugin for audio playback via DirectSound" + + #define PLUGIN_VERSION_TEXT "1.2.5" +-#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " " __DATE__ " (" DSDIRECTSOUND_VER_ID ")" ++#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " (" DSDIRECTSOUND_VER_ID ")" + #define PLUGIN_VERSION_NUMBER 1,2,5,0 // For WIN32 version info. + + #endif +--- a/doomsday/plugins/doom/include/version.h ++++ b/doomsday/plugins/doom/include/version.h +@@ -59,7 +59,7 @@ + #define PLUGIN_DOCSURL DOOMSDAY_DOCSURL + + #define PLUGIN_VERSION_TEXT DOOMSDAY_VERSION_BASE +-#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " " __DATE__ " (" JDOOM_VER_ID ")" ++#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " (" JDOOM_VER_ID ")" + #define PLUGIN_VERSION_NUMBER DOOMSDAY_VERSION_NUMBER // For WIN32 version info. + + // For WIN32 version info: +--- a/doomsday/plugins/doom64/include/version.h ++++ b/doomsday/plugins/doom64/include/version.h +@@ -58,7 +58,7 @@ + #define PLUGIN_DOCSURL DOOMSDAY_DOCSURL + + #define PLUGIN_VERSION_TEXT DOOMSDAY_VERSION_BASE +-#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " " __DATE__ " (" JDOOM64_VER_ID ")" ++#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " (" JDOOM64_VER_ID ")" + #define PLUGIN_VERSION_NUMBER DOOMSDAY_VERSION_NUMBER // For WIN32 version info. + + // For WIN32 version info: +--- a/doomsday/plugins/example/include/version.h ++++ b/doomsday/plugins/example/include/version.h +@@ -43,7 +43,7 @@ + #define PLUGIN_DOCSURL DOOMSDAY_DOCSURL + + #define PLUGIN_VERSION_TEXT "1.2.0" +-#define PLUGIN_VERSION_TEXTLONG "Version" PLUGIN_VERSION_TEXT " " __DATE__ " (" EXAMPLE_PLUGIN_VER_ID ")" ++#define PLUGIN_VERSION_TEXTLONG "Version" PLUGIN_VERSION_TEXT " (" EXAMPLE_PLUGIN_VER_ID ")" + #define PLUGIN_VERSION_NUMBER 1,2,0,0 // For WIN32 version info. + + // For WIN32 version info: +--- a/doomsday/plugins/fluidsynth/include/version.h ++++ b/doomsday/plugins/fluidsynth/include/version.h +@@ -38,7 +38,7 @@ + #define PLUGIN_DETAILS "Doomsday plugin for music playback via FluidSynth" + + #define PLUGIN_VERSION_TEXT "1.1.0" +-#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " " __DATE__ " (" DSFLUIDSYNTH_VER_ID ")" ++#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " (" DSFLUIDSYNTH_VER_ID ")" + #define PLUGIN_VERSION_NUMBER 1,1,0,0 // For WIN32 version info. + + #endif +--- a/doomsday/plugins/fmod/include/version.h ++++ b/doomsday/plugins/fmod/include/version.h +@@ -58,7 +58,7 @@ + #define PLUGIN_DETAILS "Doomsday plugin for audio playback via Firelight Technologies' FMOD Ex " + + #define PLUGIN_VERSION_TEXT "1.0.2" +-#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " " __DATE__ " (" DSFMOD_VER_ID ")" ++#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " (" DSFMOD_VER_ID ")" + #define PLUGIN_VERSION_NUMBER 1,0,2,0 // For WIN32 version info. + + #endif +--- a/doomsday/plugins/heretic/include/version.h ++++ b/doomsday/plugins/heretic/include/version.h +@@ -59,7 +59,7 @@ + #define PLUGIN_DOCSURL DOOMSDAY_DOCSURL + + #define PLUGIN_VERSION_TEXT DOOMSDAY_VERSION_BASE +-#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " " __DATE__ " (" JHERETIC_VER_ID ")" ++#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " (" JHERETIC_VER_ID ")" + #define PLUGIN_VERSION_NUMBER DOOMSDAY_VERSION_NUMBER // For WIN32 version info. + + // For WIN32 version info: +--- a/doomsday/plugins/hexen/include/version.h ++++ b/doomsday/plugins/hexen/include/version.h +@@ -59,7 +59,7 @@ + #define PLUGIN_DOCSURL DOOMSDAY_DOCSURL + + #define PLUGIN_VERSION_TEXT DOOMSDAY_VERSION_BASE +-#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " " __DATE__ " (" JHEXEN_VER_ID ")" ++#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " (" JHEXEN_VER_ID ")" + #define PLUGIN_VERSION_NUMBER DOOMSDAY_VERSION_NUMBER // For WIN32 version info. + + // For WIN32 version info: +--- a/doomsday/plugins/idtech1converter/include/version.h ++++ b/doomsday/plugins/idtech1converter/include/version.h +@@ -40,7 +40,7 @@ + #define PLUGIN_DETAILS "Doomsday plugin for loading id Tech 1 resources." + + #define PLUGIN_VERSION_TEXT "1.0.0" +-#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " " __DATE__ " (" IDTECH1CONVERTER_VER_ID ")" ++#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " (" IDTECH1CONVERTER_VER_ID ")" + #define PLUGIN_VERSION_NUMBER 1,0,0,0 // For WIN32 version info. + + #endif // IDTECH1CONVERTER_VERSION_H +--- a/doomsday/plugins/openal/include/version.h ++++ b/doomsday/plugins/openal/include/version.h +@@ -46,7 +46,7 @@ + #define PLUGIN_DETAILS "Doomsday plugin for audio playback via OpenAL" + + #define PLUGIN_VERSION_TEXT "1.2.4" +-#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " " __DATE__ " (" DSOPENAL_VER_ID ")" ++#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " (" DSOPENAL_VER_ID ")" + #define PLUGIN_VERSION_NUMBER 1,2,4,0 // For WIN32 version info. + + #endif +--- a/doomsday/plugins/savegameconverter/include/version.h ++++ b/doomsday/plugins/savegameconverter/include/version.h +@@ -38,7 +38,7 @@ + #define PLUGIN_DETAILS "Doomsday plugin for converting legacy saved games." + + #define PLUGIN_VERSION_TEXT "1.0.0" +-#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " " __DATE__ " (" SAVEGAMECONVERTER_VER_ID ")" ++#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " (" SAVEGAMECONVERTER_VER_ID ")" + #define PLUGIN_VERSION_NUMBER 1,0,0,0 // For WIN32 version info. + + #endif // LIBSAVEGAMECONVERTER_VERSION_H +--- a/doomsday/plugins/winmm/include/version.h ++++ b/doomsday/plugins/winmm/include/version.h +@@ -46,7 +46,7 @@ + #define PLUGIN_DETAILS "Doomsday plugin for audio playback via Windows Multimedia." + + #define PLUGIN_VERSION_TEXT "1.0.5" +-#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " " __DATE__ " (" DSWINMM_VER_ID ")" ++#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " (" DSWINMM_VER_ID ")" + #define PLUGIN_VERSION_NUMBER 1,0,5,0 // For WIN32 version info. + + #endif +--- a/doomsday/tools/amethyst/src/defs.h ++++ b/doomsday/tools/amethyst/src/defs.h +@@ -19,7 +19,7 @@ + #define __AMETHYST_COMMON_DEFS_H__ + + #define VERSION_STR "1.1.2" +-#define BUILD_STR "Version "VERSION_STR" ("__DATE__")" ++#define BUILD_STR "Version "VERSION_STR + #define MAX_COLUMNS 40 + + #define IS_BREAK(c) ((c)=='@' || (c)=='{' || (c)=='}' || (c)=='$') +--- a/doomsday/tools/savegametool/src/main.cpp ++++ b/doomsday/tools/savegametool/src/main.cpp +@@ -66,11 +66,9 @@ static void printDescription() + + String versionText() + { +- return String("%1 version %2 (%3)") ++ return String("%1 version %2") + .arg(DENG2_TEXT_APP->applicationName()) + .arg(DENG2_TEXT_APP->applicationVersion()) +- .arg(Time::fromText(__DATE__ " " __TIME__, Time::CompilerDateTime) +- .asDateTime().toString(Qt::SystemLocaleShortDate)); + } + + Path composeMapUriPath(duint32 episode, duint32 map) diff --git a/debian/patches/series b/debian/patches/series index 51ec554..17c1726 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,5 +5,6 @@ manpages.patch spelling.patch freedoom.patch -noexample.patch -exit-calls.patch +no-libexample.patch +no-timestamps.patch +no-shlibexits.patch diff --git a/debian/lintian-overrides b/debian/source/lintian-overrides similarity index 100% rename from debian/lintian-overrides rename to debian/source/lintian-overrides -- 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
