[ember] 08/08: Update patches
Olek Wojnar
olek-guest at moszumanska.debian.org
Sat Aug 6 22:56:47 UTC 2016
This is an automated email from the git hooks/post-receive script.
olek-guest pushed a commit to branch updates
in repository ember.
commit 1e1cbf511e75f9727e89b1793bb80e5860ff9884
Author: Olek Wojnar <olek-dev at wojnar.org>
Date: Sun Jul 17 02:10:48 2016 -0400
Update patches
---
debian/changelog | 16 +-
.../0004-domain-bindings-lua-makefile.patch | 22 -
.../patches/0014-add-missing-ogrelodstrategy.patch | 496 ------------
debian/patches/0015-verbose-configure-errors.patch | 17 +-
debian/patches/0016-boost-1.53.patch | 14 -
debian/patches/0017-replace-mersenne-twister.patch | 198 ++---
debian/patches/0018-enable-subdir-objects.patch | 16 +
debian/patches/0019-update-boost-m4.patch | 829 +++++++++++++++++++++
debian/patches/0020-remove-obsolete-includes.patch | 88 +++
...icalChangeAdapter-fix-for-newer-compilers.patch | 25 +
debian/patches/0022-fix-typos.patch | 142 ++++
.../0023-add-keywords-to-desktop-file.patch | 13 +
debian/patches/0024-fix-icon-location.patch | 17 +
.../0025-fix-duplicate-script-install.patch | 25 +
debian/patches/series | 11 +-
15 files changed, 1228 insertions(+), 701 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3e9d421..04af164 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -51,8 +51,20 @@ ember (0.7.2+dfsg-1) unstable; urgency=medium
-- Do not install into games directories
-- Remove dh_builddeb override since xz is now the default
* d/watch: update file extensions
-
- -- Olek Wojnar <olek-dev at wojnar.org> Sat, 16 Jul 2016 23:44:34 -0400
+ * Remove three patches, add eight patches, update remaining patches
+ -- 0004-domain-bindings-lua-makefile.patch (implemented upstream)
+ -- 0014-add-missing-ogrelodstrategy.patch (implemented upstream)
+ -- 0016-boost-1.53.patch (patch target file removed upstream)
+ -- 0018-enable-subdir-objects.patch (Fix automake 1.14 warnings)
+ -- 0019-update-boost-m4.patch (Fix invalid boost_major_version)
+ -- 0020-remove-obsolete-includes.patch (Fix obsolete includes)
+ -- 0021-GraphicalChangeAdapter-fix-for-newer-compilers.patch (Added)
+ -- 0022-fix-typos.patch (Fix typos identified by lintian)
+ -- 0023-add-keywords-to-desktop-file.patch (Add Keywords to .desktop file)
+ -- 0024-fix-icon-location (Make icon location Icon Theme Spec-compliant)
+ -- 0025-fix-duplicate-script-install.patch (Was causing build failures)
+
+ -- Olek Wojnar <olek-dev at wojnar.org> Sat, 06 Aug 2016 18:39:19 -0400
ember (0.6.2+dfsg-2.1) unstable; urgency=medium
diff --git a/debian/patches/0004-domain-bindings-lua-makefile.patch b/debian/patches/0004-domain-bindings-lua-makefile.patch
deleted file mode 100644
index cb4b45f..0000000
--- a/debian/patches/0004-domain-bindings-lua-makefile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Fixes build rules for generated Domain.cxx source file
-Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
-Bug: https://bugs.launchpad.net/ember/+bug/968242
-
---- a/src/domain/bindings/lua/Makefile.am
-+++ b/src/domain/bindings/lua/Makefile.am
-@@ -1,7 +1,3 @@
--SUFFIXES: .cxx .pkg .lo .la .cpp .o .obj
--
--.pkg.cxx:
-- cd $(srcdir) && TOLUAXX=${TOLUAXX} $(abs_top_srcdir)/scripts/update_lua_bindings.sh `basename $@ .cxx` `basename $@ .cxx`.pkg $(abs_builddir)/`basename $@` $<
-
- INCLUDES = -I$(top_srcdir)/src -I$(srcdir) -I$(top_builddir)/src -DPREFIX=\"@prefix@\"
-
-@@ -12,5 +8,7 @@
- TOLUA_PKGS = Domain.pkg EntityTalk.pkg
- EXTRA_DIST = $(TOLUA_PKGS)
- Domain.cxx: $(TOLUA_PKGS)
-+ cd $(srcdir); \
-+ TOLUAXX=${TOLUAXX} $(abs_top_srcdir)/scripts/update_lua_bindings.sh `basename $@ .cxx` $< $@
-
- bindings: clean all
diff --git a/debian/patches/0014-add-missing-ogrelodstrategy.patch b/debian/patches/0014-add-missing-ogrelodstrategy.patch
deleted file mode 100644
index b2a186d..0000000
--- a/debian/patches/0014-add-missing-ogrelodstrategy.patch
+++ /dev/null
@@ -1,496 +0,0 @@
-Description: Add missing source file from upstream.
- Source tarball was missing a source file because it was missing from the
- Makefile.am. Patch adds the source file from upstream and updates the
- Makefile.am.
-Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
-
---- /dev/null
-+++ b/src/components/ogre/scripting/bindings/lua/ogre/OgreLodStrategy.pkg
-@@ -0,0 +1,71 @@
-+/*
-+-----------------------------------------------------------------------------
-+This source file is part of OGRE
-+ (Object-oriented Graphics Rendering Engine)
-+For the latest info, see http://www.ogre3d.org/
-+
-+Copyright (c) 2000-2005 The OGRE Team
-+Also see acknowledgements in Readme.html
-+
-+This program is free software; you can redistribute it and/or modify it under
-+the terms of the GNU Lesser General Public License as published by the Free Software
-+Foundation; either version 2 of the License, or (at your option) any later
-+version.
-+
-+This program 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 program; if not, write to the Free Software Foundation, Inc., 59 Temple
-+Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-+http://www.gnu.org/copyleft/lesser.txt.
-+-----------------------------------------------------------------------------
-+*/
-+
-+
-+namespace Ogre
-+{
-+
-+class LodStrategy
-+ {
-+ public:
-+ /** Get the value of the first (highest) level of detail. */
-+ //virtual Real getBaseValue() const = 0;
-+
-+ /** Transform lod bias so it only needs to be multiplied by the lod value. */
-+ //virtual Real transformBias(Real factor) const = 0;
-+
-+ /** Transforum user supplied value to internal value.
-+ @remarks
-+ By default, performs no transformation.
-+ @remarks
-+ Do not throw exceptions for invalid values here, as the lod strategy
-+ may be changed such that the values become valid.
-+ */
-+ float transformUserValue(float userValue) const;
-+
-+ /** Compute the lod value for a given movable object relative to a given camera. */
-+ //Real getValue(const MovableObject *movableObject, const Camera *camera) const;
-+
-+ /** Get the index of the lod usage which applies to a given value. */
-+ // virtual ushort getIndex(Real value, const Mesh::MeshLodUsageList& meshLodUsageList) const = 0;
-+
-+ /** Get the index of the lod usage which applies to a given value. */
-+ //virtual ushort getIndex(Real value, const Material::LodValueList& materialLodValueList) const = 0;
-+
-+ /** Sort mesh lod usage list from greatest to least detail */
-+ //virtual void sort(Mesh::MeshLodUsageList& meshLodUsageList) const = 0;
-+
-+ /** Determine if the lod values are sorted from greatest detail to least detail. */
-+ //virtual bool isSorted(const Mesh::LodValueList& values) const = 0;
-+
-+ /** Assert that the lod values are sorted from greatest detail to least detail. */
-+ //void assertSorted(const Mesh::LodValueList& values) const;
-+
-+ /** Get the name of this strategy. */
-+ //const String& getName() const { return mName; }
-+ };
-+
-+}
-+#endif
---- a/src/components/ogre/scripting/bindings/lua/ogre/Makefile.am
-+++ b/src/components/ogre/scripting/bindings/lua/ogre/Makefile.am
-@@ -12,7 +12,8 @@
-
- CLEANFILES = Ogre.cxx
- TOLUA_PKGS = Ogre.pkg OgreAxisAlignedBox.pkg OgreColourValue.pkg OgreEntity.pkg OgreGpuProgram.pkg OgreGpuProgramManager.pkg OgreHighLevelGpuProgram.pkg \
-- OgreHighLevelGpuProgramManager.pkg OgreIteratorWrappers.pkg OgreMaterial.pkg OgreMaterialManager.pkg OgreMaterialSerializer.pkg OgreMath.pkg OgreMesh.pkg \
-+ OgreHighLevelGpuProgramManager.pkg OgreIteratorWrappers.pkg OgreLodStrategy.pkg \
-+ OgreMaterial.pkg OgreMaterialManager.pkg OgreMaterialSerializer.pkg OgreMath.pkg OgreMesh.pkg \
- OgreMeshManager.pkg OgreNode.pkg OgreQuaternion.pkg OgreRenderTarget.pkg OgreRenderWindow.pkg OgreResource.pkg OgreResourceManager.pkg OgreRoot.pkg \
- OgreSceneNode.pkg OgreSubEntity.pkg OgreSubMesh.pkg OgreTexture.pkg OgreTextureManager.pkg OgreVector3.pkg OgreSceneManager.pkg
- EXTRA_DIST = $(TOLUA_PKGS)
---- /dev/null
-+++ b/src/components/ogre/scripting/bindings/lua/LodDefinition.pkg
-@@ -0,0 +1,214 @@
-+/*
-+ * Copyright (C) 2012 Peter Szucs <peter.szucs.dev at gmail.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program 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 General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ */
-+
-+namespace Ember
-+{
-+namespace OgreView
-+{
-+namespace Lod
-+{
-+
-+class LodLevel
-+{
-+public:
-+ /**
-+ * @brief Type of the reduction.
-+ *
-+ * Note: The vertex count is determined by unique vertices per submesh.
-+ * A mesh may have duplicate vertices with same position.
-+ */
-+ enum VertexReductionMethod {
-+ /**
-+ * @brief Percentage of vertexes to be removed from each submesh.
-+ *
-+ * Valid range is a number between 0.0 and 1.0
-+ */
-+ VRM_PROPORTIONAL,
-+
-+ /**
-+ * @brief Exact vertex count to be removed from each submesh.
-+ *
-+ * Pass only integers or it will be rounded.
-+ */
-+ VRM_CONSTANT,
-+
-+ /**
-+ * @brief Reduces the vertices, until the cost is bigger then the given value.
-+ *
-+ * Collapse cost is equal to the amount of artifact the reduction causes.
-+ * This generates the best Lod output, but the collapse cost depends on implementation.
-+ */
-+ VRM_COLLAPSE_COST
-+ };
-+};
-+
-+/**
-+ * @brief Lod Distance config container.
-+ */
-+class LodDistance
-+{
-+public:
-+
-+ /**
-+ * @brief Returns the mesh name of the Lod Distance, which is used in user created meshes.
-+ */
-+ const std::string& getMeshName() const;
-+
-+ /**
-+ * @brief Sets the mesh name of the Lod Distance, which is used in user created meshes.
-+ */
-+ void setMeshName(const std::string& meshName);
-+
-+ /**
-+ * @brief Returns the vertex reduction method of the Lod Distance, which is used in automatic vertex reduction.
-+ */
-+ Ember::OgreView::Lod::LodLevel::VertexReductionMethod getReductionMethod() const;
-+
-+ /**
-+ * @brief Sets the vertex reduction method of the Lod Distance, which is used in automatic vertex reduction.
-+ */
-+ void setReductionMethod(Ember::OgreView::Lod::LodLevel::VertexReductionMethod reductionMethod);
-+
-+ /**
-+ * @brief Returns the vertex reduction value of the Lod Distance, which is used in automatic vertex reduction.
-+ */
-+ float getReductionValue() const;
-+
-+ /**
-+ * @brief Sets the vertex reduction value of the Lod Distance, which is used in automatic vertex reduction.
-+ */
-+ void setReductionValue(float reductionValue);
-+};
-+
-+/**
-+ * @brief Lod Definition resource. Each *.loddef file is represented by a LodDefinition instance.
-+ */
-+class LodDefinition :
-+ public Ogre::Resource
-+{
-+public:
-+ /**
-+ * @brief Enumeration of Distance types.
-+ */
-+ enum LodType {
-+ /**
-+ * @brief A built in algorithm should reduce the vertex count.
-+ */
-+ LT_AUTOMATIC_VERTEX_REDUCTION,
-+
-+ /**
-+ * @brief User created mesh should be used.
-+ */
-+ LT_USER_CREATED_MESH
-+ };
-+
-+ /**
-+ * @brief Enumeration of Lod strategies.
-+ */
-+ enum LodStrategy {
-+ /**
-+ * @brief It will use the distance to the camera.
-+ */
-+ LS_DISTANCE,
-+
-+ /**
-+ * @brief It will use the pixel count of the bounding sphere inside the rendered frame.
-+ */
-+ LS_PIXEL_COUNT
-+ };
-+
-+ /**
-+ * @brief Returns whether automatic mesh Lod management is used.
-+ */
-+ bool getUseAutomaticLod() const;
-+
-+ /**
-+ * @brief Sets whether automatic mesh Lod management should be used.
-+ */
-+ void setUseAutomaticLod(bool useAutomaticLod);
-+
-+ /**
-+ * @brief Returns the type of the Lod.
-+ */
-+ Ember::OgreView::Lod::LodDefinition::LodType getType() const;
-+
-+ /**
-+ * @brief Sets the type of the Lod.
-+ */
-+ void setType(Ember::OgreView::Lod::LodDefinition::LodType type);
-+
-+ /**
-+ * @brief Returns the strategy of the Lod.
-+ */
-+ Ember::OgreView::Lod::LodDefinition::LodStrategy getStrategy() const;
-+
-+ /**
-+ * @brief Sets the strategy of the Lod.
-+ */
-+ void setStrategy(Ember::OgreView::Lod::LodDefinition::LodStrategy strategy);
-+
-+ /**
-+ * @brief Adds a Lod distance to the manual Lod configuration.
-+ */
-+ void addLodDistance(float distVal, const Ember::OgreView::Lod::LodDistance& distance);
-+
-+ /**
-+ * @brief Returns whether a Lod distance is existing in a manual Lod configuration.
-+ */
-+ bool hasLodDistance(float distVal) const;
-+
-+ /**
-+ * @brief Returns a Lod distance from the manual Lod configuration.
-+ */
-+ Ember::OgreView::Lod::LodDistance& getLodDistance(float distVal);
-+
-+ /**
-+ * @brief Returns a Lod distance count for the manual Lod configuration.
-+ */
-+ int getLodDistanceCount();
-+
-+ /**
-+ * @brief Creates a list of distances in a sorted order.
-+ *
-+ * This is meant for lua calls only.
-+ */
-+ std::vector<float> createListOfDistances();
-+
-+ /**
-+ * @brief Creates a distance.
-+ *
-+ * This is meant for lua calls only. Use addLodDistance() if you can.
-+ */
-+ LodDistance& createDistance(float distance);
-+
-+ /**
-+ * @brief Removes a Lod distance from the manual Lod configuration.
-+ */
-+ void removeLodDistance(float distVal);
-+};
-+
-+class LodDefinitionPtr
-+{
-+ virtual ~LodDefinitionPtr();
-+ Ember::OgreView::Lod::LodDefinition* get();
-+};
-+
-+}
-+}
-+}
-+
---- a/src/components/ogre/scripting/bindings/lua/Makefile.am
-+++ b/src/components/ogre/scripting/bindings/lua/Makefile.am
-@@ -15,9 +15,14 @@
- ConsoleAdapter.pkg Convert.pkg EmberEntity.pkg EmberEntityFactory.pkg EmberOgre.pkg EntityCEGUITexture.pkg EntityCreator.pkg EntityEditor.pkg EntityIcon.pkg \
- EntityIconDragDropTarget.pkg EntityIconDragDropPreview.pkg EntityIconManager.pkg EntityIconSlot.pkg EntityMoveManager.pkg EntityRecipe.pkg EntityRecipeManager.pkg EntityWorldPickListener.pkg \
- Environment.pkg GUIAdapter.pkg GUIManager.pkg Icon.pkg IconBar.pkg IconBase.pkg IconManager.pkg IGraphicalRepresentation.pkg ISceneManagerAdapter.pkg \
-- IWorldPickListener.pkg Jesus.pkg ListHolder.pkg MainCamera.pkg Map.pkg MaterialPicker.pkg Model.pkg ModelDefinition.pkg ModelDefinitionAtlasComposer.pkg \
-+ IWorldPickListener.pkg Jesus.pkg ListHolder.pkg \
-+ LodDefinition.pkg LodDefinitionManager.pkg LodManager.pkg \
-+ MainCamera.pkg Map.pkg MaterialPicker.pkg Model.pkg MeshInfoProvider.pkg \
-+ ModelDefinition.pkg ModelDefinitionAtlasComposer.pkg \
- ModelDefinitionManager.pkg ModelRenderer.pkg ModelRepresentation.pkg ModelRepresentationManager.pkg MotionManager.pkg MousePicker.pkg MovableObjectRenderer.pkg \
-- MovementController.pkg OgreEntityRenderer.pkg OgreInfo.pkg QuaternionAdapter.pkg QuickHelpCursor.pkg RawTypeInfoRepository.pkg ResourceListAdapter.pkg sigc.pkg SimpleRenderContext.pkg \
-+ MovementController.pkg OgreEntityRenderer.pkg OgreInfo.pkg \
-+ PMInjectorSignaler.pkg QuaternionAdapter.pkg QuickHelpCursor.pkg \
-+ RawTypeInfoRepository.pkg ResourceListAdapter.pkg sigc.pkg SimpleRenderContext.pkg \
- StackableContainer.pkg stdlib.pkg SubModel.pkg TerrainArea.pkg TerrainEditor.pkg TerrainLayerDefinition.pkg TerrainLayerDefinitionManager.pkg TerrainManager.pkg \
- TypeTreeAdapter.pkg Vector3Adapter.pkg Widget.pkg World.pkg Scene.pkg EntityTooltip.pkg TerrainHandler.pkg EntityCreatorTypeHelper.pkg Screen.pkg ModelEditHelper.pkg \
- EntityTextureManipulator.pkg
---- /dev/null
-+++ b/src/components/ogre/scripting/bindings/lua/LodDefinitionManager.pkg
-@@ -0,0 +1,37 @@
-+/*
-+ * Copyright (C) 2012 Peter Szucs <peter.szucs.dev at gmail.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program 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 General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ */
-+
-+namespace Ember
-+{
-+namespace OgreView
-+{
-+namespace Lod
-+{
-+
-+class LodDefinitionManager : public Ogre::ResourceManager
-+{
-+public:
-+ static LodDefinitionManager& getSingleton();
-+ void exportScript(std::string meshName, Ember::OgreView::Lod::LodDefinitionPtr definition);
-+ Ember::OgreView::Lod::LodDefinitionPtr create(const std::string& name, const std::string& group);
-+ Ember::OgreView::Lod::LodDefinitionPtr getByName(const std::string& name);
-+};
-+
-+}
-+}
-+}
---- /dev/null
-+++ b/src/components/ogre/scripting/bindings/lua/LodManager.pkg
-@@ -0,0 +1,36 @@
-+/*
-+ * Copyright (C) 2012 Peter Szucs <peter.szucs.dev at gmail.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program 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 General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ */
-+
-+namespace Ember
-+{
-+namespace OgreView
-+{
-+namespace Lod
-+{
-+
-+class LodManager
-+{
-+public:
-+ static LodManager& getSingleton();
-+ void loadLod(Ogre::MeshPtr mesh);
-+ void loadLod(Ogre::MeshPtr mesh, const Ember::OgreView::Lod::LodDefinition& definition);
-+};
-+
-+}
-+}
-+}
---- /dev/null
-+++ b/src/components/ogre/scripting/bindings/lua/MeshInfoProvider.pkg
-@@ -0,0 +1,42 @@
-+/*
-+ * Copyright (C) 2012 Peter Szucs <peter.szucs.dev at gmail.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program 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 General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ */
-+
-+namespace Ember
-+{
-+namespace OgreView
-+{
-+namespace Gui
-+{
-+
-+class MeshInfoProvider
-+{
-+public:
-+ sigc::signal<void> EventLodChanged;
-+
-+ MeshInfoProvider(OgreEntityRenderer* entityRenderer);
-+ ~MeshInfoProvider();
-+ std::string getInfo(int submeshIndex);
-+ std::string getPreviewInfo();
-+ void postqueueEntityMeshLodChanged(const Ogre::EntityMeshLodChangedEvent& evt);
-+ int getLodIndex();
-+ static int calcUniqueVertexCount(const Ogre::Mesh* mesh);
-+};
-+
-+}
-+}
-+}
---- /dev/null
-+++ b/src/components/ogre/scripting/bindings/lua/PMInjectorSignaler.pkg
-@@ -0,0 +1,41 @@
-+/*
-+ * Copyright (C) 2012 Peter Szucs <peter.szucs.dev at gmail.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program 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 General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ */
-+
-+namespace Ember
-+{
-+namespace OgreView
-+{
-+namespace Lod
-+{
-+
-+class LodConfig
-+{
-+};
-+
-+class PMInjectorSignaler
-+{
-+public:
-+ static Ember::OgreView::Lod::PMInjectorSignaler& getSingleton();
-+
-+ sigc::signal<void, Ember::OgreView::Lod::LodConfig*> LodInjected;
-+
-+};
-+
-+}
-+}
-+}
diff --git a/debian/patches/0015-verbose-configure-errors.patch b/debian/patches/0015-verbose-configure-errors.patch
index d284588..7fa7e95 100644
--- a/debian/patches/0015-verbose-configure-errors.patch
+++ b/debian/patches/0015-verbose-configure-errors.patch
@@ -1,20 +1,11 @@
Description: fix syntax of code in configure.ac test
Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
+Forwarded: https://github.com/worldforge/ember/pull/21
+Last-Update: 2016-07-24
--- a/configure.ac
+++ b/configure.ac
-@@ -142,10 +142,6 @@
- AM_CONDITIONAL([WIN32], [test x$WIN32 = xtrue])
- AM_CONDITIONAL([OSX], [test x$OSX = xtrue])
-
--
--LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
--CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
--
- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
- CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-
-@@ -308,7 +304,7 @@
+@@ -324,7 +324,7 @@
#if OGRE_NO_FREEIMAGE == 0
// OGRE is built with FreeImage
#else
@@ -23,7 +14,7 @@ Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
#endif
]])],
[], [AC_MSG_ERROR([[You must build Ogre with FreeImage support. You cannot use DevIL, as that's not thread safe.]])])
-@@ -322,7 +318,7 @@
+@@ -338,7 +338,7 @@
#if OGRE_DOUBLE_PRECISION == 0
// OGRE is built with single precision
#else
diff --git a/debian/patches/0016-boost-1.53.patch b/debian/patches/0016-boost-1.53.patch
deleted file mode 100644
index 3dcf074..0000000
--- a/debian/patches/0016-boost-1.53.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: fixes FTBFS using boost1.53-dev
-Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
-
---- a/src/components/ogre/SceneManagers/EmberPagingSceneManager/src/OgrePagingLandScapeData2D.cpp
-+++ b/src/components/ogre/SceneManagers/EmberPagingSceneManager/src/OgrePagingLandScapeData2D.cpp
-@@ -116,7 +116,7 @@
- _save ();
- //Use the shared pointer for deletion
- // delete[] mHeightData;
-- mHeightDataPtr.reset(0);
-+ mHeightDataPtr.reset();
- mHeightData = 0;
- _unload();
- mIsLoaded = false;
diff --git a/debian/patches/0017-replace-mersenne-twister.patch b/debian/patches/0017-replace-mersenne-twister.patch
index cc3b5ca..768a844 100644
--- a/debian/patches/0017-replace-mersenne-twister.patch
+++ b/debian/patches/0017-replace-mersenne-twister.patch
@@ -1,152 +1,48 @@
-Description: replace the Wagner MersenneTwister.h file with a custom one
- There was a lack of complete clarity regarding whether a comment appearing in
- this file constituted distribution license restrictions or not. Replacing the
- file entirely eliminates the ambiguity.
-Comment: The original upstream of the algorithm, has in the meantime removed the
- request to email in the code and re-licensed under a BSD license. See
- http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/MT2002/emt19937ar.html
-Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
+Description: Use the replaced MersenneTwister.h from WFMath
+Author: Olek Wojnar <olek-dev at wojnar.org>
+Forwarded: https://github.com/worldforge/ember/pull/21
+Last-Update: 2016-07-18
---- /dev/null
-+++ b/src/components/ogre/environment/pagedgeometry/include/MersenneTwister.h
-@@ -0,0 +1,140 @@
-+// MersenneTwister.h
-+//
-+// The WorldForge Project
-+// Copyright (C) 2013 The WorldForge Project
-+//
-+// This program is free software; you can redistribute it and/or modify
-+// it under the terms of the GNU General Public License as published by
-+// the Free Software Foundation; either version 2 of the License, or
-+// (at your option) any later version.
-+//
-+// This program 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 General Public License for more details.
-+//
-+// You should have received a copy of the GNU General Public License along
-+// with this program; if not, write to the Free Software Foundation, Inc.,
-+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+//
-+// For information about WorldForge and its authors, please contact
-+// the Worldforge Web Site at http://www.worldforge.org.
-+//
-+#ifndef WFMATH_MERSENNE_TWISTER_H_
-+#define WFMATH_MERSENNE_TWISTER_H_
-+
-+#include <iosfwd>
-+#include <climits>
-+#include <cmath>
-+#include <stdint.h>
-+
-+namespace WFMath {
-+
-+class MTRand {
-+public:
-+ typedef uint32_t uint32;
-+
-+ static const uint32 state_size = 624;
-+
-+public:
-+ MTRand();
-+ MTRand(uint32 oneSeed);
-+ MTRand(uint32* const bigSeed, uint32 const seedLength = state_size);
-+
-+ // real-valued random numbers on [0, 1] or [0, n]
-+ template<typename FloatT>
-+ FloatT rand();
-+ double rand();
-+ double rand(const double& n);
-+
-+ // integer-valued random numbers on [0, 2^32-1] or [0, n]
-+ uint32 randInt();
-+ uint32 randInt(uint32 n);
-+
-+ void seed();
-+ void seed(uint32 oneSeed);
-+ void seed(uint32* const init_vector, uint32 init_vector_length = state_size);
-+
-+ std::ostream& save(std::ostream&) const;
-+ std::istream& load(std::istream&);
-+
-+ static MTRand instance;
-+
-+private:
-+ uint32 state[state_size];
-+ uint32 index;
-+};
-+
-+
-+inline MTRand::MTRand(uint32 s)
-+: index(0)
-+{ seed(s); }
-+
-+inline MTRand::MTRand(uint32* const bigSeed, const uint32 seedLength)
-+: index(0)
-+{ seed(bigSeed, seedLength); }
-+
-+inline MTRand::MTRand()
-+: index(0)
-+{ seed(); }
-+
-+template<>
-+inline float MTRand::rand<float>()
-+{ return float(randInt()) * (1.0f/4294967295.0f); }
-+
-+template<>
-+inline double MTRand::rand<double>()
-+{ return double(randInt()) * (1.0/4294967295.0); }
-+
-+inline double MTRand::rand()
-+{ return double(randInt()) * (1.0/4294967295.0); }
-+
-+inline double MTRand::rand( const double& n )
-+{ return rand() * n; }
-+
-+
-+inline MTRand::uint32 MTRand::randInt(uint32 n)
-+{
-+ uint32 used = n;
-+ used |= used >> 1;
-+ used |= used >> 2;
-+ used |= used >> 4;
-+ used |= used >> 8;
-+ used |= used >> 16;
-+
-+ uint32 i;
-+ do
-+ i = randInt() & used;
-+ while( i > n );
-+ return i;
-+}
-+
-+
-+#if 0
-+inline void MTRand::save(uint32* saveArray) const
-+{
-+ register uint32 *sa = saveArray;
-+ register const uint32 *s = state;
-+ register int i = state_size;
-+ for( ; i--; *sa++ = *s++ ) {}
-+ *sa = left;
-+}
-+
-+
-+inline void MTRand::load(uint32 *const loadArray)
-+{
-+ register uint32 *s = state;
-+ register uint32 *la = loadArray;
-+ register int i = state_size;
-+ for( ; i--; *s++ = *la++ ) {}
-+ left = *la;
-+ pNext = &state[state_size-left];
-+}
-+#endif
-+
-+std::ostream& operator<<(std::ostream& os, MTRand const& mtrand);
-+std::istream& operator>>(std::istream& is, MTRand& mtrand);
-+
-+} // namespace
-+
-+#endif // WFMATH_MERSENNE_TWISTER_H_
+--- a/src/components/ogre/environment/pagedgeometry/Makefile.am
++++ b/src/components/ogre/environment/pagedgeometry/Makefile.am
+@@ -10,4 +10,4 @@
+ source/PagedGeometry.cpp source/PropertyMaps.cpp source/StaticBillboardSet.cpp \
+ source/TreeLoader2D.cpp source/TreeLoader3D.cpp source/DummyPage.cpp source/PassiveEntityPage.cpp source/WindBatchedGeometry.cpp source/WindBatchPage.cpp \
+ source/ShaderHelper.cpp
+-noinst_HEADERS = include/BatchPage.h include/BatchedGeometry.h include/GrassLoader.h include/ImpostorPage.h include/PagedGeometry.h include/PropertyMaps.h include/StaticBillboardSet.h include/TreeLoader2D.h include/TreeLoader3D.h include/DummyPage.h include/PassiveEntityPage.h include/WindBatchedGeometry.h include/WindBatchPage.h include/RandomTable.h include/MersenneTwister.h include/ShaderHelper.h
+\ No newline at end of file
++noinst_HEADERS = include/BatchPage.h include/BatchedGeometry.h include/GrassLoader.h include/ImpostorPage.h include/PagedGeometry.h include/PropertyMaps.h include/StaticBillboardSet.h include/TreeLoader2D.h include/TreeLoader3D.h include/DummyPage.h include/PassiveEntityPage.h include/WindBatchedGeometry.h include/WindBatchPage.h include/RandomTable.h include/ShaderHelper.h
+--- a/src/components/ogre/terrain/SegmentManager.cpp
++++ b/src/components/ogre/terrain/SegmentManager.cpp
+@@ -115,7 +115,7 @@
+ } else {
+ //Use a predictive way of generating a random height.
+ rand.seed(xIndex + x + ((yIndex + y) * 10000.0f));
+- segment->setCornerPoint(x,y, Mercator::BasePoint(mFakeSegmentHeight - (rand.randf(mFakeSegmentHeightVariation))));
++ segment->setCornerPoint(x,y, Mercator::BasePoint(mFakeSegmentHeight - (rand.rand<float>() * mFakeSegmentHeightVariation)));
+ }
+ };
+
+--- a/src/components/ogre/environment/pagedgeometry/include/RandomTable.h
++++ b/src/components/ogre/environment/pagedgeometry/include/RandomTable.h
+@@ -15,7 +15,7 @@
+ #include <OgreMath.h>
+
+ #include <time.h> // for time
+-#include "MersenneTwister.h"
++#include <wfmath/MersenneTwister.h>
+
+ // random table class that speeds up PG a bit
+ class RandomTable
+@@ -86,9 +86,9 @@
+ #else
+ // using our Mersenne Twister (preferred way)
+ #ifdef WIN32
+- MTRand mtrand(GetTickCount());
++ WFMath::MTRand mtrand(GetTickCount());
+ #else
+- MTRand mtrand(time(NULL));
++ WFMath::MTRand mtrand(time(NULL));
+ #endif
+ for(unsigned long i = 0; i < tableSize; i++)
+ table[i] = mtrand.rand();
diff --git a/debian/patches/0018-enable-subdir-objects.patch b/debian/patches/0018-enable-subdir-objects.patch
new file mode 100644
index 0000000..4cbe59a
--- /dev/null
+++ b/debian/patches/0018-enable-subdir-objects.patch
@@ -0,0 +1,16 @@
+Description: Fix automake 1.14 warnings about subdir-objects
+Author: Olek Wojnar <olek-dev at wojnar.org>
+Forwarded: https://github.com/worldforge/ember/pull/21
+Last-Update: 2016-07-17
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -9,7 +9,7 @@
+ AC_CANONICAL_TARGET
+
+ # We have to use "foreign" since we supply README.md instead of the GNU canonical README file.
+-AM_INIT_AUTOMAKE([tar-ustar nostdinc dist-bzip2 color-tests parallel-tests foreign])
++AM_INIT_AUTOMAKE([tar-ustar nostdinc dist-bzip2 color-tests parallel-tests foreign subdir-objects])
+ AM_SILENT_RULES([yes])
+
+
diff --git a/debian/patches/0019-update-boost-m4.patch b/debian/patches/0019-update-boost-m4.patch
new file mode 100644
index 0000000..97fef44
--- /dev/null
+++ b/debian/patches/0019-update-boost-m4.patch
@@ -0,0 +1,829 @@
+Description: Fix invalid boost_major_version error
+ Cherry-picked from upstream (not needed after 0.8.0)
+Origin: https://github.com/worldforge/ember/commit/411be9f0adf1e0c29638b5139827bcc2e6b84ea9
+Last-Update: 2016-07-17
+
+--- a/m4/boost.m4
++++ b/m4/boost.m4
+@@ -1,5 +1,5 @@
+ # boost.m4: Locate Boost headers and libraries for autoconf-based projects.
+-# Copyright (C) 2007, 2008, 2009, 2010, 2011 Benoit Sigoure <tsuna at lrde.epita.fr>
++# Copyright (C) 2007-2011, 2014 Benoit Sigoure <tsuna at lrde.epita.fr>
+ #
+ # This program is free software: you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -22,7 +22,7 @@
+ # along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ m4_define([_BOOST_SERIAL], [m4_translit([
+-# serial 18
++# serial 24
+ ], [#
+ ], [])])
+
+@@ -59,7 +59,8 @@ m4_pattern_forbid([^_?(BOOST|Boost)_])
+ # It could be useful to turn this into a macro which extracts the
+ # value of any macro.
+ m4_define([_BOOST_SED_CPP],
+-[AC_LANG_PREPROC_REQUIRE()dnl
++[AC_LANG_PUSH([C++])dnl
++AC_LANG_PREPROC_REQUIRE()dnl
+ AC_REQUIRE([AC_PROG_SED])dnl
+ AC_LANG_CONFTEST([AC_LANG_SOURCE([[$2]])])
+ AS_IF([dnl eval is necessary to expand ac_cpp.
+@@ -71,13 +72,31 @@ dnl strip `\n' with backquotes, not the `\r'. This results in
+ dnl boost_cv_lib_version='1_37\r' for instance, which breaks
+ dnl everything else.
+ dnl Cannot use 'dnl' after [$4] because a trailing dnl may break AC_CACHE_CHECK
++dnl
++dnl Beware that GCC 5, when expanding macros, may embed # line directives
++dnl a within single line:
++dnl
++dnl # 1 "conftest.cc"
++dnl # 1 "<built-in>"
++dnl # 1 "<command-line>"
++dnl # 1 "conftest.cc"
++dnl # 1 "/opt/local/include/boost/version.hpp" 1 3
++dnl # 2 "conftest.cc" 2
++dnl boost-lib-version =
++dnl # 2 "conftest.cc" 3
++dnl "1_56"
++dnl
++dnl So get rid of the # lines, and glue the remaining ones together.
+ (eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
++ grep -v '#' |
+ tr -d '\r' |
++ tr -s '\n' ' ' |
+ $SED -n -e "$1" >conftest.i 2>&1],
+ [$3],
+ [$4])
+ rm -rf conftest*
+-])# AC_EGREP_CPP
++AC_LANG_POP([C++])dnl
++])# _BOOST_SED_CPP
+
+
+
+@@ -206,7 +225,7 @@ AC_LANG_POP([C++])dnl
+ AC_CACHE_CHECK([for Boost's header version],
+ [boost_cv_lib_version],
+ [m4_pattern_allow([^BOOST_LIB_VERSION$])dnl
+- _BOOST_SED_CPP([/^boost-lib-version = /{s///;s/\"//g;p;q;}],
++ _BOOST_SED_CPP([[/^boost-lib-version = /{s///;s/[\" ]//g;p;q;}]],
+ [#include <boost/version.hpp>
+ boost-lib-version = BOOST_LIB_VERSION],
+ [boost_cv_lib_version=`cat conftest.i`])])
+@@ -214,13 +233,14 @@ boost-lib-version = BOOST_LIB_VERSION],
+ boost_major_version=`echo "$boost_cv_lib_version" | sed 's/_//;s/_.*//'`
+ case $boost_major_version in #(
+ '' | *[[!0-9]]*)
+- AC_MSG_ERROR([invalid value: boost_major_version=$boost_major_version])
++ AC_MSG_ERROR([invalid value: boost_major_version='$boost_major_version'])
+ ;;
+ esac
+ fi
+ CPPFLAGS=$boost_save_CPPFLAGS
+ ])# BOOST_REQUIRE
+
++
+ # BOOST_STATIC()
+ # --------------
+ # Add the "--enable-static-boost" configure argument. If this argument is given
+@@ -232,6 +252,7 @@ AC_DEFUN([BOOST_STATIC],
+ [enable_static_boost=yes],
+ [enable_static_boost=no])])# BOOST_STATIC
+
++
+ # BOOST_FIND_HEADER([HEADER-NAME], [ACTION-IF-NOT-FOUND], [ACTION-IF-FOUND])
+ # --------------------------------------------------------------------------
+ # Wrapper around AC_CHECK_HEADER for Boost headers. Useful to check for
+@@ -264,14 +285,16 @@ fi
+ ])# BOOST_FIND_HEADER
+
+
+-# BOOST_FIND_LIB([LIB-NAME], [PREFERRED-RT-OPT], [HEADER-NAME], [CXX-TEST],
+-# [CXX-PROLOGUE])
+-# -------------------------------------------------------------------------
+-# Look for the Boost library LIB-NAME (e.g., LIB-NAME = `thread', for
+-# libboost_thread). Check that HEADER-NAME works and check that
+-# libboost_LIB-NAME can link with the code CXX-TEST. The optional argument
+-# CXX-PROLOGUE can be used to include some C++ code before the `main'
+-# function.
++# BOOST_FIND_LIBS([COMPONENT-NAME], [CANDIDATE-LIB-NAMES],
++# [PREFERRED-RT-OPT], [HEADER-NAME], [CXX-TEST],
++# [CXX-PROLOGUE])
++# --------------------------------------------------------------
++# Look for the Boost library COMPONENT-NAME (e.g., `thread', for
++# libboost_thread) under the possible CANDIDATE-LIB-NAMES (e.g.,
++# "thread_win32 thread"). Check that HEADER-NAME works and check that
++# libboost_LIB-NAME can link with the code CXX-TEST. The optional
++# argument CXX-PROLOGUE can be used to include some C++ code before
++# the `main' function.
+ #
+ # Invokes BOOST_FIND_HEADER([HEADER-NAME]) (see above).
+ #
+@@ -285,7 +308,7 @@ fi
+ # builds. Some sample values for PREFERRED-RT-OPT: (nothing), mt, d, mt-d, gdp
+ # ... If you want to make sure you have a specific version of Boost
+ # (eg, >= 1.33) you *must* invoke BOOST_REQUIRE before this macro.
+-AC_DEFUN([BOOST_FIND_LIB],
++AC_DEFUN([BOOST_FIND_LIBS],
+ [AC_REQUIRE([BOOST_REQUIRE])dnl
+ AC_REQUIRE([_BOOST_FIND_COMPILER_TAG])dnl
+ AC_REQUIRE([BOOST_STATIC])dnl
+@@ -299,32 +322,69 @@ AS_VAR_PUSHDEF([Boost_lib], [boost_cv_lib_$1])dnl
+ AS_VAR_PUSHDEF([Boost_lib_LDFLAGS], [boost_cv_lib_$1_LDFLAGS])dnl
+ AS_VAR_PUSHDEF([Boost_lib_LDPATH], [boost_cv_lib_$1_LDPATH])dnl
+ AS_VAR_PUSHDEF([Boost_lib_LIBS], [boost_cv_lib_$1_LIBS])dnl
+-BOOST_FIND_HEADER([$3])
++BOOST_FIND_HEADER([$4])
+ boost_save_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+-# Now let's try to find the library. The algorithm is as follows: first look
+-# for a given library name according to the user's PREFERRED-RT-OPT. For each
+-# library name, we prefer to use the ones that carry the tag (toolset name).
+-# Each library is searched through the various standard paths were Boost is
+-# usually installed. If we can't find the standard variants, we try to
+-# enforce -mt (for instance on MacOSX, libboost_threads.dylib doesn't exist
+-# but there's -obviously- libboost_threads-mt.dylib).
+ AC_CACHE_CHECK([for the Boost $1 library], [Boost_lib],
+- [Boost_lib=no
+- case "$2" in #(
+- mt | mt-) boost_mt=-mt; boost_rtopt=;; #(
+- mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X$2" : 'Xmt-*\(.*\)'`;; #(
+- *) boost_mt=; boost_rtopt=$2;;
++ [_BOOST_FIND_LIBS($@)])
++case $Boost_lib in #(
++ (no) _AC_MSG_LOG_CONFTEST
++ AC_MSG_ERROR([cannot find the flags to link with Boost $1])
++ ;;
++esac
++AC_SUBST(AS_TR_CPP([BOOST_$1_LDFLAGS]), [$Boost_lib_LDFLAGS])dnl
++AC_SUBST(AS_TR_CPP([BOOST_$1_LDPATH]), [$Boost_lib_LDPATH])dnl
++AC_SUBST([BOOST_LDPATH], [$Boost_lib_LDPATH])dnl
++AC_SUBST(AS_TR_CPP([BOOST_$1_LIBS]), [$Boost_lib_LIBS])dnl
++CPPFLAGS=$boost_save_CPPFLAGS
++AS_VAR_POPDEF([Boost_lib])dnl
++AS_VAR_POPDEF([Boost_lib_LDFLAGS])dnl
++AS_VAR_POPDEF([Boost_lib_LDPATH])dnl
++AS_VAR_POPDEF([Boost_lib_LIBS])dnl
++AC_LANG_POP([C++])dnl
++fi
++])
++
++
++# BOOST_FIND_LIB([LIB-NAME],
++# [PREFERRED-RT-OPT], [HEADER-NAME], [CXX-TEST],
++# [CXX-PROLOGUE])
++# --------------------------------------------------------------
++# Backward compatibility wrapper for BOOST_FIND_LIBS.
++AC_DEFUN([BOOST_FIND_LIB],
++[BOOST_FIND_LIBS([$1], $@)])
++
++
++# _BOOST_FIND_LIBS([LIB-NAME], [CANDIDATE-LIB-NAMES],
++# [PREFERRED-RT-OPT], [HEADER-NAME], [CXX-TEST],
++# [CXX-PROLOGUE])
++# --------------------------------------------------------------
++# Real implementation of BOOST_FIND_LIBS: rely on these local macros:
++# Boost_lib, Boost_lib_LDFLAGS, Boost_lib_LDPATH, Boost_lib_LIBS
++#
++# The algorithm is as follows: first look for a given library name
++# according to the user's PREFERRED-RT-OPT. For each library name, we
++# prefer to use the ones that carry the tag (toolset name). Each
++# library is searched through the various standard paths were Boost is
++# usually installed. If we can't find the standard variants, we try
++# to enforce -mt (for instance on MacOSX, libboost_thread.dylib
++# doesn't exist but there's -obviously- libboost_thread-mt.dylib).
++AC_DEFUN([_BOOST_FIND_LIBS],
++[Boost_lib=no
++ case "$3" in #(
++ (mt | mt-) boost_mt=-mt; boost_rtopt=;; #(
++ (mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X$3" : 'Xmt-*\(.*\)'`;; #(
++ (*) boost_mt=; boost_rtopt=$3;;
+ esac
+ if test $enable_static_boost = yes; then
+ boost_rtopt="s$boost_rtopt"
+ fi
+ # Find the proper debug variant depending on what we've been asked to find.
+ case $boost_rtopt in #(
+- *d*) boost_rt_d=$boost_rtopt;; #(
+- *[[sgpn]]*) # Insert the `d' at the right place (in between `sg' and `pn')
++ (*d*) boost_rt_d=$boost_rtopt;; #(
++ (*[[sgpn]]*) # Insert the `d' at the right place (in between `sg' and `pn')
+ boost_rt_d=`echo "$boost_rtopt" | sed 's/\(s*g*\)\(p*n*\)/\1\2/'`;; #(
+- *) boost_rt_d='-d';;
++ (*) boost_rt_d='-d';;
+ esac
+ # If the PREFERRED-RT-OPT are not empty, prepend a `-'.
+ test -n "$boost_rtopt" && boost_rtopt="-$boost_rtopt"
+@@ -335,8 +395,8 @@ AC_CACHE_CHECK([for the Boost $1 library], [Boost_lib],
+ AC_MSG_ERROR([the libext variable is empty, did you invoke Libtool?])
+ boost_save_ac_objext=$ac_objext
+ # Generate the test file.
+- AC_LANG_CONFTEST([AC_LANG_PROGRAM([#include <$3>
+-$5], [$4])])
++ AC_LANG_CONFTEST([AC_LANG_PROGRAM([#include <$4>
++$6], [$5])])
+ dnl Optimization hacks: compiling C++ is slow, especially with Boost. What
+ dnl we're trying to do here is guess the right combination of link flags
+ dnl (LIBS / LDFLAGS) to use a given library. This can take several
+@@ -358,21 +418,22 @@ dnl start the for loops).
+ [AC_MSG_ERROR([cannot compile a test that uses Boost $1])])
+ ac_objext=$boost_save_ac_objext
+ boost_failed_libs=
+-# Don't bother to ident the 6 nested for loops, only the 2 innermost ones
+-# matter.
++# Don't bother to ident the following nested for loops, only the 2
++# innermost ones matter.
++for boost_lib_ in $2; do
+ for boost_tag_ in -$boost_cv_lib_tag ''; do
+ for boost_ver_ in -$boost_cv_lib_version ''; do
+ for boost_mt_ in $boost_mt -mt ''; do
+ for boost_rtopt_ in $boost_rtopt '' -d; do
+ for boost_lib in \
+- boost_$1$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \
+- boost_$1$boost_tag_$boost_rtopt_$boost_ver_ \
+- boost_$1$boost_tag_$boost_mt_$boost_ver_ \
+- boost_$1$boost_tag_$boost_ver_
++ boost_$boost_lib_$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \
++ boost_$boost_lib_$boost_tag_$boost_rtopt_$boost_ver_ \
++ boost_$boost_lib_$boost_tag_$boost_mt_$boost_ver_ \
++ boost_$boost_lib_$boost_tag_$boost_ver_
+ do
+ # Avoid testing twice the same lib
+ case $boost_failed_libs in #(
+- *@$boost_lib@*) continue;;
++ (*@$boost_lib@*) continue;;
+ esac
+ # If with_boost is empty, we'll search in /lib first, which is not quite
+ # right so instead we'll try to a location based on where the headers are.
+@@ -382,14 +443,17 @@ for boost_rtopt_ in $boost_rtopt '' -d; do
+ /opt/local/lib* /usr/local/lib* /opt/lib* /usr/lib* \
+ "$with_boost" C:/Boost/lib /lib*
+ do
+- test -e "$boost_ldpath" || continue
++ # Don't waste time with directories that don't exist.
++ if test x"$boost_ldpath" != x && test ! -e "$boost_ldpath"; then
++ continue
++ fi
+ boost_save_LDFLAGS=$LDFLAGS
+ # Are we looking for a static library?
+ case $boost_ldpath:$boost_rtopt_ in #(
+- *?*:*s*) # Yes (Non empty boost_ldpath + s in rt opt)
++ (*?*:*s*) # Yes (Non empty boost_ldpath + s in rt opt)
+ Boost_lib_LIBS="$boost_ldpath/lib$boost_lib.$libext"
+ test -e "$Boost_lib_LIBS" || continue;; #(
+- *) # No: use -lboost_foo to find the shared library.
++ (*) # No: use -lboost_foo to find the shared library.
+ Boost_lib_LIBS="-l$boost_lib";;
+ esac
+ boost_save_LIBS=$LIBS
+@@ -403,27 +467,35 @@ dnl generated only once above (before we start the for loops).
+ LDFLAGS=$boost_save_LDFLAGS
+ LIBS=$boost_save_LIBS
+ if test x"$Boost_lib" = xyes; then
+- # Check or used cached result of whether or not using -R or -rpath makes sense.
+- # Some implementations of ld, such as for Mac OSX, require -rpath but
+- # -R is the flag known to work on other systems.
+- # https://github.com/tsuna/boost.m4/issues/19
++ # Check or used cached result of whether or not using -R or
++ # -rpath makes sense. Some implementations of ld, such as for
++ # Mac OSX, require -rpath but -R is the flag known to work on
++ # other systems. https://github.com/tsuna/boost.m4/issues/19
+ AC_CACHE_VAL([boost_cv_rpath_link_ldflag],
+- [for boost_cv_rpath_link_ldflag in -Wl,-R, -Wl,-rpath,; do
+- LDFLAGS="$boost_save_LDFLAGS -L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
+- LIBS="$boost_save_LIBS $Boost_lib_LIBS"
+- _BOOST_AC_LINK_IFELSE([],
+- [boost_rpath_link_ldflag_found=yes
+- break],
+- [boost_rpath_link_ldflag_found=no])
+- done
++ [case $boost_ldpath in
++ '') # Nothing to do.
++ boost_cv_rpath_link_ldflag=
++ boost_rpath_link_ldflag_found=yes;;
++ *)
++ for boost_cv_rpath_link_ldflag in -Wl,-R, -Wl,-rpath,; do
++ LDFLAGS="$boost_save_LDFLAGS -L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
++ LIBS="$boost_save_LIBS $Boost_lib_LIBS"
++ _BOOST_AC_LINK_IFELSE([],
++ [boost_rpath_link_ldflag_found=yes
++ break],
++ [boost_rpath_link_ldflag_found=no])
++ done
++ ;;
++ esac
+ AS_IF([test "x$boost_rpath_link_ldflag_found" != "xyes"],
+ [AC_MSG_ERROR([Unable to determine whether to use -R or -rpath])])
+ LDFLAGS=$boost_save_LDFLAGS
+ LIBS=$boost_save_LIBS
+ ])
+- Boost_lib_LDFLAGS="-L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
++ test x"$boost_ldpath" != x &&
++ Boost_lib_LDFLAGS="-L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
+ Boost_lib_LDPATH="$boost_ldpath"
+- break 6
++ break 7
+ else
+ boost_failed_libs="$boost_failed_libs@$boost_lib@"
+ fi
+@@ -433,25 +505,10 @@ done
+ done
+ done
+ done
++done # boost_lib_
+ rm -f conftest.$ac_objext
+ ])
+-case $Boost_lib in #(
+- no) _AC_MSG_LOG_CONFTEST
+- AC_MSG_ERROR([cannot find the flags to link with Boost $1])
+- ;;
+-esac
+-AC_SUBST(AS_TR_CPP([BOOST_$1_LDFLAGS]), [$Boost_lib_LDFLAGS])dnl
+-AC_SUBST(AS_TR_CPP([BOOST_$1_LDPATH]), [$Boost_lib_LDPATH])dnl
+-AC_SUBST([BOOST_LDPATH], [$Boost_lib_LDPATH])dnl
+-AC_SUBST(AS_TR_CPP([BOOST_$1_LIBS]), [$Boost_lib_LIBS])dnl
+-CPPFLAGS=$boost_save_CPPFLAGS
+-AS_VAR_POPDEF([Boost_lib])dnl
+-AS_VAR_POPDEF([Boost_lib_LDFLAGS])dnl
+-AS_VAR_POPDEF([Boost_lib_LDPATH])dnl
+-AS_VAR_POPDEF([Boost_lib_LIBS])dnl
+-AC_LANG_POP([C++])dnl
+-fi
+-])# BOOST_FIND_LIB
++
+
+
+ # --------------------------------------- #
+@@ -493,20 +550,20 @@ BOOST_FIND_HEADER([boost/asio.hpp])])
+
+ # BOOST_BIND()
+ # ------------
+-# Look for Boost.Bind
++# Look for Boost.Bind.
+ BOOST_DEFUN([Bind],
+ [BOOST_FIND_HEADER([boost/bind.hpp])])
+
+
+ # BOOST_CHRONO()
+-# ------------------
+-# Look for Boost.Chrono
++# --------------
++# Look for Boost.Chrono.
+ BOOST_DEFUN([Chrono],
+ [# Do we have to check for Boost.System? This link-time dependency was
+ # added as of 1.35.0. If we have a version <1.35, we must not attempt to
+ # find Boost.System as it didn't exist by then.
+ if test $boost_major_version -ge 135; then
+-BOOST_SYSTEM([$1])
++ BOOST_SYSTEM([$1])
+ fi # end of the Boost.System check.
+ boost_filesystem_save_LIBS=$LIBS
+ boost_filesystem_save_LDFLAGS=$LDFLAGS
+@@ -517,14 +574,40 @@ BOOST_FIND_LIB([chrono], [$1],
+ [boost/chrono.hpp],
+ [boost::chrono::thread_clock d;])
+ if test $enable_static_boost = yes && test $boost_major_version -ge 135; then
+- AC_SUBST([BOOST_FILESYSTEM_LIBS], ["$BOOST_FILESYSTEM_LIBS $BOOST_SYSTEM_LIBS"])
++ BOOST_CHRONO_LIBS="$BOOST_CHRONO_LIBS $BOOST_SYSTEM_LIBS"
+ fi
+ LIBS=$boost_filesystem_save_LIBS
+ LDFLAGS=$boost_filesystem_save_LDFLAGS
+-
+ ])# BOOST_CHRONO
+
+
++# BOOST_CONTEXT([PREFERRED-RT-OPT])
++# -----------------------------------
++# Look for Boost.Context. For the documentation of PREFERRED-RT-OPT, see the
++# documentation of BOOST_FIND_LIB above. This library was introduced in Boost
++# 1.51.0
++BOOST_DEFUN([Context],
++[BOOST_FIND_LIB([context], [$1],
++ [boost/context/all.hpp],[[
++// creates a stack
++void * stack_pointer = new void*[4096];
++std::size_t const size = sizeof(void*[4096]);
++
++// context fc uses f() as context function
++// fcontext_t is placed on top of context stack
++// a pointer to fcontext_t is returned
++fc = ctx::make_fcontext(stack_pointer, size, f);
++return ctx::jump_fcontext(&fcm, fc, 3) == 6;]],[dnl
++namespace ctx = boost::context;
++// context
++static ctx::fcontext_t fcm, *fc;
++// context-function
++static void f(intptr_t i) {
++ ctx::jump_fcontext(fc, &fcm, i * 2);
++}])
++])# BOOST_CONTEXT
++
++
+ # BOOST_CONVERSION()
+ # ------------------
+ # Look for Boost.Conversion (cast / lexical_cast)
+@@ -534,6 +617,44 @@ BOOST_FIND_HEADER([boost/lexical_cast.hpp])
+ ])# BOOST_CONVERSION
+
+
++# BOOST_COROUTINE([PREFERRED-RT-OPT])
++# -----------------------------------
++# Look for Boost.Coroutine. For the documentation of PREFERRED-RT-OPT, see the
++# documentation of BOOST_FIND_LIB above. This library was introduced in Boost
++# 1.53.0
++BOOST_DEFUN([Coroutine],
++[
++boost_coroutine_save_LIBS=$LIBS
++boost_coroutine_save_LDFLAGS=$LDFLAGS
++# Link-time dependency from coroutine to context
++BOOST_CONTEXT([$1])
++# Starting from Boost 1.55 a dependency on Boost.System is added
++if test $boost_major_version -ge 155; then
++ BOOST_SYSTEM([$1])
++fi
++m4_pattern_allow([^BOOST_(CONTEXT|SYSTEM)_(LIBS|LDFLAGS)])
++LIBS="$LIBS $BOOST_CONTEXT_LIBS $BOOST_SYSTEM_LIBS"
++LDFLAGS="$LDFLAGS $BOOST_CONTEXT_LDFLAGS"
++
++BOOST_FIND_LIB([coroutine], [$1],
++ [boost/coroutine/coroutine.hpp],
++ [boost::coroutines::coroutine< int(int) > coro; coro.empty();])
++
++# Link-time dependency from coroutine to context, existed only in 1.53, in 1.54
++# coroutine doesn't use context from its headers but from its library.
++if test $boost_major_version -eq 153 || test $enable_static_boost = yes && test $boost_major_version -ge 154; then
++ BOOST_COROUTINE_LIBS="$BOOST_COROUTINE_LIBS $BOOST_CONTEXT_LIBS"
++ BOOST_COROUTINE_LDFLAGS="$BOOST_COROUTINE_LDFLAGS $BOOST_CONTEXT_LDFLAGS"
++fi
++if test $enable_static_boost = yes && test $boost_major_version -ge 155; then
++ BOOST_COROUTINE_LIBS="$BOOST_COROUTINE_LIBS $BOOST_SYSTEM_LIBS"
++ BOOST_COROUTINE_LDFLAGS="$BOOST_COROUTINE_LDFLAGS $BOOST_SYSTEM_LDFLAGS"
++fi
++LIBS=$boost_coroutine_save_LIBS
++LDFLAGS=$boost_coroutine_save_LDFLAGS
++])# BOOST_COROUTINE
++
++
+ # BOOST_CRC()
+ # -----------
+ # Look for Boost.CRC
+@@ -564,7 +685,7 @@ BOOST_DEFUN([Filesystem],
+ # added as of 1.35.0. If we have a version <1.35, we must not attempt to
+ # find Boost.System as it didn't exist by then.
+ if test $boost_major_version -ge 135; then
+-BOOST_SYSTEM([$1])
++ BOOST_SYSTEM([$1])
+ fi # end of the Boost.System check.
+ boost_filesystem_save_LIBS=$LIBS
+ boost_filesystem_save_LDFLAGS=$LDFLAGS
+@@ -574,23 +695,34 @@ LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS"
+ BOOST_FIND_LIB([filesystem], [$1],
+ [boost/filesystem/path.hpp], [boost::filesystem::path p;])
+ if test $enable_static_boost = yes && test $boost_major_version -ge 135; then
+- AC_SUBST([BOOST_FILESYSTEM_LIBS], ["$BOOST_FILESYSTEM_LIBS $BOOST_SYSTEM_LIBS"])
++ BOOST_FILESYSTEM_LIBS="$BOOST_FILESYSTEM_LIBS $BOOST_SYSTEM_LIBS"
+ fi
+ LIBS=$boost_filesystem_save_LIBS
+ LDFLAGS=$boost_filesystem_save_LDFLAGS
+ ])# BOOST_FILESYSTEM
+
+
++# BOOST_FLYWEIGHT()
++# -----------------
++# Look for Boost.Flyweight.
++BOOST_DEFUN([Flyweight],
++[dnl There's a hidden dependency on pthreads.
++AC_REQUIRE([_BOOST_PTHREAD_FLAG])dnl
++BOOST_FIND_HEADER([boost/flyweight.hpp])
++AC_SUBST([BOOST_FLYWEIGHT_LIBS], [$boost_cv_pthread_flag])
++])
++
++
+ # BOOST_FOREACH()
+ # ---------------
+-# Look for Boost.Foreach
++# Look for Boost.Foreach.
+ BOOST_DEFUN([Foreach],
+ [BOOST_FIND_HEADER([boost/foreach.hpp])])
+
+
+ # BOOST_FORMAT()
+ # --------------
+-# Look for Boost.Format
++# Look for Boost.Format.
+ # Note: we can't check for boost/format/format_fwd.hpp because the header isn't
+ # standalone. It can't be compiled because it triggers the following error:
+ # boost/format/detail/config_macros.hpp:88: error: 'locale' in namespace 'std'
+@@ -649,9 +781,18 @@ BOOST_DEFUN([Lambda],
+ [BOOST_FIND_HEADER([boost/lambda/lambda.hpp])])
+
+
++# BOOST_LOCALE()
++# --------------
++# Look for Boost.Locale
++BOOST_DEFUN([Locale],
++[BOOST_FIND_LIB([locale], [$1],
++ [boost/locale.hpp],
++ [[boost::locale::generator gen; std::locale::global(gen(""));]])
++])# BOOST_LOCALE
++
+ # BOOST_LOG([PREFERRED-RT-OPT])
+ # -----------------------------
+-# Look for Boost.Log For the documentation of PREFERRED-RT-OPT, see the
++# Look for Boost.Log. For the documentation of PREFERRED-RT-OPT, see the
+ # documentation of BOOST_FIND_LIB above.
+ BOOST_DEFUN([Log],
+ [BOOST_FIND_LIB([log], [$1],
+@@ -662,12 +803,12 @@ BOOST_DEFUN([Log],
+
+ # BOOST_LOG_SETUP([PREFERRED-RT-OPT])
+ # -----------------------------------
+-# Look for Boost.Log For the documentation of PREFERRED-RT-OPT, see the
++# Look for Boost.Log. For the documentation of PREFERRED-RT-OPT, see the
+ # documentation of BOOST_FIND_LIB above.
+ BOOST_DEFUN([Log_Setup],
+ [AC_REQUIRE([BOOST_LOG])dnl
+ BOOST_FIND_LIB([log_setup], [$1],
+- [boost/log/utility/init/from_settings.hpp],
++ [boost/log/utility/setup/from_settings.hpp],
+ [boost::log::basic_settings<char> bs; bs.empty();])
+ ])# BOOST_LOG_SETUP
+
+@@ -684,6 +825,29 @@ BOOST_DEFUN([Math],
+ [BOOST_FIND_HEADER([boost/math/special_functions.hpp])])
+
+
++# BOOST_MPI([PREFERRED-RT-OPT])
++# -------------------------------
++# Look for Boost MPI. For the documentation of PREFERRED-RT-OPT, see the
++# documentation of BOOST_FIND_LIB above. Uses MPICXX variable if it is
++# set, otherwise tries CXX
++#
++BOOST_DEFUN([MPI],
++[boost_save_CXX=${CXX}
++boost_save_CXXCPP=${CXXCPP}
++if test x"${MPICXX}" != x; then
++ CXX=${MPICXX}
++ CXXCPP="${MPICXX} -E"
++fi
++BOOST_FIND_LIB([mpi], [$1],
++ [boost/mpi.hpp],
++ [int argc = 0;
++ char **argv = 0;
++ boost::mpi::environment env(argc,argv);])
++CXX=${boost_save_CXX}
++CXXCPP=${boost_save_CXXCPP}
++])# BOOST_MPI
++
++
+ # BOOST_MULTIARRAY()
+ # ------------------
+ # Look for Boost.MultiArray
+@@ -691,6 +855,14 @@ BOOST_DEFUN([MultiArray],
+ [BOOST_FIND_HEADER([boost/multi_array.hpp])])
+
+
++# BOOST_NUMERIC_UBLAS()
++# --------------------------
++# Look for Boost.NumericUblas (Basic Linear Algebra)
++BOOST_DEFUN([Numeric_Ublas],
++[BOOST_FIND_HEADER([boost/numeric/ublas/vector.hpp])
++])# BOOST_NUMERIC_UBLAS
++
++
+ # BOOST_NUMERIC_CONVERSION()
+ # --------------------------
+ # Look for Boost.NumericConversion (policy-based numeric conversion)
+@@ -713,6 +885,12 @@ BOOST_DEFUN([Preprocessor],
+ [BOOST_FIND_HEADER([boost/preprocessor/repeat.hpp])])
+
+
++# BOOST_RANGE()
++# --------------------
++# Look for Boost.Range
++BOOST_DEFUN([Range],
++[BOOST_FIND_HEADER([boost/range/adaptors.hpp])])
++
+ # BOOST_UNORDERED()
+ # -----------------
+ # Look for Boost.Unordered
+@@ -759,9 +937,9 @@ BOOST_DEFUN([Python],
+ _BOOST_PYTHON_CONFIG([LDFLAGS], [ldflags])
+ _BOOST_PYTHON_CONFIG([LIBS], [libs])
+ m4_pattern_allow([^BOOST_PYTHON_MODULE$])dnl
+-BOOST_FIND_LIB([python], [$1],
+- [boost/python.hpp],
+- [], [BOOST_PYTHON_MODULE(empty) {}])
++BOOST_FIND_LIBS([python], [python python3], [$1],
++ [boost/python.hpp],
++ [], [BOOST_PYTHON_MODULE(empty) {}])
+ CPPFLAGS=$boost_python_save_CPPFLAGS
+ LDFLAGS=$boost_python_save_LDFLAGS
+ LIBS=$boost_python_save_LIBS
+@@ -867,19 +1045,18 @@ BOOST_FIND_LIB([unit_test_framework], [$1],
+ ])# BOOST_TEST
+
+
+-# BOOST_THREADS([PREFERRED-RT-OPT])
++# BOOST_THREAD([PREFERRED-RT-OPT])
+ # ---------------------------------
+ # Look for Boost.Thread. For the documentation of PREFERRED-RT-OPT, see the
+ # documentation of BOOST_FIND_LIB above.
+-# FIXME: Provide an alias "BOOST_THREAD".
+-BOOST_DEFUN([Threads],
++BOOST_DEFUN([Thread],
+ [dnl Having the pthread flag is required at least on GCC3 where
+ dnl boost/thread.hpp would complain if we try to compile without
+ dnl -pthread on GNU/Linux.
+ AC_REQUIRE([_BOOST_PTHREAD_FLAG])dnl
+-boost_threads_save_LIBS=$LIBS
+-boost_threads_save_LDFLAGS=$LDFLAGS
+-boost_threads_save_CPPFLAGS=$CPPFLAGS
++boost_thread_save_LIBS=$LIBS
++boost_thread_save_LDFLAGS=$LDFLAGS
++boost_thread_save_CPPFLAGS=$CPPFLAGS
+ # Link-time dependency from thread to system was added as of 1.49.0.
+ if test $boost_major_version -ge 149; then
+ BOOST_SYSTEM([$1])
+@@ -887,36 +1064,26 @@ fi # end of the Boost.System check.
+ m4_pattern_allow([^BOOST_SYSTEM_(LIBS|LDFLAGS)$])dnl
+ LIBS="$LIBS $BOOST_SYSTEM_LIBS $boost_cv_pthread_flag"
+ LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS"
+-# Yes, we *need* to put the -pthread thing in CPPFLAGS because with GCC3,
+-# boost/thread.hpp will trigger a #error if -pthread isn't used:
+-# boost/config/requires_threads.hpp:47:5: #error "Compiler threading support
+-# is not turned on. Please set the correct command line options for
+-# threading: -pthread (Linux), -pthreads (Solaris) or -mthreads (Mingw32)"
+ CPPFLAGS="$CPPFLAGS $boost_cv_pthread_flag"
+
+ # When compiling for the Windows platform, the threads library is named
+ # differently.
+ case $host_os in
+- (*mingw*)
+- BOOST_FIND_LIB([thread_win32], [$1],
+- [boost/thread.hpp], [boost::thread t; boost::mutex m;])
+- BOOST_THREAD_LDFLAGS=$BOOST_THREAD_WIN32_LDFLAGS
+- BOOST_THREAD_LDPATH=$BOOST_THREAD_WIN32_LDPATH
+- BOOST_THREAD_LIBS=$BOOST_THREAD_WIN32_LIBS
+- ;;
+- (*)
+- BOOST_FIND_LIB([thread], [$1],
+- [boost/thread.hpp], [boost::thread t; boost::mutex m;])
+- ;;
++ (*mingw*) boost_thread_lib_ext=_win32;;
+ esac
++BOOST_FIND_LIBS([thread], [thread$boost_thread_lib_ext],
++ [$1],
++ [boost/thread.hpp], [boost::thread t; boost::mutex m;])
+
+ BOOST_THREAD_LIBS="$BOOST_THREAD_LIBS $BOOST_SYSTEM_LIBS $boost_cv_pthread_flag"
+ BOOST_THREAD_LDFLAGS="$BOOST_SYSTEM_LDFLAGS"
+ BOOST_CPPFLAGS="$BOOST_CPPFLAGS $boost_cv_pthread_flag"
+-LIBS=$boost_threads_save_LIBS
+-LDFLAGS=$boost_threads_save_LDFLAGS
+-CPPFLAGS=$boost_threads_save_CPPFLAGS
+-])# BOOST_THREADS
++LIBS=$boost_thread_save_LIBS
++LDFLAGS=$boost_thread_save_LDFLAGS
++CPPFLAGS=$boost_thread_save_CPPFLAGS
++])# BOOST_THREAD
++
++AU_ALIAS([BOOST_THREADS], [BOOST_THREAD])
+
+
+ # BOOST_TOKENIZER()
+@@ -964,7 +1131,8 @@ BOOST_DEFUN([Variant],
+ [BOOST_FIND_HEADER([boost/variant/variant_fwd.hpp])
+ BOOST_FIND_HEADER([boost/variant.hpp])])
+
+-# BOOST_POINTERCONTAINER()
++
++# BOOST_POINTER_CONTAINER()
+ # ------------------------
+ # Look for Boost.PointerContainer
+ BOOST_DEFUN([Pointer_Container],
+@@ -974,12 +1142,13 @@ BOOST_FIND_HEADER([boost/ptr_container/ptr_vector.hpp])
+ BOOST_FIND_HEADER([boost/ptr_container/ptr_array.hpp])
+ BOOST_FIND_HEADER([boost/ptr_container/ptr_set.hpp])
+ BOOST_FIND_HEADER([boost/ptr_container/ptr_map.hpp])
+-])# BOOST_POINTERCONTAINER
++])# BOOST_POINTER_CONTAINER
++
+
+ # BOOST_WAVE([PREFERRED-RT-OPT])
+ # ------------------------------
+ # NOTE: If you intend to use Wave/Spirit with thread support, make sure you
+-# call BOOST_THREADS first.
++# call BOOST_THREAD first.
+ # Look for Boost.Wave. For the documentation of PREFERRED-RT-OPT, see the
+ # documentation of BOOST_FIND_LIB above.
+ BOOST_DEFUN([Wave],
+@@ -1014,8 +1183,16 @@ BOOST_DEFUN([Xpressive],
+
+ # _BOOST_PTHREAD_FLAG()
+ # ---------------------
+-# Internal helper for BOOST_THREADS. Based on ACX_PTHREAD:
+-# http://autoconf-archive.cryp.to/acx_pthread.html
++# Internal helper for BOOST_THREAD. Computes boost_cv_pthread_flag
++# which must be used in CPPFLAGS and LIBS.
++#
++# Yes, we *need* to put the -pthread thing in CPPFLAGS because with GCC3,
++# boost/thread.hpp will trigger a #error if -pthread isn't used:
++# boost/config/requires_threads.hpp:47:5: #error "Compiler threading support
++# is not turned on. Please set the correct command line options for
++# threading: -pthread (Linux), -pthreads (Solaris) or -mthreads (Mingw32)"
++#
++# Based on ACX_PTHREAD: http://autoconf-archive.cryp.to/acx_pthread.html
+ AC_DEFUN([_BOOST_PTHREAD_FLAG],
+ [AC_REQUIRE([AC_PROG_CXX])dnl
+ AC_REQUIRE([AC_CANONICAL_HOST])dnl
+@@ -1083,6 +1260,14 @@ AC_LANG_POP([C++])dnl
+ m4_define([_BOOST_gcc_test],
+ ["defined __GNUC__ && __GNUC__ == $1 && __GNUC_MINOR__ == $2 && !defined __ICC @ gcc$1$2"])dnl
+
++# _BOOST_mingw_test(MAJOR, MINOR)
++# -----------------------------
++# Internal helper for _BOOST_FIND_COMPILER_TAG.
++m4_define([_BOOST_mingw_test],
++["defined __GNUC__ && __GNUC__ == $1 && __GNUC_MINOR__ == $2 && !defined __ICC && \
++ (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \
++ || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw$1$2"])dnl
++
+
+ # _BOOST_FIND_COMPILER_TAG()
+ # --------------------------
+@@ -1092,7 +1277,8 @@ m4_define([_BOOST_gcc_test],
+ AC_DEFUN([_BOOST_FIND_COMPILER_TAG],
+ [AC_REQUIRE([AC_PROG_CXX])dnl
+ AC_REQUIRE([AC_CANONICAL_HOST])dnl
+-AC_CACHE_CHECK([for the toolset name used by Boost for $CXX], [boost_cv_lib_tag],
++AC_CACHE_CHECK([for the toolset name used by Boost for $CXX],
++ [boost_cv_lib_tag],
+ [boost_cv_lib_tag=unknown
+ if test x$boost_cv_inc_path != xno; then
+ AC_LANG_PUSH([C++])dnl
+@@ -1110,14 +1296,29 @@ if test x$boost_cv_inc_path != xno; then
+ # I'm not sure about my test for `il' (be careful: Intel's ICC pre-defines
+ # the same defines as GCC's).
+ for i in \
++ _BOOST_mingw_test(5, 0) \
++ _BOOST_gcc_test(5, 0) \
++ _BOOST_mingw_test(4, 10) \
++ _BOOST_gcc_test(4, 10) \
++ _BOOST_mingw_test(4, 9) \
++ _BOOST_gcc_test(4, 9) \
++ _BOOST_mingw_test(4, 8) \
+ _BOOST_gcc_test(4, 8) \
++ _BOOST_mingw_test(4, 7) \
+ _BOOST_gcc_test(4, 7) \
++ _BOOST_mingw_test(4, 6) \
+ _BOOST_gcc_test(4, 6) \
++ _BOOST_mingw_test(4, 5) \
+ _BOOST_gcc_test(4, 5) \
++ _BOOST_mingw_test(4, 4) \
+ _BOOST_gcc_test(4, 4) \
++ _BOOST_mingw_test(4, 3) \
+ _BOOST_gcc_test(4, 3) \
++ _BOOST_mingw_test(4, 2) \
+ _BOOST_gcc_test(4, 2) \
++ _BOOST_mingw_test(4, 1) \
+ _BOOST_gcc_test(4, 1) \
++ _BOOST_mingw_test(4, 0) \
+ _BOOST_gcc_test(4, 0) \
+ "defined __GNUC__ && __GNUC__ == 3 && !defined __ICC \
+ && (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \
+@@ -1183,6 +1384,7 @@ fi])dnl end of AC_CACHE_CHECK
+ # Thread) flavors of Boost. Sets boost_guess_use_mt accordingly.
+ AC_DEFUN([_BOOST_GUESS_WHETHER_TO_USE_MT],
+ [# Check whether we do better use `mt' even though we weren't ask to.
++AC_LANG_PUSH([C++])dnl
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #if defined _REENTRANT || defined _MT || defined __MT__
+ /* use -mt */
+@@ -1190,6 +1392,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ # error MT not needed
+ #endif
+ ]])], [boost_guess_use_mt=:], [boost_guess_use_mt=false])
++AC_LANG_POP([C++])dnl
+ ])
+
+ # _BOOST_AC_LINK_IFELSE(PROGRAM, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
+@@ -1213,11 +1416,11 @@ boost_use_source=:
+ test -f conftest.$ac_objext && ac_ext=$ac_objext && boost_use_source=false &&
+ _AS_ECHO_LOG([re-using the existing conftest.$ac_objext])
+ AS_IF([_AC_DO_STDERR($ac_link) && {
+- test -z "$ac_[]_AC_LANG_ABBREV[]_werror_flag" ||
+- test ! -s conftest.err
++ test -z "$ac_[]_AC_LANG_ABBREV[]_werror_flag" ||
++ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_executable_p conftest$ac_exeext
++ test "$cross_compiling" = yes ||
++ $as_executable_p conftest$ac_exeext
+ dnl FIXME: use AS_TEST_X instead when 2.61 is widespread enough.
+ }],
+ [$2],
diff --git a/debian/patches/0020-remove-obsolete-includes.patch b/debian/patches/0020-remove-obsolete-includes.patch
new file mode 100644
index 0000000..1d88cde
--- /dev/null
+++ b/debian/patches/0020-remove-obsolete-includes.patch
@@ -0,0 +1,88 @@
+Description: Remove obsolete object.h and object_slot.h includes
+ Cherry-picked from upstream (not needed after 0.8.0)
+Origin: https://github.com/worldforge/ember/commit/b052263a89ca552d3c5962c8217f70f5feffb558
+Last-Update: 2016-07-17
+
+--- a/src/components/ogre/terrain/TerrainManager.cpp
++++ b/src/components/ogre/terrain/TerrainManager.cpp
+@@ -45,9 +45,6 @@
+ #include "../Scene.h"
+ #include "../Convert.h"
+
+-#include <sigc++/object_slot.h>
+-
+-
+ #include <OgreRoot.h>
+ #include <OgreGpuProgramManager.h>
+
+diff --git a/src/services/logging/LoggingService.cpp b/src/services/logging/LoggingService.cpp
+index 21b2ba2..bc14ca0 100644
+--- a/src/services/logging/LoggingService.cpp
++++ b/src/services/logging/LoggingService.cpp
+@@ -31,8 +31,6 @@
+ #include <cstdio>
+ #include <sstream>
+
+-#include <sigc++/object_slot.h>
+-
+ namespace Ember {
+
+
+diff --git a/src/services/server/ServerService.h b/src/services/server/ServerService.h
+index 6d636bd..e2000a0 100644
+--- a/src/services/server/ServerService.h
++++ b/src/services/server/ServerService.h
+@@ -29,7 +29,6 @@
+
+ #include <Atlas/Message/Element.h>
+
+-#include <sigc++/object_slot.h>
+ #include <memory>
+
+
+--- a/src/services/metaserver/MetaserverService.h
++++ b/src/services/metaserver/MetaserverService.h
+@@ -24,7 +24,6 @@
+ #include <framework/Service.h>
+ #include <framework/ConsoleObject.h>
+
+-#include <sigc++/object.h>
+ #include <Eris/Metaserver.h>
+ #include <Eris/ServerInfo.h>
+
+diff --git a/src/services/server/OOGChat.h b/src/services/server/OOGChat.h
+index 8622825..0b2b19b 100644
+--- a/src/services/server/OOGChat.h
++++ b/src/services/server/OOGChat.h
+@@ -26,7 +26,6 @@
+ #include <Eris/Lobby.h>
+ #include <Eris/Room.h>
+ #include <Eris/Account.h>
+-#include <sigc++/object.h>
+ #include <sigc++/bind.h>
+
+ // Included system headers
+diff --git a/src/services/wfut/WfutService.h b/src/services/wfut/WfutService.h
+index 0b2699c..d834ae6 100644
+--- a/src/services/wfut/WfutService.h
++++ b/src/services/wfut/WfutService.h
+@@ -25,7 +25,6 @@
+ #define EMBERWFUTSERVICE_H
+
+ #include "framework/Service.h"
+-#include <sigc++/object.h>
+ #include <sigc++/signal.h>
+
+ #include <memory>
+diff --git a/src/services/wfut/WfutSession.h b/src/services/wfut/WfutSession.h
+index 2595633..3978672 100644
+--- a/src/services/wfut/WfutSession.h
++++ b/src/services/wfut/WfutSession.h
+@@ -24,7 +24,6 @@
+ #define EMBEROGREWFUTSESSION_H
+
+ #include <libwfut/WFUT.h>
+-#include <sigc++/object.h>
+
+ namespace Ember {
+
\ No newline at end of file
diff --git a/debian/patches/0021-GraphicalChangeAdapter-fix-for-newer-compilers.patch b/debian/patches/0021-GraphicalChangeAdapter-fix-for-newer-compilers.patch
new file mode 100644
index 0000000..d3ac9ed
--- /dev/null
+++ b/debian/patches/0021-GraphicalChangeAdapter-fix-for-newer-compilers.patch
@@ -0,0 +1,25 @@
+Description: Fixed issue with newer compiler versions
+ These compilers need to know about the GraphicalChangeAdapter.
+ Patch cherry-picked from upstream (not needed after 0.8.0).
+Origin: https://github.com/worldforge/ember/commit/128cb3a8e35d395461fb03165e2fb6425bdabd31
+Last-Update: 2016-07-24
+
+--- a/src/components/ogre/World.h
++++ b/src/components/ogre/World.h
+@@ -19,6 +19,8 @@
+ #ifndef EMBEROGRE_WORLD_H_
+ #define EMBEROGRE_WORLD_H_
+
++#include "GraphicalChangeAdapter.h"
++
+ #include "OgreIncludes.h"
+ #include <sigc++/signal.h>
+ #include <sigc++/trackable.h>
+@@ -99,7 +101,6 @@
+ class TerrainEntityManager;
+ class DelayedFoliageInitializer;
+ class ShaderManager;
+-class GraphicalChangeAdapter;
+ class AvatarCameraWarper;
+
+ /**
diff --git a/debian/patches/0022-fix-typos.patch b/debian/patches/0022-fix-typos.patch
new file mode 100644
index 0000000..e6265fa
--- /dev/null
+++ b/debian/patches/0022-fix-typos.patch
@@ -0,0 +1,142 @@
+Description: Fix typos
+ Identified by lintian
+Author: Olek Wojnar <olek-dev at wojnar.org>
+Forwarded: https://github.com/worldforge/ember/pull/21
+Last-Update: 2016-07-25
+
+--- a/src/components/ogre/terrain/TerrainArea.h
++++ b/src/components/ogre/terrain/TerrainArea.h
+@@ -145,7 +145,7 @@
+
+ /**
+ * @brief Parses the Atlas data looking for area definitions.
+- * If no Mercator::Area instance has been created, one will be created here. If however there's alreay an existing area it will be updated.
++ * If no Mercator::Area instance has been created, one will be created here. If however there's already an existing area it will be updated.
+ * @return
+ */
+ bool parseArea();
+--- a/src/components/ogre/widgets/icons/IconImageStore.h
++++ b/src/components/ogre/widgets/icons/IconImageStore.h
+@@ -94,7 +94,7 @@
+ */
+ IconImageStore(const std::string& imagesetName);
+ /**
+- * Ctor. Creates a new imageset from an alreay existing texture. The whole texture will be used for a single icon.
++ * Ctor. Creates a new imageset from an already existing texture. The whole texture will be used for a single icon.
+ * Use this when you already have an icon.
+ * @param imagesetName The name of the imageset to create.
+ * @param texPtr The texture to use.
+--- a/src/services/scripting/ScriptingService.cpp
++++ b/src/services/scripting/ScriptingService.cpp
+@@ -141,7 +141,7 @@
+ void ScriptingService::registerScriptingProvider(IScriptingProvider* provider)
+ {
+ if (mProviders.find(provider->getName()) != mProviders.end()) {
+- S_LOG_FAILURE("Could not add alreay existing scripting provider with name " + provider->getName());
++ S_LOG_FAILURE("Could not add already existing scripting provider with name " + provider->getName());
+ } else {
+ mProviders[provider->getName()] = provider;
+ provider->_registerWithService(this);
+--- a/src/components/ogre/environment/pagedgeometry/include/GrassLoader.h
++++ b/src/components/ogre/environment/pagedgeometry/include/GrassLoader.h
+@@ -459,12 +459,12 @@
+
+
+ /** \brief A data structure giving you full control over grass properties.
+-
+-Grass is added to the scene through GrassLoader::addLayer(). Through this class you
+-can configure your grass layer any way you like - size, density, render technique,
+-animation, etc. Simply call the appropriate "set" member function to set the desired property.
+-
+-Remember that you cannot create or delete layers directly. Layers can only be created
++
++Grass is added to the scene through GrassLoader::addLayer(). Through this class you
++can configure your grass layer any way you like - size, density, render technique,
++animation, etc. Simply call the appropriate "set" member function to set the desired property.
++
++Remember that you cannot create or delete layers directly. Layers can only be created
+ with GrassLoader::addLayer(), and may not be deleted manually (they will be deleted when
+ the associated GrassLoader is deleted).
+ */
+@@ -474,21 +474,21 @@
+
+ /** \brief Sets the maximum density (measured in grass quads/billboards per square unit) of grass */
+ void setDensity(float density) { this->density = density; }
+-
+- /** \brief Sets a minimum / maximum height where grass may appear
+- \param minHeight Sets the minimum height grass may have. 0 = no minimum
+- \param maxHeight Sets the maximum height grass may have. 0 = no maximum
+-
+- By default grass appears at all altitudes. You can use this function to restrict grass to a
+- certain height range. For example, if sea level is at 100 units Y, you might restrict this
+- layer to display only above 100 units (so your grass doesn't grow under water).
+-
+- It's possible to use density maps (see setDensityMap()) to achieve similar results, but if
+- your density map is extremely low resolution, this function may be the only practical option
+- to prevent grass from growing under water (when used in combination with your density map).
+-
+- Setting minHeight to 0 means grass has no minimum height - it can grow as low as necessary.
+- Similarly, setting maxHeight to 0 means grass has no maximum height - it can grow as high
++
++ /** \brief Sets a minimum / maximum height where grass may appear
++ \param minHeight Sets the minimum height grass may have. 0 = no minimum
++ \param maxHeight Sets the maximum height grass may have. 0 = no maximum
++
++ By default grass appears at all altitudes. You can use this function to restrict grass to a
++ certain height range. For example, if sea level is at 100 units Y, you might restrict this
++ layer to display only above 100 units (so your grass doesn't grow under water).
++
++ It's possible to use density maps (see setDensityMap()) to achieve similar results, but if
++ your density map is extremely low resolution, this function may be the only practical option
++ to prevent grass from growing under water (when used in combination with your density map).
++
++ Setting minHeight to 0 means grass has no minimum height - it can grow as low as necessary.
++ Similarly, setting maxHeight to 0 means grass has no maximum height - it can grow as high
+ as necessary. */
+ void setHeightRange(float minHeight, float maxHeight = 0) { minY = minHeight; maxY = maxHeight; }
+
+@@ -876,12 +876,12 @@
+ unsigned int maxUInt16 = std::numeric_limits<uint16>::max();
+ if(grassCount > maxUInt16)
+ {
+- LogManager::getSingleton().logMessage("grass count overflow: you tried to use more than " + StringConverter::toString(maxUInt16) + " (thats the maximum) grass meshes for one page");
++ LogManager::getSingleton().logMessage("grass count overflow: you tried to use more than " + StringConverter::toString(maxUInt16) + " (that's the maximum) grass meshes for one page");
+ return 0;
+ }
+ if(quadCount > maxUInt16)
+ {
+- LogManager::getSingleton().logMessage("quad count overflow: you tried to use more than " + StringConverter::toString(maxUInt16) + " (thats the maximum) grass meshes for one page");
++ LogManager::getSingleton().logMessage("quad count overflow: you tried to use more than " + StringConverter::toString(maxUInt16) + " (that's the maximum) grass meshes for one page");
+ return 0;
+ }
+
+@@ -1070,12 +1070,12 @@
+ unsigned int maxUInt16 = std::numeric_limits<uint16>::max();
+ if(grassCount > maxUInt16)
+ {
+- LogManager::getSingleton().logMessage("grass count overflow: you tried to use more than " + StringConverter::toString(maxUInt16) + " (thats the maximum) grass meshes for one page");
++ LogManager::getSingleton().logMessage("grass count overflow: you tried to use more than " + StringConverter::toString(maxUInt16) + " (that's the maximum) grass meshes for one page");
+ return 0;
+ }
+ if(quadCount > maxUInt16)
+ {
+- LogManager::getSingleton().logMessage("quad count overflow: you tried to use more than " + StringConverter::toString(maxUInt16) + " (thats the maximum) grass meshes for one page");
++ LogManager::getSingleton().logMessage("quad count overflow: you tried to use more than " + StringConverter::toString(maxUInt16) + " (that's the maximum) grass meshes for one page");
+ return 0;
+ }
+
+@@ -1327,12 +1327,12 @@
+ unsigned int maxUInt16 = std::numeric_limits<uint16>::max();
+ if(grassCount > maxUInt16)
+ {
+- LogManager::getSingleton().logMessage("grass count overflow: you tried to use more than " + StringConverter::toString(maxUInt16) + " (thats the maximum) grass meshes for one page");
++ LogManager::getSingleton().logMessage("grass count overflow: you tried to use more than " + StringConverter::toString(maxUInt16) + " (that's the maximum) grass meshes for one page");
+ return 0;
+ }
+ if(quadCount > maxUInt16)
+ {
+- LogManager::getSingleton().logMessage("quad count overflow: you tried to use more than " + StringConverter::toString(maxUInt16) + " (thats the maximum) grass meshes for one page");
++ LogManager::getSingleton().logMessage("quad count overflow: you tried to use more than " + StringConverter::toString(maxUInt16) + " (that's the maximum) grass meshes for one page");
+ return 0;
+ }
+
diff --git a/debian/patches/0023-add-keywords-to-desktop-file.patch b/debian/patches/0023-add-keywords-to-desktop-file.patch
new file mode 100644
index 0000000..4e4e211
--- /dev/null
+++ b/debian/patches/0023-add-keywords-to-desktop-file.patch
@@ -0,0 +1,13 @@
+Description: Add Keywords field to .desktop file
+ See: https://wiki.gnome.org/Initiatives/GnomeGoals/DesktopFileKeywords
+Author: Olek Wojnar <olek-dev at wojnar.org>
+Forwarded: https://github.com/worldforge/ember/pull/21
+Last-Update: 2016-07-24
+
+--- a/ember.desktop
++++ b/ember.desktop
+@@ -8,3 +8,4 @@
+ Exec=ember
+ Terminal=false
+ Categories=Game;RolePlaying;
++Keywords=Game;Role Playing;Role-Playing;3D;3-D;Massively;Multiplayer;Online;MMO;MMORPG;Fantasy;
diff --git a/debian/patches/0024-fix-icon-location.patch b/debian/patches/0024-fix-icon-location.patch
new file mode 100644
index 0000000..8615544
--- /dev/null
+++ b/debian/patches/0024-fix-icon-location.patch
@@ -0,0 +1,17 @@
+Description: Make icon location Icon Theme Specification-compliant
+ See: https://specifications.freedesktop.org/icon-theme-spec/latest/ar01s03.html
+Author: Olek Wojnar <olek-dev at wojnar.org>
+Forwarded: https://github.com/worldforge/ember/pull/21
+Last-Update: 2016-08-05
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -12,7 +12,7 @@
+ appdir = $(datadir)/applications
+ dist_app_DATA = ember.desktop
+
+-icondir = $(datadir)/icons/worldforge
++icondir = $(datadir)/icons/hicolor/64x64/apps
+ dist_icon_DATA = media/ember.png
+
+ docdir = $(datadir)/doc/ember-$(VERSION)
diff --git a/debian/patches/0025-fix-duplicate-script-install.patch b/debian/patches/0025-fix-duplicate-script-install.patch
new file mode 100644
index 0000000..dd3959b
--- /dev/null
+++ b/debian/patches/0025-fix-duplicate-script-install.patch
@@ -0,0 +1,25 @@
+Description: Fix duplicate script install
+ Since there is a make rule for the ember script, and the script is not
+ distributed in it's installable form, bin_SCRIPTS should be used and
+ dist_bin_SCRIPTS is not appropriate.
+ Reference: https://www.gnu.org/software/automake/manual/html_node/Scripts.html
+ This was causing some parallel build failures.
+Author: Olek Wojnar <olek-dev at wojnar.org>
+Forwarded: https://github.com/worldforge/ember/pull/21
+Last-Update: 2016-08-06
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -3,12 +3,10 @@
+
+ ACLOCAL_AMFLAGS = -I m4
+ bin_SCRIPTS = ember
+-dist_bin_SCRIPTS = ember
+
+ confdir = $(sysconfdir)/ember
+ dist_conf_DATA = ember.conf
+
+-
+ appdir = $(datadir)/applications
+ dist_app_DATA = ember.desktop
+
diff --git a/debian/patches/series b/debian/patches/series
index 04b7453..43c27c3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,10 @@
-0004-domain-bindings-lua-makefile.patch
-0014-add-missing-ogrelodstrategy.patch
0015-verbose-configure-errors.patch
-0016-boost-1.53.patch
0017-replace-mersenne-twister.patch
+0018-enable-subdir-objects.patch
+0019-update-boost-m4.patch
+0020-remove-obsolete-includes.patch
+0021-GraphicalChangeAdapter-fix-for-newer-compilers.patch
+0022-fix-typos.patch
+0023-add-keywords-to-desktop-file.patch
+0024-fix-icon-location.patch
+0025-fix-duplicate-script-install.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ember.git
More information about the Pkg-games-commits
mailing list