[deng] 02/04: import upstream 1.15.7
Michael Gilbert
mgilbert at moszumanska.debian.org
Mon Sep 12 04:45:20 UTC 2016
This is an automated email from the git hooks/post-receive script.
mgilbert pushed a commit to branch master
in repository deng.
commit 8ad4dd9923caeb51019dde3551d104020ddde942
Author: Michael Gilbert <mgilbert at debian.org>
Date: Sun Sep 11 23:46:55 2016 +0000
import upstream 1.15.7
---
doomsday/api/dd_version.h | 4 ++--
doomsday/client/net.dengine.client.pack/Info.dei | 2 +-
doomsday/client/net.dengine.client.pack/defaultstyle.pack/Info | 2 +-
doomsday/client/net.dengine.client.pack/renderer.pack/Info | 2 +-
.../net.dengine.client.pack/renderer.pack/lensflares.pack/Info | 2 +-
doomsday/client/src/dd_main.cpp | 9 +++++++++
doomsday/doc/output/doomsday.6 | 2 +-
doomsday/doc/readme/readme.ame | 2 +-
doomsday/doc/server/server.ame | 2 +-
doomsday/doc/shell-text/shell-text.ame | 2 +-
doomsday/libappfw/appfw.doxy | 2 +-
doomsday/libcore/net.dengine.stdlib.pack/Info | 2 +-
doomsday/libgui/gui.doxy | 2 +-
doomsday/libgui/net.dengine.stdlib.gui.pack/Info | 2 +-
doomsday/net.dengine.base.pack/Info | 2 +-
doomsday/sdk-qch.doxy | 4 ++--
16 files changed, 26 insertions(+), 17 deletions(-)
diff --git a/doomsday/api/dd_version.h b/doomsday/api/dd_version.h
index 11bf2ee..36ad378 100644
--- a/doomsday/api/dd_version.h
+++ b/doomsday/api/dd_version.h
@@ -51,8 +51,8 @@ extern "C" {
* Revision number increases with each small (maintenance) release.
*/
-#define DOOMSDAY_VERSION_BASE "1.15.7"
-#define DOOMSDAY_VERSION_NUMBER 1,15,7,0 // For WIN32 version info.
+#define DOOMSDAY_VERSION_BASE "1.15.8"
+#define DOOMSDAY_VERSION_NUMBER 1,15,8,0 // For WIN32 version info.
//#define DOOMSDAY_RELEASE_NAME "Example"
/**
diff --git a/doomsday/client/net.dengine.client.pack/Info.dei b/doomsday/client/net.dengine.client.pack/Info.dei
index 823f334..2422a2d 100644
--- a/doomsday/client/net.dengine.client.pack/Info.dei
+++ b/doomsday/client/net.dengine.client.pack/Info.dei
@@ -1,7 +1,7 @@
# Client's primary resources
title: Doomsday Client
-version: 1.15.7
+version: 1.15.8
license: GPL 3+
tags: core client
diff --git a/doomsday/client/net.dengine.client.pack/defaultstyle.pack/Info b/doomsday/client/net.dengine.client.pack/defaultstyle.pack/Info
index 3df38f8..d761abe 100644
--- a/doomsday/client/net.dengine.client.pack/defaultstyle.pack/Info
+++ b/doomsday/client/net.dengine.client.pack/defaultstyle.pack/Info
@@ -1,4 +1,4 @@
title: Doomsday Default UI Style
-version: 1.15.7
+version: 1.15.8
license: GPL 3+
tags: ui style
diff --git a/doomsday/client/net.dengine.client.pack/renderer.pack/Info b/doomsday/client/net.dengine.client.pack/renderer.pack/Info
index c450fe9..66b0bcb 100644
--- a/doomsday/client/net.dengine.client.pack/renderer.pack/Info
+++ b/doomsday/client/net.dengine.client.pack/renderer.pack/Info
@@ -1,6 +1,6 @@
# General resources for the renderer
title: Doomsday Renderer
-version: 1.15.7
+version: 1.15.8
license: GPL 3+
tags: core
diff --git a/doomsday/client/net.dengine.client.pack/renderer.pack/lensflares.pack/Info b/doomsday/client/net.dengine.client.pack/renderer.pack/lensflares.pack/Info
index 5030710..0879292 100644
--- a/doomsday/client/net.dengine.client.pack/renderer.pack/lensflares.pack/Info
+++ b/doomsday/client/net.dengine.client.pack/renderer.pack/lensflares.pack/Info
@@ -1,5 +1,5 @@
title: Doomsday Default Lens Flares
-version: 1.15.7
+version: 1.15.8
license: GPL 3+
tags: core fx
diff --git a/doomsday/client/src/dd_main.cpp b/doomsday/client/src/dd_main.cpp
index 188e94a..e80ab6d 100644
--- a/doomsday/client/src/dd_main.cpp
+++ b/doomsday/client/src/dd_main.cpp
@@ -357,6 +357,15 @@ static void createPackagesScheme()
}
}
+#ifdef UNIX
+ NativePath systemWads("/usr/share/games/doom");
+ if(systemWads.exists())
+ {
+ scheme.addSearchPath(SearchPath(de::Uri::fromNativeDirPath(systemWads),
+ SearchPath::NoDescend));
+ }
+#endif
+
// Add the path from the DOOMWADDIR environment variable.
if(!CommandLine_Check("-nodoomwaddir") && getenv("DOOMWADDIR"))
{
diff --git a/doomsday/doc/output/doomsday.6 b/doomsday/doc/output/doomsday.6
index 22b292e..2dcdf5d 100644
--- a/doomsday/doc/output/doomsday.6
+++ b/doomsday/doc/output/doomsday.6
@@ -1,5 +1,5 @@
.\" manual page generated by Amethyst (mdoc+tbl)
-.Dd January 1, 2016
+.Dd February 1, 2016
.Os
.Dt "DOOMSDAY" 6
.Sh NAME
diff --git a/doomsday/doc/readme/readme.ame b/doomsday/doc/readme/readme.ame
index dfb96b3..09a36c5 100644
--- a/doomsday/doc/readme/readme.ame
+++ b/doomsday/doc/readme/readme.ame
@@ -5,7 +5,7 @@
@macro{TITLE}{ doomsday }
}
@macro{ONELINER}{ Enhanced source port of Doom, Heretic and Hexen }
- at macro{VERSION}{ Version 1.15.7 }
+ at macro{VERSION}{ Version 1.15.8 }
@macro{AUTHOR}{ Deng Team }
@macro{LINK}{ http://dengine.net/ }
@require{amestd}
diff --git a/doomsday/doc/server/server.ame b/doomsday/doc/server/server.ame
index 8c8c422..20b941c 100644
--- a/doomsday/doc/server/server.ame
+++ b/doomsday/doc/server/server.ame
@@ -1,7 +1,7 @@
$ Man page for doomsday-server
@macro{TITLE}{ doomsday-server }
@macro{ONELINER}{ Doomsday Engine multiplayer daemon }
- at macro{VERSION}{ Version 1.15.7 }
+ at macro{VERSION}{ Version 1.15.8 }
@macro{AUTHOR}{ Deng Team }
@macro{LINK}{ http://dengine.net/ }
@require{amestd}
diff --git a/doomsday/doc/shell-text/shell-text.ame b/doomsday/doc/shell-text/shell-text.ame
index a89f962..bbb28ad 100644
--- a/doomsday/doc/shell-text/shell-text.ame
+++ b/doomsday/doc/shell-text/shell-text.ame
@@ -1,7 +1,7 @@
$ Man page for doomsday-shell-text
@macro{TITLE}{ doomsday-shell-text }
@macro{ONELINER}{ Utility for controlling and monitoring Doomsday servers }
- at macro{VERSION}{ Version 1.15.7 }
+ at macro{VERSION}{ Version 1.15.8 }
@macro{AUTHOR}{ Deng Team }
@macro{LINK}{ http://dengine.net/ }
@require{amestd}
diff --git a/doomsday/libappfw/appfw.doxy b/doomsday/libappfw/appfw.doxy
index 762ff48..cab36dd 100644
--- a/doomsday/libappfw/appfw.doxy
+++ b/doomsday/libappfw/appfw.doxy
@@ -2,7 +2,7 @@
@INCLUDE = ../doomsday.doxy
PROJECT_NAME = "libappfw"
-PROJECT_NUMBER = 1.15.7
+PROJECT_NUMBER = 1.15.8
PROJECT_BRIEF = "Application Framework"
OUTPUT_DIRECTORY = ../apidoc/appfw/
diff --git a/doomsday/libcore/net.dengine.stdlib.pack/Info b/doomsday/libcore/net.dengine.stdlib.pack/Info
index 55a4ab2..d58e8c3 100644
--- a/doomsday/libcore/net.dengine.stdlib.pack/Info
+++ b/doomsday/libcore/net.dengine.stdlib.pack/Info
@@ -1,5 +1,5 @@
title: Doomsday Script Standard Library
-version: 1.15.7
+version: 1.15.8
license: GPL 3+
tags: core script
diff --git a/doomsday/libgui/gui.doxy b/doomsday/libgui/gui.doxy
index 26e58c4..04e02bf 100644
--- a/doomsday/libgui/gui.doxy
+++ b/doomsday/libgui/gui.doxy
@@ -2,7 +2,7 @@
@INCLUDE = ../doomsday.doxy
PROJECT_NAME = "libgui"
-PROJECT_NUMBER = 1.15.7
+PROJECT_NUMBER = 1.15.8
PROJECT_BRIEF = "Graphics, Audio and Input Library"
OUTPUT_DIRECTORY = ../apidoc/gui/
diff --git a/doomsday/libgui/net.dengine.stdlib.gui.pack/Info b/doomsday/libgui/net.dengine.stdlib.gui.pack/Info
index 93f79af..a8fff0e 100644
--- a/doomsday/libgui/net.dengine.stdlib.gui.pack/Info
+++ b/doomsday/libgui/net.dengine.stdlib.gui.pack/Info
@@ -1,5 +1,5 @@
title: Doomsday Script Standard Library: GUI
-version: 1.15.7
+version: 1.15.8
license: GPL 3+
tags: core script gui
diff --git a/doomsday/net.dengine.base.pack/Info b/doomsday/net.dengine.base.pack/Info
index 768d778..0a0b76e 100644
--- a/doomsday/net.dengine.base.pack/Info
+++ b/doomsday/net.dengine.base.pack/Info
@@ -1,6 +1,6 @@
# Shared resources for all Doomsday applications
title: Doomsday Base
-version: 1.15.7
+version: 1.15.8
license: GPL 3+
tags: core
diff --git a/doomsday/sdk-qch.doxy b/doomsday/sdk-qch.doxy
index 77a42bb..3cdb42d 100644
--- a/doomsday/sdk-qch.doxy
+++ b/doomsday/sdk-qch.doxy
@@ -5,8 +5,8 @@ OUTPUT_DIRECTORY = apidoc-qch/
# Also generate help files for Qt Creator
GENERATE_QHP = YES
QCH_FILE = "doomsday.qch"
-QHP_NAMESPACE = "net.dengine.sdk.1157"
-QHP_VIRTUAL_FOLDER = "doomsday-1.15.7"
+QHP_NAMESPACE = "net.dengine.sdk.1158"
+QHP_VIRTUAL_FOLDER = "doomsday-1.15.8"
QHG_LOCATION = "../build/scripts/qhelp.py"
# Dynamic HTML doesn't work inside Qt Creator
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/deng.git
More information about the Pkg-games-commits
mailing list