[ember] 07/08: Update packaging
Olek Wojnar
olek-guest at moszumanska.debian.org
Sun Aug 7 00:55:46 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 32011d9f1ddb517351283c7779309d890524d556
Author: Olek Wojnar <olek-dev at wojnar.org>
Date: Sun Jul 17 00:36:26 2016 -0400
Update packaging
---
debian/changelog | 12 +++
debian/copyright | 231 ++++++++++++++++++++++++++--------------
debian/ember.lintian-overrides | 8 ++
debian/rules | 11 +-
debian/source/lintian-overrides | 2 +
debian/watch | 4 +-
6 files changed, 181 insertions(+), 87 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6522077..3e9d421 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,6 +39,18 @@ ember (0.7.2+dfsg-1) unstable; urgency=medium
* Import patch from the wfmath package to replace MersenneTwister.h
-- Avoids problems from ambiguous copyright of the original file
* Update dependencies for version 0.7.2
+ * Enable all hardening options
+ * Add three lintian overrides
+ -- Ignore install into usr/bin (binary)
+ -- Ignore .rc files needed for WIN32 build (source)
+ -- Ignore false positive of spelling error (binary)
+ * d/copyright: Update contributors and dates
+ * d/rules
+ -- Do not remove "sounddefinitions" directory
+ -- Enable parallel build
+ -- 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
diff --git a/debian/copyright b/debian/copyright
index d90e9d5..fa95c55 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,20 +2,21 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
Source: https://github.com/worldforge/ember
Files: *
-Copyright: (C) 2001-2011 Adam Gregory <Adammgregory at yahoo.com>
- Alexey Torkhov <atorkhov at gmail.com>
- Alistair Davidson <lord_inh at yahoo.co.uk>
- Erik Ogenvik <erik at ogenvik.org>
- Hans Häggström <zzorn at iki.fi>
- Lakin Wecker <nikal at nucleus.com>
- Lee Begg <llnz at paradise.net.nz>
- Martin Pollard <circlemaster at blueyonder.co.uk>
- Miguel Guzmán <aglanor at telefonica.net>
- Rômulo Fernandes Machado Leitão <abra185 at gmail.com>
- Sean Ryan <sryan at evercrack.com>
- Simon Goodall
- Tamas Bates <rhymer at gmail.com>
- Tim Enderling <T.Enderling at web.de>
+Copyright: 2001-2013 Adam Gregory <Adammgregory at yahoo.com>
+ Alexey Torkhov <atorkhov at gmail.com>
+ Alistair Davidson <lord_inh at yahoo.co.uk>
+ Alistair Riddoch <alriddoch at googlemail.com>
+ Erik Ogenvik (née Hjortsberg) <erik at ogenvik.org>
+ Hans Häggström <zzorn at iki.fi>
+ Lakin Wecker <nikal at nucleus.com>
+ Lee Begg <llnz at paradise.net.nz>
+ Martin Pollard <circlemaster at blueyonder.co.uk>
+ Miguel Guzmán <aglanor at telefonica.net>
+ Rômulo Fernandes Machado Leitão <abra185 at gmail.com>
+ Sean Ryan <sryan at evercrack.com>
+ Simon Goodall
+ Tamas Bates <rhymer at gmail.com>
+ Tim Enderling <T.Enderling at web.de>
License: GPL-2+
Files: debian/*
@@ -30,7 +31,7 @@ License: zlib/png
Files: src/framework/osdir.h
Copyright: 2002 Bart Vanhauwaert
-License:
+License: BV1
Permission to use, copy, modify, distribute and sell this software
for any purpose is hereby granted without fee. This license
includes (but is not limited to) standalone compilation or as part
@@ -64,97 +65,171 @@ License:
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.
-Files: src/framework/float_cast.h
-Copyright: 2001 Erik de Castro Lopo <erikd at mega-nerd.com>
-License:
- Permission to use, copy, modify, distribute, and sell this file for any
- purpose is hereby granted without fee, provided that the above copyright
- and this permission notice appear in all copies. No representations are
- made about the suitability of this software for any purpose. It is
- provided "as is" without express or implied warranty.
-
Files: src/components/ogre/environment/pagedgeometry/*
Copyright: 2006 John Judnich
2008-2010 Erik Hjortsberg
License: zlib/png
-Files: src/components/ogre/environment/pagedgeometry/include/DummyPage.h
+Files: src/components/ogre/EmberOgreFileSystem.cpp
+ src/components/ogre/EmberOgreFileSystem.h
+Copyright: 2000-2006 Torus Knot Software Ltd
+ 2008 Erik Hjortsberg <erik.hjortsberg at gmail.com>
+License: LGPL-2+
+
+Files: src/components/ogre/lod/ScaledPixelCountLodStrategy.cpp
+ src/components/ogre/lod/ScaledPixelCountLodStrategy.h
+Copyright: 2000-2012 Torus Knot Software Ltd
+ 2013 Erik Ogenvik <erik at ogenvik.org>
+License: Expat
+
+Files: src/components/ogre/environment/caelum/*
+Copyright: 2006-2009 Caelum team
+License: LGPL-3+
+
+Files: src/components/cegui/RenderedColourStringTextComponent.cpp
+Copyright: 2011 Erik Ogenvik
+ 2004-2009 Paul D Turner & The CEGUI Development Team
+License: GPL-2+ and expat
+
+Files: src/components/ogre/AutoGraphicsLevelManager.cpp
+ src/components/ogre/AutoGraphicsLevelManager.h
+ src/components/ogre/RenderDistanceManager.cpp
+ src/components/ogre/RenderDistanceManager.h
+ src/components/ogre/ShaderDetailManager.cpp
+ src/components/ogre/ShaderDetailManager.h
+ src/components/ogre/ShadowDetailManager.cpp
+ src/components/ogre/ShadowDetailManager.h
+ src/components/ogre/environment/FoliageDetailManager.cpp
+ src/components/ogre/environment/FoliageDetailManager.h
+ src/components/ogre/lod/LodLevelManager.cpp
+ src/components/ogre/lod/LodLevelManager.h
+Copyright: 2012 Arjun Kumar <arjun1991 at gmail.com>
+License: GPL-2+
+
+Files: src/components/ogre/GraphicalChangeAdapter.h
+Copyright: 2012 Arjun Kumar <arjun1991 at gmail.com>
+ 2012 Erik Ogenvik
+License: GPL-2+
+
+Files: src/components/ogre/sound/SoundAction.cpp
+ src/components/ogre/sound/SoundAction.h
+ src/components/ogre/sound/SoundDefinition.cpp
+ src/components/ogre/sound/SoundDefinition.h
+ src/components/ogre/sound/SoundEntity.cpp
+ src/components/ogre/sound/SoundEntity.h
+ src/components/ogre/sound/SoundGroup.cpp
+ src/components/ogre/sound/SoundGroup.h
+ src/services/sound/SoundGeneral.cpp
+ src/services/sound/SoundGeneral.h
+ src/services/sound/SoundService.cpp
+ src/services/sound/SoundService.h
Copyright: 2008 Erik Hjortsberg <erik.hjortsberg at gmail.com>
+ 2008 Romulo Fernandes Machado (nightz)
License: GPL-2+
-Files: src/components/ogre/environment/pagedgeometry/include/MersenneTwister.h
-Copyright: 1997-2002 Makoto Matsumoto and Takuji Nishimura
- 2000-2009 Richard J. Wagner
-License: BSD-2-clause
+Files: src/components/ogre/sound/XMLSoundDefParser.cpp
+ src/components/ogre/sound/XMLSoundDefParser.h
+ src/services/sound/SoundSample.cpp
+ src/services/sound/SoundSample.h
+ src/components/ogre/sound/SoundDefinitionManager.h
+ src/components/ogre/OgreResourceLoader.h
+Copyright: 2006-2008 Romulo Fernandes Machado (nightz) <abra185 at gmail.com>
+License: GPL-2+
-Files: src/components/ogre/EmberOgreFileSystem.h
-Copyright: 2000-2006 Torus Knot Software Ltd
- 2008 Erik Hjortsberg <erik.hjortsberg at gmail.com>
+Files: src/components/ogre/terrain/OgreTerrain/OgreTerrainAdapter.cpp
+ src/components/ogre/terrain/OgreTerrain/OgreTerrainAdapter.h
+ src/components/ogre/terrain/OgreTerrain/OgreTerrainDefiner.cpp
+ src/components/ogre/terrain/OgreTerrain/OgreTerrainDefiner.h
+ src/components/ogre/terrain/OgreTerrain/OgreTerrainMaterialGeneratorEmber.cpp
+ src/components/ogre/terrain/OgreTerrain/OgreTerrainMaterialGeneratorEmber.h
+ src/components/ogre/terrain/OgreTerrain/OgreTerrainObserver.cpp
+ src/components/ogre/terrain/OgreTerrain/OgreTerrainObserver.h
+ src/components/ogre/terrain/OgreTerrain/OgreTerrainPageBridge.cpp
+ src/components/ogre/terrain/OgreTerrain/OgreTerrainPageBridge.h
+ src/components/ogre/terrain/OgreTerrain/OgreTerrainPageProvider.cpp
+ src/components/ogre/terrain/OgreTerrain/OgreTerrainPageProvider.h
+Copyright: 2013 Samuel Kogler
License: GPL-2+
-Files: src/components/ogre/SceneManagers/EmberPagingSceneManager/*
-Copyright: 2003-2006 Jose A. Milan and Tuan Kuranes
- 2004 Jon Anderson
- 2009 Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
- 2000-2006 The OGRE Team
-License: LGPL-2.1+
+Files: src/components/ogre/lod/LodDefinition.cpp
+ src/components/ogre/lod/LodDefinition.h
+ src/components/ogre/lod/LodDefinitionManager.cpp
+ src/components/ogre/lod/LodDefinitionManager.h
+ src/components/ogre/lod/LodManager.cpp
+ src/components/ogre/lod/LodManager.h
+ src/components/ogre/lod/PMInjectorSignaler.cpp
+ src/components/ogre/lod/PMInjectorSignaler.h
+ src/components/ogre/lod/XMLLodDefinitionSerializer.cpp
+ src/components/ogre/lod/XMLLodDefinitionSerializer.h
+Copyright: 2013 Peter Szucs <peter.szucs.dev at gmail.com>
+License: Expat
-Files: src/components/ogre/SceneManagers/EmberPagingSceneManager/*/EmberPaging*.*
-Copyright: 2005-2011 Erik Hjortsberg <erik.hjortsberg at gmail.com>
+Files: src/components/ogre/environment/meshtree/*
+Copyright: 2002-2003 Ton van den Heuvel
+ 2004 Nicolas Chauvin
+License: BSD-3-clause
+
+Files: src/components/ogre/model/Model.cpp
+ src/components/ogre/model/Model.h
+ src/components/ogre/model/SubModelPart.cpp
+ src/components/ogre/model/SubModelPart.h
+ src/components/ogre/model/XMLModelDefinitionSerializer.cpp
+ src/components/ogre/model/XMLModelDefinitionSerializer.h
+Copyright: 2004-2005 Erik Hjortsberg
+ 2005 The Cataclysmos Team
License: GPL-2+
-Files: src/components/ogre/SceneManagers/EmberPagingSceneManager/src/OgrePagingLandScapeAABSQ.cpp
- src/components/ogre/SceneManagers/EmberPagingSceneManager/src/OgrePagingLandScapeMeshDecal.cpp
-Copyright: 2000-2006 The OGRE Team
- 2006 Steven Klug
-License: LGPL-2.1+
+Files: src/components/ogre/model/ModelDefinition.cpp
+ src/components/ogre/model/ModelDefinition.h
+ src/components/ogre/model/ModelDefinitionManager.cpp
+ src/components/ogre/model/ModelDefinitionManager.h
+Copyright: 2004-2005 The Cataclysmos Team
+License: GPL-2+
-Files: src/components/ogre/SceneManagers/EmberPagingSceneManager/*/DRGNURBSSurface.*
-Copyright: 1999 Intel Corporation
-License:
- Permission is granted to use, copy, distribute and prepare derivative works of
- this software for any purpose and without fee, provided, that the above
- copyright notice and this statement appear in all copies. Intel makes no
- representations about the suitability of this software for any purpose. This
- software is provided "AS IS."
- .
- Intel specifically disclaims all warranties, express or implied, and all
- liability, including consequential and other indirect damages, for the use of
- this software, including liability for infringement of any proprietary rights,
- and including the warranties of merchantability and fitness for a particular
- purpose. Intel does not assume any responsibility for any errors which may
- appear in this software nor any responsibility to update it.
+Files: src/components/ogre/OgreWindowProvider.cpp
+ src/components/ogre/OgreWindowProvider.h
+ src/components/ogre/widgets/MeshInfoProvider.cpp
+ src/components/ogre/widgets/MeshInfoProvider.h
+ src/services/input/IWindowProvider.h
+ src/extensions/webember/WebEmberDLL.cpp
+ src/extensions/webember/WebEmberManager.cpp
+Copyright: 2011-2012 Peter Szucs <peter.szucs.dev at gmail.com>
+License: GPL-2+
-Files: src/components/ogre/environment/caelum/*
-Copyright: 2006-2008 Caelum team
-License: LGPL-3+
+Files: src/components/ogre/Avatar.h
+Copyright: 2002 Miguel Guzman & The Viewforge Project
+ 2004 Erik Hjortsberg
+License: GPL-2+
+
+Files: src/components/ogre/MovementController.cpp
+Copyright: 2004 Erik Hjortsberg
+ 2004 bad_camel at Ogre3d forums
+License: GPL-2+
-Files: src/components/ogre/gui/RenderedColourStringTextComponent.cpp
-Copyright: 2011 Erik Ogenvik
- 2004-2009 Paul D Turner & The CEGUI Development Team
-License: GPL-2+ and expat
-
Files: src/components/lua/luaobject.*
-Copyright: 2008 by Nigel Atkinson <suprapilot+LuaCode at gmail.com>
+Copyright: 2008 Nigel Atkinson <suprapilot+LuaCode at gmail.com>
License: LGPL-3+
-License: LGPL-2.1+
+Files: ltmain.sh
+Copyright: 1996-2001, 2003-2011, Free Software Foundation, Inc.
+License: GPL-2+
+
+License: LGPL-2+
This library 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.1 of the License, or (at your option) any later version.
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; version 2.
.
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.
+ Library General Public License for more details.
.
- You should have received a copy of the GNU Lesser General Public
+ You should have received a copy of the GNU Library 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
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
.
On Debian systems you find a full copy of the GNU Lesser General Public License,
- Version 2.1 or later in /usr/share/common-licenses/LGPL-2.1.
+ Version 2.1 or later in /usr/share/common-licenses/LGPL-2.
License: LGPL-3+
This library is free software; you can redistribute it and/or
@@ -209,7 +284,7 @@ License: GPL-3+
On Debian systems, the full text of the GNU General Public License
version 3 can be found in the file `/usr/share/common-licenses/GPL-3'.
-License: BSD-2-clause
+License: BSD-3-clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
diff --git a/debian/ember.lintian-overrides b/debian/ember.lintian-overrides
new file mode 100644
index 0000000..b52a0a2
--- /dev/null
+++ b/debian/ember.lintian-overrides
@@ -0,0 +1,8 @@
+# The Debian Games team is split about whether or not to implement packages
+# in this way. Fedora and most upstreams do not install into /usr/games.
+# Not using /usr/games seems to be the direction for distro standardization.
+ember: package-section-games-but-contains-no-game
+# Directory used by program when executed.
+ember: package-contains-empty-directory
+# False positive. The string "ment" is not found anywhere in the source tree.
+ember [i386] binary: spelling-error-in-binary usr/bin/ember.bin ment meant
diff --git a/debian/rules b/debian/rules
index f884649..d72b5fd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,12 @@
#!/usr/bin/make -f
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
%:
- dh $@ --with autoreconf
+ dh $@ --parallel --with autoreconf
override_dh_auto_configure:
- dh_auto_configure -- --bindir=/usr/games --enable-cppunit=no
+ dh_auto_configure -- --enable-cppunit=no
# force generated sources to be regenerated with local version of tolua++
override_dh_auto_build:
@@ -15,8 +17,3 @@ override_dh_auto_build:
override_dh_install:
find . -name COPYING -delete
dh_install --fail-missing -X.la -X.a -XCOPYING
- rm -rf debian/ember/usr/share/ember/media/shared/sounddefinitions
-
-override_dh_builddeb:
- dh_builddeb -- -Zxz
-
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000..590be55
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,2 @@
+# Files necessary to compile for WIN32 systems
+ember: source-contains-autogenerated-visual-c++-file
diff --git a/debian/watch b/debian/watch
index 1d99c2b..015e585 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
version=3
-opts=dversionmangle=s/\+dfsg\d*// \
-http://sf.net/worldforge/ember-([\d\.]*)\.tar\.bz2 debian uupdate
+opts=dversionmangle=s/\+(dfsg)\d*$// \
+ http://sf.net/worldforge/ember-([\d\.]*)\.(?:tar\.(?:gz|bz2|xz)) debian uupdate
--
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