[fife] 01/03: Import Debian patch 0.3.5-3
Markus Koschany
apo at moszumanska.debian.org
Fri Sep 2 22:52:21 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository fife.
commit d3bc86bf2abbe4d2a83a4ed85134bb7295b91214
Author: Markus Koschany <apo at debian.org>
Date: Fri Sep 2 22:45:56 2016 +0200
Import Debian patch 0.3.5-3
---
build/gnu0-config.py | 6 ++--
build/gnukfreebsd8-config.py | 6 ++--
build/gnukfreebsd9-config.py | 6 ++--
build/linux2-config.py | 6 ++--
debian/changelog | 13 +++++++++
debian/compat | 2 +-
debian/control | 53 +++++++++++++++++++---------------
debian/copyright | 23 +++++++--------
debian/patches/gcc6.diff | 27 +++++++++++++++++
debian/patches/series | 1 +
debian/rules | 4 +--
debian/source/options | 1 -
debian/stamps/.gitignore | 0
engine/core/ext/glee/GLee.cpp | 3 --
engine/core/vfs/vfs.cpp | 2 +-
engine/core/video/opengl/fife_opengl.h | 2 +-
16 files changed, 98 insertions(+), 57 deletions(-)
diff --git a/build/gnu0-config.py b/build/gnu0-config.py
index 4fa05e3..51ac5a5 100644
--- a/build/gnu0-config.py
+++ b/build/gnu0-config.py
@@ -50,7 +50,7 @@ def initEnvironment(env):
return env
def addExtras(env, opengl):
-# env.Append(LIBS = pythonversion)
+ env.Append(LIBS = pythonversion)
if opengl:
env.Append(LIBS = ['stdc++', 'GL',])
@@ -74,7 +74,7 @@ def getRequiredLibs(opengl):
# guichan_sdl - depends on at least the SDL libs and guichan prior in the list
# guichan_opengl - depends on at least guichan prior in the list
libs = [('vorbisfile', 'vorbisfile.h'),
-# (pythonversion, pythonversion + '/Python.h'),
+ (pythonversion, pythonversion + '/Python.h'),
('openal', 'AL/al.h'),
('SDL', 'SDL.h'),
('SDL_ttf', 'SDL_ttf.h'),
@@ -93,7 +93,7 @@ def getRequiredLibs(opengl):
return libs
def getOptionalLibs(opengl):
- libs = [('tinyxml', 'tinyxml.h'), ('glee', 'Glee.h')]
+ libs = [('tinyxml', 'tinyxml.h')]
return libs
diff --git a/build/gnukfreebsd8-config.py b/build/gnukfreebsd8-config.py
index 4fa05e3..51ac5a5 100644
--- a/build/gnukfreebsd8-config.py
+++ b/build/gnukfreebsd8-config.py
@@ -50,7 +50,7 @@ def initEnvironment(env):
return env
def addExtras(env, opengl):
-# env.Append(LIBS = pythonversion)
+ env.Append(LIBS = pythonversion)
if opengl:
env.Append(LIBS = ['stdc++', 'GL',])
@@ -74,7 +74,7 @@ def getRequiredLibs(opengl):
# guichan_sdl - depends on at least the SDL libs and guichan prior in the list
# guichan_opengl - depends on at least guichan prior in the list
libs = [('vorbisfile', 'vorbisfile.h'),
-# (pythonversion, pythonversion + '/Python.h'),
+ (pythonversion, pythonversion + '/Python.h'),
('openal', 'AL/al.h'),
('SDL', 'SDL.h'),
('SDL_ttf', 'SDL_ttf.h'),
@@ -93,7 +93,7 @@ def getRequiredLibs(opengl):
return libs
def getOptionalLibs(opengl):
- libs = [('tinyxml', 'tinyxml.h'), ('glee', 'Glee.h')]
+ libs = [('tinyxml', 'tinyxml.h')]
return libs
diff --git a/build/gnukfreebsd9-config.py b/build/gnukfreebsd9-config.py
index 4fa05e3..51ac5a5 100644
--- a/build/gnukfreebsd9-config.py
+++ b/build/gnukfreebsd9-config.py
@@ -50,7 +50,7 @@ def initEnvironment(env):
return env
def addExtras(env, opengl):
-# env.Append(LIBS = pythonversion)
+ env.Append(LIBS = pythonversion)
if opengl:
env.Append(LIBS = ['stdc++', 'GL',])
@@ -74,7 +74,7 @@ def getRequiredLibs(opengl):
# guichan_sdl - depends on at least the SDL libs and guichan prior in the list
# guichan_opengl - depends on at least guichan prior in the list
libs = [('vorbisfile', 'vorbisfile.h'),
-# (pythonversion, pythonversion + '/Python.h'),
+ (pythonversion, pythonversion + '/Python.h'),
('openal', 'AL/al.h'),
('SDL', 'SDL.h'),
('SDL_ttf', 'SDL_ttf.h'),
@@ -93,7 +93,7 @@ def getRequiredLibs(opengl):
return libs
def getOptionalLibs(opengl):
- libs = [('tinyxml', 'tinyxml.h'), ('glee', 'Glee.h')]
+ libs = [('tinyxml', 'tinyxml.h')]
return libs
diff --git a/build/linux2-config.py b/build/linux2-config.py
index 4fa05e3..51ac5a5 100644
--- a/build/linux2-config.py
+++ b/build/linux2-config.py
@@ -50,7 +50,7 @@ def initEnvironment(env):
return env
def addExtras(env, opengl):
-# env.Append(LIBS = pythonversion)
+ env.Append(LIBS = pythonversion)
if opengl:
env.Append(LIBS = ['stdc++', 'GL',])
@@ -74,7 +74,7 @@ def getRequiredLibs(opengl):
# guichan_sdl - depends on at least the SDL libs and guichan prior in the list
# guichan_opengl - depends on at least guichan prior in the list
libs = [('vorbisfile', 'vorbisfile.h'),
-# (pythonversion, pythonversion + '/Python.h'),
+ (pythonversion, pythonversion + '/Python.h'),
('openal', 'AL/al.h'),
('SDL', 'SDL.h'),
('SDL_ttf', 'SDL_ttf.h'),
@@ -93,7 +93,7 @@ def getRequiredLibs(opengl):
return libs
def getOptionalLibs(opengl):
- libs = [('tinyxml', 'tinyxml.h'), ('glee', 'Glee.h')]
+ libs = [('tinyxml', 'tinyxml.h')]
return libs
diff --git a/debian/changelog b/debian/changelog
index f26a0c7..9763e95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+fife (0.3.5-3) unstable; urgency=medium
+
+ * Team upload.
+ * Use compat level 9.
+ * Vcs fields: Use https.
+ * Declare compliance with Debian Policy 3.9.8.
+ * wrap-and-sort -sa.
+ * Add gcc6.diff and fix FTBFS with GCC-6.
+ Thanks to Martin Michlmayr for the report and Graham Inggs for the patch.
+ (Closes: #811858)
+
+ -- Markus Koschany <apo at debian.org> Fri, 02 Sep 2016 22:45:56 +0200
+
fife (0.3.5-2) unstable; urgency=medium
* Team upload.
diff --git a/debian/compat b/debian/compat
index c793025..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
\ No newline at end of file
+9
diff --git a/debian/control b/debian/control
index 9cde265..55a0ec3 100644
--- a/debian/control
+++ b/debian/control
@@ -1,42 +1,49 @@
Source: fife
-Uploaders: Christoph Egger <christoph at debian.org>
+Uploaders:
+ Christoph Egger <christoph at debian.org>
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Section: libdevel
Priority: optional
-Build-Depends: debhelper (>= 7.0.50~),
- scons,
- libsdl1.2-dev,
- libboost-dev,
- libsdl-ttf2.0-dev,
- libsdl-image1.2-dev,
- libvorbis-dev,
+Build-Depends:
+ chrpath,
+ debhelper (>= 9),
+ glee-dev,
libalut-dev,
- python-all-dev (>= 2.6.6-3~),
- libboost-regex-dev,
+ libasound2-dev,
+ libboost-dev,
libboost-filesystem-dev,
+ libboost-regex-dev,
libboost-test-dev,
- swig,
- chrpath,
- zlib1g-dev,
- libxcursor-dev,
- libopenal-dev,
- libasound2-dev,
libguichan-dev,
- libtinyxml-dev,
+ libopenal-dev,
libpng-dev,
+ libsdl-image1.2-dev,
+ libsdl-ttf2.0-dev,
+ libsdl1.2-dev,
+ libtinyxml-dev,
libunittest++-dev,
- glee-dev
+ libvorbis-dev,
+ libxcursor-dev,
+ python-all-dev (>= 2.6.6-3~),
+ scons,
+ swig,
+ zlib1g-dev
X-Python-Version: >= 2.6
-Vcs-Git: git://anonscm.debian.org/pkg-games/fife.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/fife.git
-Standards-Version: 3.9.4
+Vcs-Git: https://anonscm.debian.org/git/pkg-games/fife.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/fife.git
+Standards-Version: 3.9.8
Homepage: http://fifengine.de
Package: python-fife
Section: python
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}
-Breaks: ${python:Breaks}, unknown-horizons (<< 2013.1)
+Depends:
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Breaks:
+ unknown-horizons (<< 2013.1),
+ ${python:Breaks}
Description: FIFE is a multi-platform isometric game engine
FIFE stands for Flexible Isometric Free Engine and is a cross
platform game creation framework written in C++. It provides you with
diff --git a/debian/copyright b/debian/copyright
index c7acac1..f8cb83f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,7 +13,7 @@ Files: engine/core/ext/glee/*
Copyright: 2009 Ben Woodhouse
License: BSD-2-clause
-Files: engine/core/util/utf8/utf8.h engine/core/util/utf8/*
+Files: engine/core/util/utf8/utf8.h engine/core/util/utf8/*
Copyright: 2006 Nemanja Trifunovic
License: Boost-Software-License
@@ -38,7 +38,7 @@ License: BSD-3-clause
3. Neither the name of Guichan nor the names of its contributors may
be used to endorse or promote products derived from this software
without specific prior written permission.
-
+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -56,16 +56,16 @@ License: LGPL-2.1+
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
-
+
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
-
+
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
+
On Debian systems, the full text of the GNU General Public
License version 2 can be found in the file
`/usr/share/common-licenses/LGPL-2.1'.
@@ -74,14 +74,14 @@ License: BSD-2-clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
-
+
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.
-
+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -99,19 +99,19 @@ License: Zlib
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any
damages arising from the use of this software.
-
+
Permission is granted to anyone to use this software for any
purpose, including commercial applications, and to alter it and
redistribute it freely, subject to the following restrictions:
-
+
1. The origin of this software must not be misrepresented; you must
not claim that you wrote the original software. If you use this
software in a product, an acknowledgment in the product
documentation would be appreciated but is not required.
-
+
2. Altered source versions must be plainly marked as such, and must
not be misrepresented as being the original software.
-
+
3. This notice may not be removed or altered from any source
distribution.
@@ -137,4 +137,3 @@ License: Boost-Software-License
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
-
diff --git a/debian/patches/gcc6.diff b/debian/patches/gcc6.diff
new file mode 100644
index 0000000..2a6d80d
--- /dev/null
+++ b/debian/patches/gcc6.diff
@@ -0,0 +1,27 @@
+Description: Fix FTBFS with GCC 6
+ Removed the explicit provided type, so the compiler can deduce it by itself.
+Bug: https://github.com/fifengine/fifengine/issues/887
+Bug-Debian: https://bugs.debian.org/811858
+Origin: upstream, https://github.com/fifengine/fifengine/commit/d117c71876fa8b02e8e85230e436681ce4527b2f
+Author: Kilian Köppchen <kiliankoeppchen at googlemail.com>
+Last-Update: 2016-05-28
+--- a/engine/core/view/renderers/targetrenderer.cpp
++++ b/engine/core/view/renderers/targetrenderer.cpp
+@@ -136,7 +136,7 @@
+ rj.discard = false;
+
+ std::pair<RenderJobMap::iterator, bool> ret =
+- m_targets.insert(std::make_pair<std::string, RenderJob>(name, rj));
++ m_targets.insert(std::make_pair(name, rj));
+
+ return ret.first->second.target;
+ }
+@@ -149,7 +149,7 @@
+ rj.discard = false;
+
+ std::pair<RenderJobMap::iterator, bool> ret =
+- m_targets.insert(std::make_pair<std::string, RenderJob>(image->getName(), rj));
++ m_targets.insert(std::make_pair(image->getName(), rj));
+
+ return ret.first->second.target;
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 7a96e24..7a1abe7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ spelling.diff
#libpython.diff
libpython.diff
update-config.guess.sub-for-guichan
+gcc6.diff
diff --git a/debian/rules b/debian/rules
index 28dce13..7182f40 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,5 @@ override_dh_auto_clean:
rm -fr build-python*
rm -f debian/stamps/*
rm -f build/gnukfreebsd10-config.py
- dh_clean
+ dh_auto_clean
-# override_dh_builddeb:
-# dh_builddeb -- -Zxz
diff --git a/debian/source/options b/debian/source/options
deleted file mode 100644
index b7bc1f2..0000000
--- a/debian/source/options
+++ /dev/null
@@ -1 +0,0 @@
-compression = "xz"
diff --git a/debian/stamps/.gitignore b/debian/stamps/.gitignore
deleted file mode 100644
index e69de29..0000000
diff --git a/engine/core/ext/glee/GLee.cpp b/engine/core/ext/glee/GLee.cpp
index a9c58e2..245b04d 100644
--- a/engine/core/ext/glee/GLee.cpp
+++ b/engine/core/ext/glee/GLee.cpp
@@ -1,4 +1,3 @@
-#if 0
/***************************************************************************
*
* GLee.c
@@ -18169,5 +18168,3 @@ GLEE_EXTERN GLboolean GLeeInit( void )
__GLeeExtList_clean(&extensionNames);
return GL_TRUE;
}
-
-#endif
diff --git a/engine/core/vfs/vfs.cpp b/engine/core/vfs/vfs.cpp
index 021cd45..d437ece 100644
--- a/engine/core/vfs/vfs.cpp
+++ b/engine/core/vfs/vfs.cpp
@@ -89,7 +89,7 @@ namespace FIFE {
FL_WARN(_log, LMsg(provider->getName()) << " thought it could load " << path << " but didn't succeed (" << ex.what() << ")");
continue;
} catch (...) {
- FL_WARN(_log, LMsg(provider->getName()) << " thought it could load " << path << " but didn't succeed (unknown exception)");
+ FL_WARN(_log, LMsg(provider->getName()) << " thought it could load " << path << " but didn't succeed (unkown exception)");
continue;
}
}
diff --git a/engine/core/video/opengl/fife_opengl.h b/engine/core/video/opengl/fife_opengl.h
index 44ecaa1..b4ce51a 100644
--- a/engine/core/video/opengl/fife_opengl.h
+++ b/engine/core/video/opengl/fife_opengl.h
@@ -25,7 +25,7 @@
// Standard C++ library includes
// 3rd party library includes
-#include <GLee.h>
+#include "ext/glee/GLee.h"
// GLee.h includes windows.h when on a windows platform
// In winnt.h (which is included from windows.h) DELETE
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/fife.git
More information about the Pkg-games-commits
mailing list