Hello community, here is the log from the commit of package doomsday for openSUSE:Factory checked in at 2013-04-17 17:39:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/doomsday (Old) and /work/SRC/openSUSE:Factory/.doomsday.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "doomsday", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/doomsday/doomsday.changes 2013-04-05 07:34:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.doomsday.new/doomsday.changes 2013-04-17 17:39:31.000000000 +0200 @@ -1,0 +2,13 @@ +Tue Apr 9 21:03:14 UTC 2013 - jeng...@inai.de + +- Update to new upstream release 1.10 +* the multiplayer server is now its own separate executable that + users control using the new "Shell" application +- Remove deng-libdir.diff (merged upstream) + +------------------------------------------------------------------- +Tue Mar 19 17:07:47 UTC 2013 - sch...@suse.de + +- deng-va-list.diff: Remove non-portable use of va_list + +------------------------------------------------------------------- Old: ---- deng-libdir.diff doomsday-1.9.10.1.tar.xz New: ---- deng-va-list.diff doomsday-1.10.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ doomsday.spec ++++++ --- /var/tmp/diff_new_pack.bxHv0C/_old 2013-04-17 17:39:33.000000000 +0200 +++ /var/tmp/diff_new_pack.bxHv0C/_new 2013-04-17 17:39:33.000000000 +0200 @@ -17,7 +17,7 @@ Name: doomsday -Version: 1.9.10.1 +Version: 1.10.0 Release: 0 Summary: The Doomsday Engine: DOOM/Hertic/Hexen port with pretty graphics License: GPL-2.0+ and GPL-2.0 @@ -25,10 +25,10 @@ # md2tool is the one being GPL-2.0-only Url: http://dengine.net/ -#DL-URL: http://downloads.sf.net/deng/doomsday-1.9.10-1.tar.gz +#DL-URL: http://downloads.sf.net/deng/doomsday-1.10.0.tar.gz Source: %name-%version.tar.xz Patch1: deng-nodate.diff -Patch2: deng-libdir.diff +Patch3: deng-va-list.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: Mesa-devel @@ -83,7 +83,7 @@ tar --use=xz -xf "%{S:0}"; %setup -DTq %endif -%patch -P 1 -P 2 -p1 +%patch -P 1 -P 3 -p1 %build pushd doomsday; @@ -123,12 +123,16 @@ %_bindir/doomsday %dir %_libexecdir/%name %_libexecdir/%name/doomsday +%_libexecdir/%name/doomsday-server +%_libexecdir/%name/doomsday-shell +%_libexecdir/%name/doomsday-shell-text %dir %_libdir/%name %_libdir/%name/lib* %dir %_datadir/%name %_datadir/%name/data +%_datadir/%name/icons %_datadir/%name/modules -%_datadir/applications/doomsday-engine.desktop +%_datadir/applications/*.desktop %_mandir/man6/doomsday.6* %dir %_libexecdir/%name %_libexecdir/%name/md2tool ++++++ deng-nodate.diff ++++++ --- /var/tmp/diff_new_pack.bxHv0C/_old 2013-04-17 17:39:33.000000000 +0200 +++ /var/tmp/diff_new_pack.bxHv0C/_new 2013-04-17 17:39:33.000000000 +0200 @@ -2,24 +2,39 @@ Kill __DATE__ and __TIME__ for reasons of avoiding needless rebuilds. --- + doomsday/client/include/dd_def.h | 2 +- doomsday/plugins/dehread/include/version.h | 2 +- doomsday/plugins/directsound/include/version.h | 2 +- - doomsday/plugins/exampleplugin/include/version.h | 2 +- + doomsday/plugins/doom/include/version.h | 2 +- + doomsday/plugins/doom64/include/version.h | 2 +- + doomsday/plugins/example/include/version.h | 2 +- doomsday/plugins/fluidsynth/include/version.h | 2 +- doomsday/plugins/fmod/include/version.h | 2 +- - doomsday/plugins/jdoom/include/version.h | 2 +- - doomsday/plugins/jdoom64/include/version.h | 2 +- - doomsday/plugins/jheretic/include/version.h | 2 +- - doomsday/plugins/jhexen/include/version.h | 2 +- + doomsday/plugins/heretic/include/version.h | 2 +- + doomsday/plugins/hexen/include/version.h | 2 +- doomsday/plugins/openal/include/version.h | 2 +- doomsday/plugins/wadmapconverter/include/version.h | 2 +- doomsday/plugins/winmm/include/version.h | 2 +- - 12 files changed, 12 insertions(+), 12 deletions(-) + doomsday/tools/amethyst/src/defs.h | 2 +- + 14 files changed, 14 insertions(+), 14 deletions(-) -Index: doomsday-1.9.10.1/doomsday/plugins/dehread/include/version.h +Index: doomsday-1.10.0/doomsday/client/include/dd_def.h =================================================================== ---- doomsday-1.9.10.1.orig/doomsday/plugins/dehread/include/version.h -+++ doomsday-1.9.10.1/doomsday/plugins/dehread/include/version.h +--- doomsday-1.10.0.orig/doomsday/client/include/dd_def.h ++++ doomsday-1.10.0/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)) ) +Index: doomsday-1.10.0/doomsday/plugins/dehread/include/version.h +=================================================================== +--- doomsday-1.10.0.orig/doomsday/plugins/dehread/include/version.h ++++ doomsday-1.10.0/doomsday/plugins/dehread/include/version.h @@ -39,7 +39,7 @@ #define PLUGIN_DETAILS "Doomsday plugin for reading DeHackEd patches." @@ -28,11 +43,11 @@ +#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 -Index: doomsday-1.9.10.1/doomsday/plugins/directsound/include/version.h + #endif // LIBDEHREAD_VERSION_H +Index: doomsday-1.10.0/doomsday/plugins/directsound/include/version.h =================================================================== ---- doomsday-1.9.10.1.orig/doomsday/plugins/directsound/include/version.h -+++ doomsday-1.9.10.1/doomsday/plugins/directsound/include/version.h +--- doomsday-1.10.0.orig/doomsday/plugins/directsound/include/version.h ++++ doomsday-1.10.0/doomsday/plugins/directsound/include/version.h @@ -46,7 +46,7 @@ #define PLUGIN_DETAILS "Doomsday plugin for audio playback via DirectSound" @@ -42,23 +57,49 @@ #define PLUGIN_VERSION_NUMBER 1,2,5,0 // For WIN32 version info. #endif -Index: doomsday-1.9.10.1/doomsday/plugins/exampleplugin/include/version.h +Index: doomsday-1.10.0/doomsday/plugins/doom/include/version.h =================================================================== ---- doomsday-1.9.10.1.orig/doomsday/plugins/exampleplugin/include/version.h -+++ doomsday-1.9.10.1/doomsday/plugins/exampleplugin/include/version.h -@@ -53,7 +53,7 @@ +--- doomsday-1.10.0.orig/doomsday/plugins/doom/include/version.h ++++ doomsday-1.10.0/doomsday/plugins/doom/include/version.h +@@ -59,7 +59,7 @@ #define PLUGIN_DOCSURL DOOMSDAY_DOCSURL - #define PLUGIN_VERSION_TEXT "1.1.0" + #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: +Index: doomsday-1.10.0/doomsday/plugins/doom64/include/version.h +=================================================================== +--- doomsday-1.10.0.orig/doomsday/plugins/doom64/include/version.h ++++ doomsday-1.10.0/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: +Index: doomsday-1.10.0/doomsday/plugins/example/include/version.h +=================================================================== +--- doomsday-1.10.0.orig/doomsday/plugins/example/include/version.h ++++ doomsday-1.10.0/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,1,0,0 // For WIN32 version info. + #define PLUGIN_VERSION_NUMBER 1,2,0,0 // For WIN32 version info. // For WIN32 version info: -Index: doomsday-1.9.10.1/doomsday/plugins/fluidsynth/include/version.h +Index: doomsday-1.10.0/doomsday/plugins/fluidsynth/include/version.h =================================================================== ---- doomsday-1.9.10.1.orig/doomsday/plugins/fluidsynth/include/version.h -+++ doomsday-1.9.10.1/doomsday/plugins/fluidsynth/include/version.h +--- doomsday-1.10.0.orig/doomsday/plugins/fluidsynth/include/version.h ++++ doomsday-1.10.0/doomsday/plugins/fluidsynth/include/version.h @@ -38,7 +38,7 @@ #define PLUGIN_DETAILS "Doomsday plugin for music playback via FluidSynth" @@ -68,10 +109,10 @@ #define PLUGIN_VERSION_NUMBER 1,1,0,0 // For WIN32 version info. #endif -Index: doomsday-1.9.10.1/doomsday/plugins/fmod/include/version.h +Index: doomsday-1.10.0/doomsday/plugins/fmod/include/version.h =================================================================== ---- doomsday-1.9.10.1.orig/doomsday/plugins/fmod/include/version.h -+++ doomsday-1.9.10.1/doomsday/plugins/fmod/include/version.h +--- doomsday-1.10.0.orig/doomsday/plugins/fmod/include/version.h ++++ doomsday-1.10.0/doomsday/plugins/fmod/include/version.h @@ -58,7 +58,7 @@ #define PLUGIN_DETAILS "Doomsday plugin for audio playback via Firelight Technologies' FMOD Ex " @@ -81,50 +122,24 @@ #define PLUGIN_VERSION_NUMBER 1,0,2,0 // For WIN32 version info. #endif -Index: doomsday-1.9.10.1/doomsday/plugins/jdoom/include/version.h -=================================================================== ---- doomsday-1.9.10.1.orig/doomsday/plugins/jdoom/include/version.h -+++ doomsday-1.9.10.1/doomsday/plugins/jdoom/include/version.h -@@ -60,7 +60,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: -Index: doomsday-1.9.10.1/doomsday/plugins/jdoom64/include/version.h +Index: doomsday-1.10.0/doomsday/plugins/heretic/include/version.h =================================================================== ---- doomsday-1.9.10.1.orig/doomsday/plugins/jdoom64/include/version.h -+++ doomsday-1.9.10.1/doomsday/plugins/jdoom64/include/version.h +--- doomsday-1.10.0.orig/doomsday/plugins/heretic/include/version.h ++++ doomsday-1.10.0/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__ " (" 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: -Index: doomsday-1.9.10.1/doomsday/plugins/jheretic/include/version.h -=================================================================== ---- doomsday-1.9.10.1.orig/doomsday/plugins/jheretic/include/version.h -+++ doomsday-1.9.10.1/doomsday/plugins/jheretic/include/version.h -@@ -60,7 +60,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: -Index: doomsday-1.9.10.1/doomsday/plugins/jhexen/include/version.h +Index: doomsday-1.10.0/doomsday/plugins/hexen/include/version.h =================================================================== ---- doomsday-1.9.10.1.orig/doomsday/plugins/jhexen/include/version.h -+++ doomsday-1.9.10.1/doomsday/plugins/jhexen/include/version.h -@@ -60,7 +60,7 @@ +--- doomsday-1.10.0.orig/doomsday/plugins/hexen/include/version.h ++++ doomsday-1.10.0/doomsday/plugins/hexen/include/version.h +@@ -59,7 +59,7 @@ #define PLUGIN_DOCSURL DOOMSDAY_DOCSURL #define PLUGIN_VERSION_TEXT DOOMSDAY_VERSION_BASE @@ -133,10 +148,10 @@ #define PLUGIN_VERSION_NUMBER DOOMSDAY_VERSION_NUMBER // For WIN32 version info. // For WIN32 version info: -Index: doomsday-1.9.10.1/doomsday/plugins/openal/include/version.h +Index: doomsday-1.10.0/doomsday/plugins/openal/include/version.h =================================================================== ---- doomsday-1.9.10.1.orig/doomsday/plugins/openal/include/version.h -+++ doomsday-1.9.10.1/doomsday/plugins/openal/include/version.h +--- doomsday-1.10.0.orig/doomsday/plugins/openal/include/version.h ++++ doomsday-1.10.0/doomsday/plugins/openal/include/version.h @@ -46,7 +46,7 @@ #define PLUGIN_DETAILS "Doomsday plugin for audio playback via OpenAL" @@ -146,10 +161,10 @@ #define PLUGIN_VERSION_NUMBER 1,2,4,0 // For WIN32 version info. #endif -Index: doomsday-1.9.10.1/doomsday/plugins/wadmapconverter/include/version.h +Index: doomsday-1.10.0/doomsday/plugins/wadmapconverter/include/version.h =================================================================== ---- doomsday-1.9.10.1.orig/doomsday/plugins/wadmapconverter/include/version.h -+++ doomsday-1.9.10.1/doomsday/plugins/wadmapconverter/include/version.h +--- doomsday-1.10.0.orig/doomsday/plugins/wadmapconverter/include/version.h ++++ doomsday-1.10.0/doomsday/plugins/wadmapconverter/include/version.h @@ -40,7 +40,7 @@ #define PLUGIN_DETAILS "Doomsday plugin for loading id tech 1 format maps." @@ -159,10 +174,10 @@ #define PLUGIN_VERSION_NUMBER 1,1,0,0 // For WIN32 version info. #endif /* __WADMAPCONVERTER_VERSION_H__ */ -Index: doomsday-1.9.10.1/doomsday/plugins/winmm/include/version.h +Index: doomsday-1.10.0/doomsday/plugins/winmm/include/version.h =================================================================== ---- doomsday-1.9.10.1.orig/doomsday/plugins/winmm/include/version.h -+++ doomsday-1.9.10.1/doomsday/plugins/winmm/include/version.h +--- doomsday-1.10.0.orig/doomsday/plugins/winmm/include/version.h ++++ doomsday-1.10.0/doomsday/plugins/winmm/include/version.h @@ -46,7 +46,7 @@ #define PLUGIN_DETAILS "Doomsday plugin for audio playback via Windows Multimedia." @@ -172,3 +187,16 @@ #define PLUGIN_VERSION_NUMBER 1,0,5,0 // For WIN32 version info. #endif +Index: doomsday-1.10.0/doomsday/tools/amethyst/src/defs.h +=================================================================== +--- doomsday-1.10.0.orig/doomsday/tools/amethyst/src/defs.h ++++ doomsday-1.10.0/doomsday/tools/amethyst/src/defs.h +@@ -19,7 +19,7 @@ + #define __AMETHYST_COMMON_DEFS_H__ + + #define VERSION_STR "1.1.1" +-#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)=='$') ++++++ deng-va-list.diff ++++++ From: Andres Schwab <sch...@suse.de> Date: 2013-03-19 17:07:47+0000 Remove non-portable use of va_list --- doomsday/client/src/con_main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: doomsday-1.10.0/doomsday/client/src/con_main.cpp =================================================================== --- doomsday-1.10.0.orig/doomsday/client/src/con_main.cpp +++ doomsday-1.10.0/doomsday/client/src/con_main.cpp @@ -1839,7 +1839,7 @@ static void conPrintf(int flags, const c { const char* text = 0; - if(format && format[0] && args) + if(format && format[0]) { if(prbuff == NULL) prbuff = (char *) M_Malloc(PRBUFF_SIZE); ++++++ doomsday-1.9.10.1.tar.xz -> doomsday-1.10.0.tar.xz ++++++ ++++ 964993 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
