widelands-dev team mailing list archive
-
widelands-dev team
-
Mailing list archive
-
Message #01716
[Merge] lp:~hjd/widelands/debian-b18rc1 into lp:~widelands-dev/widelands/debian
Hans Joachim Desserud has proposed merging lp:~hjd/widelands/debian-b18rc1 into lp:~widelands-dev/widelands/debian.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~hjd/widelands/debian-b18rc1/+merge/207529
This review basically consists of an import of the latest Debian packaging with some additional tweaks by me.
I'd like to stay in sync with Debian and make sure we build our packages in the PPA(s) the same way as the "real" packages provided by Debian/Ubuntu/various derivatives. This repo hasn't been synced in a while, and considering the changes over time it seemed odd to continue to build the upcoming build 18 as if it was still build 17.
I've therefore synced our Debian packaging with the latest version used to package the build 18 release candidate. Once imported, I then added some patches to simplify things and to make the packages buildable/usable on Ubuntu 12.04. For details on my changes, please see the commit messages. (I will attempt to forward any general changes to Debian, but the changes made to support older releases will likely remain a patch delta on our side.)
For testing I set up the following PPA: https://launchpad.net/~hjd/+archive/widelands-test, which built latest trunk nested with this branch for packaging. As you can see, it build successfully on those Ubuntu releases we support. I then ran a smoke test on each release, consisting of running the program, start a new game with all three tribes, build at least one building and confirm it produces something. Nothing in-depth, but I imagine it would have caught any serious issues. (Due to my virtual machines I have only been able to test the i386 packages though).
PS. A bit unrelated, but as a heads-up: once build 18 is released I plan to take the recipe for https://launchpad.net/~widelands-dev/+archive/widelands, switch to the build 18 series and build a new set of packages. I *believe* this should work fine and provide an updated set of packages for our stable release PPA. (I don't think we had it when the previous version was released, so I guess such an upgrade is untested)
--
https://code.launchpad.net/~hjd/widelands/debian-b18rc1/+merge/207529
Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/debian-b18rc1 into lp:~widelands-dev/widelands/debian.
=== added file 'debian/.gitignore'
--- debian/.gitignore 1970-01-01 00:00:00 +0000
+++ debian/.gitignore 2014-02-20 18:36:09 +0000
@@ -0,0 +1,1 @@
+*~
=== removed file 'debian/README.source'
--- debian/README.source 2012-04-07 17:00:40 +0000
+++ debian/README.source 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-Please refer to /usr/share/doc/dpatch/README.source.gz
=== modified file 'debian/changelog'
--- debian/changelog 2012-04-15 14:31:07 +0000
+++ debian/changelog 2014-02-20 18:36:09 +0000
@@ -1,3 +1,75 @@
+widelands (1:18~rc1-2) unstable; urgency=medium
+
+ * Rework the kfreebsd patch to fix the FTBFS [Teppo Maenpaa]
+
+ -- Martin Quinson <mquinson@xxxxxxxxxx> Thu, 13 Feb 2014 16:46:39 +0100
+
+widelands (1:18~rc1-1) unstable; urgency=medium
+
+ * New upstream release (release candidate)
+ - Update our patches, drop the ones that were integrated upstream
+ (gcc4.7, Werror, boost-linking-4.7)
+ - The following bugs were fixed upstream (Closes: #668894, #678310)
+ * d/control: Move build-deps to boost 1.54
+ * d/control: Bump standards-version to 3.9.5 (no change mandated)
+ * Depend on fonts-dejavu-core, fonts-dejavu-extra to not embeed these fonts
+ * Depend on fonts-freefont-ttf instead of ttf-freefont as the
+ package got renamed recently (Closes: #738257, #738258)
+
+ -- Martin Quinson <mquinson@xxxxxxxxxx> Mon, 10 Feb 2014 21:24:51 +0100
+
+widelands (1:17-5) unstable; urgency=low
+
+ * Team upload.
+ * d/control: Add Build-Depends on imagemagick. (Closes: #707489)
+
+ -- Ansgar Burchardt <ansgar@xxxxxxxxxx> Sat, 11 May 2013 15:55:39 +0200
+
+widelands (1:17-4) unstable; urgency=low
+
+ * d/rules: Move to packaging to git VCS
+ * d/rules: Enable parallel build of the package
+ * d/rules: List uninstalled files at build time
+ * d/rules: Install logos in various sizes under /usr/share/icons
+ * d/rules: Manually define CPPFLAGS and friends with hardening flags
+ Seems mandated because we are overloading dh_auto_build
+ * d/compat: Bump to version 9 of debhelper
+ * d/control: Bump standards-version to 3.9.4 (no change mandated)
+ * d/control: Put pkg-game as a maintainer and myself as an uploader
+ * d/widelands.menu: add a longtitle and an icon (Closes: #703255)
+ * d/copyright: convert to Machine-readable format
+ * d/copyright: specify where the source of media is (Closes: #702070)
+
+ -- Martin Quinson <mquinson@xxxxxxxxxx> Mon, 06 May 2013 16:20:14 +0200
+
+widelands (1:17-3) unstable; urgency=low
+
+ * add debian/compat (7)
+ * add patch boost-linking-4.7 to fix linking error with boost
+ and gcc 4.7. This also links widelands dinamically with
+ boost, as per policy (Closes: #672034)
+ * add patch Werror to fix compilation with gcc 4.7 and the
+ -Werror=format-security flag
+
+ -- Enrico Tassi <gareuselesinge@xxxxxxxxxx> Wed, 02 May 2012 15:03:59 +0200
+
+widelands (1:17-2) unstable; urgency=low
+
+ * define PATH_MAX if not defined (i.e. on hurd)
+ * re-enable patch for s390 but not on s390x
+
+ -- Enrico Tassi <gareuselesinge@xxxxxxxxxx> Wed, 02 May 2012 13:46:11 +0200
+
+widelands (1:17-1) experimental; urgency=low
+
+ * new upstream release
+ * disable patches/s390
+ * debian/rules: use && istead of ; so that failures are reported correctly
+ * we go to experimental to see if s390 is happy and not to disturb
+ transitions for libpng15 and boost
+
+ -- Enrico Tassi <gareuselesinge@xxxxxxxxxx> Tue, 24 Apr 2012 17:27:19 +0200
+
widelands (1:17~rc2-3) unstable; urgency=low
* on kfreebsd, the execinfo library cannot be found for an unkown reason.
=== modified file 'debian/compat'
--- debian/compat 2012-04-07 17:00:40 +0000
+++ debian/compat 2014-02-20 18:36:09 +0000
@@ -1,1 +1,1 @@
-7
+9
=== modified file 'debian/control'
--- debian/control 2014-01-07 20:20:26 +0000
+++ debian/control 2014-02-20 18:36:09 +0000
@@ -1,17 +1,38 @@
Source: widelands
Section: games
Priority: extra
-Maintainer: Martin Quinson <mquinson@xxxxxxxxxx>
-Uploaders: Enrico Tassi <gareuselesinge@xxxxxxxxxx>
-Standards-Version: 3.9.1
-Build-Depends: debhelper (>= 7.0.50~), libsdl1.2-dev, libsdl-image1.2-dev, libsdl-ttf2.0-dev, libsdl-net1.2-dev, libsdl-mixer1.2-dev, libsdl-gfx1.2-dev, python, libboost1.48-dev | libboost-dev (>= 1.48), doxygen, cmake, liblua5.1-dev, libglew1.5-dev
-Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/widelands/
-Vcs-Browser: http://svn.debian.org/viewsvn/collab-maint/deb-maint/widelands/
-Homepage: http://www.widelands.org
+Maintainer: Debian Games Team <pkg-games-devel@xxxxxxxxxxxxxxxxxxxxxxx>
+Uploaders:
+ Martin Quinson <mquinson@xxxxxxxxxx>,
+ Enrico Tassi <gareuselesinge@xxxxxxxxxx>
+Standards-Version: 3.9.5
+Build-Depends: debhelper (>= 9),
+ libsdl1.2-dev,
+ libsdl-image1.2-dev,
+ libsdl-ttf2.0-dev,
+ libsdl-net1.2-dev,
+ libsdl-mixer1.2-dev,
+ libsdl-gfx1.2-dev,
+ python,
+ libboost1.48-dev | libboost-dev,
+ doxygen,
+ cmake,
+ imagemagick,
+ liblua5.1-dev,
+ libglew-dev,
+ libpng-dev,
+ zlib1g-dev
+Vcs-Git: git://git.debian.org/git/pkg-games/widelands.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/widelands.git
+#Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/widelands/ <-- Old location of packaging
+Homepage: http://www.widelands.org/
Package: widelands
Architecture: any
-Depends: widelands-data (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, ttf-freefont
+Depends: widelands-data (= ${source:Version}),
+ ${shlibs:Depends},
+ ${misc:Depends},
+ fonts-freefont-ttf | ttf-freefont, fonts-dejavu-core | ttf-dejavu-core, fonts-dejavu-extra | ttf-dejavu-extra,
Description: fantasy real-time strategy game
Widelands is a strategy game aiming for gameplay similar to Settlers II by
BlueByte.
@@ -24,7 +45,8 @@
Package: widelands-data
Architecture: all
-Depends: ttf-freefont, ${misc:Depends}
+Depends: fonts-freefont-ttf | ttf-freefont,
+ ${misc:Depends}
Description: fantasy real-time strategy game (data files)
This package contains the graphics and levels for Widelands.
.
@@ -40,7 +62,8 @@
Package: widelands-dbg
Architecture: any
Section: debug
-Depends: widelands (= ${binary:Version}), ${misc:Depends}
+Depends: widelands (= ${binary:Version}),
+ ${misc:Depends}
Description: fantasy real-time strategy game (debug cruft)
This package contains the debugging symbols associated to widelands.
.
=== modified file 'debian/copyright'
--- debian/copyright 2012-04-07 17:00:40 +0000
+++ debian/copyright 2014-02-20 18:36:09 +0000
@@ -1,121 +1,138 @@
-This package was debianized by Martin Quinson on Thu, 16 Sep 2004 22:49:50
-+0200.
-
-Upstream authors (alphabetically sorted):
------------------
-
-Albert Jasiowka <hackbird@xxxxxxxxxxx> Project Member, Graphics
-Delia <delia@xxxxxxxxxxxxx> Graphics
-Florian Bluemel <sintflut@xxxxxxx> Project Member, Programmer
-Florian Falkner <falkner@xxxxxxxxxxxx> Programmer
-Florian Neuerburg Graphics
-Holger Rapp <SirVer@xxxxxx> Project Admin, Programmer, Graphics
-Jerome Rosinski Graphics
-Martin Quinson Programmer
-Marz <margodofwar_au@xxxxxxxxxxxx> Project Member, Graphics
-Mats Olsson <mats.olsson@xxxxxxxxxxxxx> Graphics
-Nicolai Haehnle <prefect@xxxxxxxx> Project Admin, Programmer
-Philipp Engelhard <drmorden@xxxxxxxxxxxxxxxxxxxxx> Project Member,
- Programmer, Graphics
-Stefan Boettner <stefanb@xxxxxx> Programmer
-Tron <dertron@xxxxxxxxxxxxxxxxxxxxx> Project Member, Programmer
-Yannick Warnier <ywarnier@xxxxxxxxxxxx> Project Member, Graphics
-Willem Jan Palenstijn Programmer
-
-
-Copyright 2002, 2003, 2004 the Widelands Development Team.
-
-This game is distributed under the GPL licence (to be found under
-/usr/share/common-licenses/GPL on a Debian box).
-
-The package includes a fond named Widelands.ttf
-Copyright (c) 2006-2008, Peter Schwanemann <Peter@xxxxxxxxxxxx>,
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: widelands
+Source: http://www.widelands.org/
+
+Files: *
+Copyright: 2002-2013 by the Widelands Development Team
+License: GPL-2+
+ 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.
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+Files: fonts/Widelands/Widelands.ttf
+Copyright: 2006-2010, Peter Schwanemann (Peter (AT) drehatlas (DOT) de)
+License: SIL Open Font License, Version 1.1 (http://scripts.sil.org/OFL)
+ PREAMBLE
+ The goals of the Open Font License (OFL) are to stimulate worldwide
+ development of collaborative font projects, to support the font creation
+ efforts of academic and linguistic communities, and to provide a free and
+ open framework in which fonts may be shared and improved in partnership
+ with others.
+ .
+ The OFL allows the licensed fonts to be used, studied, modified and
+ redistributed freely as long as they are not sold by themselves. The
+ fonts, including any derivative works, can be bundled, embedded,
+ redistributed and/or sold with any software provided that any reserved
+ names are not used by derivative works. The fonts and derivatives,
+ however, cannot be released under any other type of license. The
+ requirement for fonts to remain under this license does not apply
+ to any document created using the fonts or their derivatives.
+ .
+ DEFINITIONS
+ "Font Software" refers to the set of files released by the Copyright
+ Holder(s) under this license and clearly marked as such. This may
+ include source files, build scripts and documentation.
+ .
+ "Reserved Font Name" refers to any names specified as such after the
+ copyright statement(s).
+ .
+ "Original Version" refers to the collection of Font Software components as
+ distributed by the Copyright Holder(s).
+ .
+ "Modified Version" refers to any derivative made by adding to, deleting,
+ or substituting -- in part or in whole -- any of the components of the
+ Original Version, by changing formats or by porting the Font Software to a
+ new environment.
+ .
+ "Author" refers to any designer, engineer, programmer, technical
+ writer or other person who contributed to the Font Software.
+ .
+ PERMISSION & CONDITIONS
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of the Font Software, to use, study, copy, merge, embed, modify,
+ redistribute, and sell modified and unmodified copies of the Font
+ Software, subject to the following conditions:
+ .
+ 1) Neither the Font Software nor any of its individual components,
+ in Original or Modified Versions, may be sold by itself.
+ .
+ 2) Original or Modified Versions of the Font Software may be bundled,
+ redistributed and/or sold with any software, provided that each copy
+ contains the above copyright notice and this license. These can be
+ included either as stand-alone text files, human-readable headers or
+ in the appropriate machine-readable metadata fields within text or
+ binary files as long as those fields can be easily viewed by the user.
+ .
+ 3) No Modified Version of the Font Software may use the Reserved Font
+ Name(s) unless explicit written permission is granted by the corresponding
+ Copyright Holder. This restriction only applies to the primary font name as
+ presented to the users.
+ .
+ 4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+ Software shall not be used to promote, endorse or advertise any
+ Modified Version, except to acknowledge the contribution(s) of the
+ Copyright Holder(s) and the Author(s) or with their explicit written
+ permission.
+ .
+ 5) The Font Software, modified or unmodified, in part or in whole,
+ must be distributed entirely under this license, and must not be
+ distributed under any other license. The requirement for fonts to
+ remain under this license does not apply to any document created
+ using the Font Software.
+ .
+ TERMINATION
+ This license becomes null and void if any of the above conditions are
+ not met.
+ .
+ DISCLAIMER
+ THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+ OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+ COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+ DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+ OTHER DEALINGS IN THE FONT SOFTWARE.
+
+Files: tribes/*/*.png
+Copyright: 2002-2013 by the Widelands Development Team
+License: GPL-2+
+ The media files of Widelands are distributed under the same license
+ than the game itself. The blender source files are not included in the same
+ source tree because of their size but can be retrieved online from
+ https://bugs.launchpad.net/widelands-media/
+ Some of these models were lost by the widelands authors, and currently
+ reimplemented (see https://bugs.launchpad.net/widelands-media/+bug/677337).
+
+Files: debian/*
+Copyright: 2004-2013 Martin Quinson <mquinson@xxxxxxxxxx>
+License: GPL-2+
+ This package 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 package 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, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
=== added file 'debian/gbp.conf'
=== added file 'debian/patches/PATH_MAX'
--- debian/patches/PATH_MAX 1970-01-01 00:00:00 +0000
+++ debian/patches/PATH_MAX 2014-02-20 18:36:09 +0000
@@ -0,0 +1,38 @@
+Author: Enrico Tassi <gareuselesinge@xxxxxxxxxx>
+Description: define PATH_MAX if not defined (i.e. on hurd)
+
+---
+ src/io/filesystem/filesystem.cc | 4 ++++
+ src/wlapplication.cc | 4 ++++
+ 2 files changed, 8 insertions(+)
+
+Index: b/src/io/filesystem/filesystem.cc
+===================================================================
+--- a/src/io/filesystem/filesystem.cc
++++ b/src/io/filesystem/filesystem.cc
+@@ -60,6 +60,10 @@
+ #define PATH_MAX MAX_PATH
+ #endif
+
++#ifndef PATH_MAX
++ #define PATH_MAX 1024
++#endif
++
+ FileSystem::FileSystem()
+ {
+ m_root = "";
+Index: b/src/wlapplication.cc
+===================================================================
+--- a/src/wlapplication.cc
++++ b/src/wlapplication.cc
+@@ -92,6 +92,10 @@
+ #endif
+ #endif
+
++#ifndef PATH_MAX
++ #define PATH_MAX 1024
++#endif
++
+ #define MINIMUM_DISK_SPACE 250000000lu
+ #define SCREENSHOT_DIR "screenshots"
+
=== modified file 'debian/patches/dbg_symbols'
--- debian/patches/dbg_symbols 2013-04-20 11:51:09 +0000
+++ debian/patches/dbg_symbols 2014-02-20 18:36:09 +0000
@@ -1,22 +1,19 @@
-Index: widelands-17~rc1/CMakeLists.txt
+Description: compile with -g so that the dbg package contains something
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: b/CMakeLists.txt
===================================================================
---- widelands-17~rc1.orig/CMakeLists.txt 2012-04-02 10:34:26.000000000 +0200
-+++ widelands-17~rc1/CMakeLists.txt 2012-04-11 14:52:24.000000000 +0200
-@@ -228,7 +228,7 @@
- # CMAKE only defines "-g", but we need -DDEBUG also, and we need -DNOPARACHUTE (for SDL) in Debug
- set (CMAKE_CXX_FLAGS_DEBUG "-g -DDEBUG -DNOPARACHUTE${WL_COMPILERFLAG_OLDSTYLECAST}${WL_COMPILERFLAG_GENERICWARNINGS}${WL_COMPILERFLAG_EXTRAWARNINGS}${WL_COMPILERFLAG_GCCWARNINGS}${WL_COMPILERFLAG_STRICT}" CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
-
--set (WL_COMPILERFLAG_OPTIMIZATIONS "-O3")
-+set (WL_COMPILERFLAG_OPTIMIZATIONS "-g -O3")
-
- #This can be removed if no one uses gcc 4.5.1 or 4.5.2 any more
- IF (CMAKE_COMPILER_IS_GNUCXX)
-@@ -241,7 +241,7 @@
- IF (WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.1" OR WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.2")
- message("Detected gcc ${WLBUILD_COMPILERVERSION_REP}")
- message("Suffering from gcc bug, disabling -O3")
-- set (WL_COMPILERFLAG_OPTIMIZATIONS "-O2")
-+ set (WL_COMPILERFLAG_OPTIMIZATIONS "-g -O2")
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -271,7 +271,7 @@
ENDIF (WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.1" OR WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.2")
ENDIF (CMAKE_COMPILER_IS_GNUCXX)
+-set (CMAKE_CXX_FLAGS_RELEASE "${WL_COMPILERFLAG_CXXSTD} ${WL_COMPILERFLAG_OPTIMIZATIONS} -DNDEBUG${WL_COMPILERFLAG_OLDSTYLECAST}${WL_COMPILERFLAG_GENERICWARNINGS}${WL_COMPILERFLAG_EXTRAWARNINGS}${WL_COMPILERFLAG_GCCWARNINGS}${WL_COMPILERFLAG_STRICT}" CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
++set (CMAKE_CXX_FLAGS_RELEASE "${WL_COMPILERFLAG_CXXSTD} -g ${WL_COMPILERFLAG_OPTIMIZATIONS} -DNDEBUG${WL_COMPILERFLAG_OLDSTYLECAST}${WL_COMPILERFLAG_GENERICWARNINGS}${WL_COMPILERFLAG_EXTRAWARNINGS}${WL_COMPILERFLAG_GCCWARNINGS}${WL_COMPILERFLAG_STRICT}" CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
+
+ #If building with MSVC, then check for 3rdparty libs
+ if (DEFINED MSVC)
=== added file 'debian/patches/kfreebsd-FTBFS'
--- debian/patches/kfreebsd-FTBFS 1970-01-01 00:00:00 +0000
+++ debian/patches/kfreebsd-FTBFS 2014-02-20 18:36:09 +0000
@@ -0,0 +1,38 @@
+Description: Fix a FTBFS on kfreebsd
+ The kfreebsd architecture is using the GNU libc on a FreeBSD kernel.
+ .
+ So we don't need to search for execinfo and intl libs on this
+ perticular architecture, as they are included in the libc.
+Author: Teppo Maenpaa <teppo.maenpaa@xxxxxxx>
+Forwarded-Upstream: not yet, should be.
+
+---
+ src/CMakeLists.txt | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -326,7 +326,9 @@
+
+ # on BSD this must be explicitly linked
+ if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
+- find_library(EXECINFO_LIBRARY NAMES execinfo)
++ if (NOT CMAKE_SYSTEM_NAME MATCHES "kFreeBSD")
++ find_library(EXECINFO_LIBRARY NAMES execinfo)
++ endif (NOT CMAKE_SYSTEM_NAME MATCHES "kFreeBSD")
+ endif (CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
+
+
+@@ -436,8 +438,10 @@
+ endif (MINIZIP_FOUND)
+
+ if (APPLE OR WIN32 OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+- find_package(intl REQUIRED)
+- include_directories(${INTL_INCLUDE_DIR})
++ if (NOT CMAKE_SYSTEM_NAME MATCHES "kFreeBSD")
++ find_package(intl REQUIRED)
++ include_directories(${INTL_INCLUDE_DIR})
++ endif (NOT CMAKE_SYSTEM_NAME MATCHES "kFreeBSD")
+ endif (APPLE OR WIN32 OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+
+ # Gettext is required, but it does not provide GETTEXT_INCLUDE_DIR or
=== modified file 'debian/patches/s390'
--- debian/patches/s390 2012-04-07 17:00:40 +0000
+++ debian/patches/s390 2014-02-20 18:36:09 +0000
@@ -1,12 +1,18 @@
-Index: widelands-16~rc1/src/logic/widelands.h
+Description: Port the game to the s390 architecture
+
+---
+ src/logic/widelands.h | 20 ++++++++++++++++++++
+ 1 file changed, 20 insertions(+)
+
+Index: b/src/logic/widelands.h
===================================================================
---- widelands-16~rc1.orig/src/logic/widelands.h 2011-04-04 12:03:24.000000000 +0200
-+++ widelands-16~rc1/src/logic/widelands.h 2011-04-14 13:10:08.000000000 +0200
-@@ -87,6 +87,13 @@
+--- a/src/logic/widelands.h
++++ b/src/logic/widelands.h
+@@ -78,6 +78,13 @@
{
assert(I < std::numeric_limits<value_t>::max());
}
-+#if defined(__s390__)
++#if (defined(__s390__) && !defined(__s390x__))
+ explicit _Index(uintptr_t const I)
+ : i(static_cast<value_t>(I))
+ {
@@ -16,11 +22,11 @@
/// For compatibility with old code that use int32_t for building index
/// and use -1 to indicate invalidity.
-@@ -125,6 +132,17 @@
+@@ -116,6 +123,17 @@
value_t i;
};
-+#if defined(__s390__)
++#if (defined(__s390__) && !defined(__s390x__))
+#define DEFINE_INDEX(NAME) \
+ struct NAME : public _Index<NAME> { \
+ NAME(NAME const & other = Null()) : _Index<NAME>(other) {} \
@@ -32,9 +38,9 @@
+
+#else
#define DEFINE_INDEX(NAME) \
- struct NAME : public _Index<NAME> { \
- NAME(NAME const & other = Null()) : _Index<NAME>(other) {} \
-@@ -133,6 +151,8 @@
+ struct NAME : public Index_<NAME> { \
+ NAME(const NAME & other = Null()) : Index_<NAME>(other) {} \
+@@ -124,6 +142,8 @@
explicit NAME(int32_t const I) __attribute__((deprecated)); \
}; \
=== modified file 'debian/patches/series'
--- debian/patches/series 2012-04-25 15:05:14 +0000
+++ debian/patches/series 2014-02-20 18:36:09 +0000
@@ -1,2 +1,5 @@
+kfreebsd-FTBFS
s390
dbg_symbols
+PATH_MAX
+
=== modified file 'debian/rules'
--- debian/rules 2012-04-15 14:21:47 +0000
+++ debian/rules 2014-02-20 18:36:09 +0000
@@ -1,31 +1,77 @@
#!/usr/bin/make -f
+# parallel building
+parallel=$(shell echo $$DEB_BUILD_OPTIONS | grep parallel > /dev/null && echo -j$$(test -f /proc/cpuinfo && cat /proc/cpuinfo | (grep ^processor || echo 1) | wc -l))
+
+# Hardening flags
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
+CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+
%:
dh $@
override_dh_auto_configure:
mkdir -p build-debian
- cd build-debian; cmake \
+ cd build-debian && cmake \
-DWL_INSTALL_PREFIX=/usr \
-DWL_INSTALL_DATADIR=share/games/widelands \
-DWL_INSTALL_BINDIR=games \
-DWL_INSTALL_LOCALEDIR=/usr/share/games/widelands/locale \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
- ../; cat src/config.h
+ ../ && cat src/config.h
override_dh_auto_build:
- cd build-debian; make
+ cd build-debian && make VERBOSE=1 ${parallel}
override_dh_auto_install:
- cd build-debian; make install DESTDIR=`pwd`/../debian/tmp
+ cd build-debian && make install DESTDIR=`pwd`/../debian/tmp
mkdir -p debian/tmp/usr/share/applications/
cp debian/widelands.desktop debian/tmp/usr/share/applications/
- rm debian/tmp/usr/share/games/widelands/fonts/FreeSans.ttf
- rm debian/tmp/usr/share/games/widelands/fonts/FreeSerif.ttf
+ # Take care of the fonts (use system-wide ones)
+ for ttf in FreeSans.ttf FreeSerif.ttf ; do \
+ rm debian/tmp/usr/share/games/widelands/fonts/$$ttf; \
+ (cd debian/tmp/usr/share/games/widelands/fonts/; ln -s /usr/share/fonts/truetype/freefont/$$ttf) ;\
+ done
+ # Damn, widelands does not use the standard name of fonts,
+ # but removes the hyphen (-) from those names
+ # Note! Don't replace the dejavu font files with symlinks because the paths doesn't exist on Ubuntu 12.04 :(
+ #for hyphen in \
+ # DejaVuSans-BoldOblique.ttf \
+ # DejaVuSans-Bold.ttf \
+ # DejaVuSansCondensed-Bold.ttf \
+ # DejaVuSansCondensed.ttf \
+ # DejaVuSans-ExtraLight.ttf \
+ # DejaVuSansMono-Bold.ttf \
+ # DejaVuSansMono.ttf \
+ # DejaVuSans.ttf \
+ # DejaVuSerif-BoldItalic.ttf \
+ # DejaVuSerif-Bold.ttf \
+ # DejaVuSerifCondensed-BoldItalic.ttf \
+ # DejaVuSerifCondensed-Bold.ttf \
+ # DejaVuSerifCondensed-Italic.ttf \
+ # DejaVuSerifCondensed.ttf \
+ # DejaVuSerif-Italic.ttf \
+ # DejaVuSerif.ttf \
+ # ; do \
+ # ttf=`echo $$hyphen | sed 's/-//'` ; \
+ # rm debian/tmp/usr/share/games/widelands/fonts/$$ttf; \
+ # (cd debian/tmp/usr/share/games/widelands/fonts/; ln -s /usr/share/fonts/truetype/dejavu/$$hyphen $$ttf) ;\
+ #done
rm debian/tmp/usr/share/games/widelands/fonts/Widelands/LICENSE
- cd debian/tmp/usr/share/games/widelands/fonts/; ln -s /usr/share/fonts/truetype/freefont/FreeSans.ttf
- cd debian/tmp/usr/share/games/widelands/fonts/; ln -s /usr/share/fonts/truetype/freefont/FreeSerif.ttf
+ # Take care of the logo
+ for size in 16 32 48 64 128 ; do \
+ mkdir -p debian/widelands/usr/share/icons/hicolor/$${size}x$${size}/apps ; \
+ cp debian/tmp/usr/share/games/widelands/pics/wl-ico-$${size}.png \
+ debian/widelands/usr/share/icons/hicolor/$${size}x$${size}/apps/widelands.png; \
+ done
+ convert debian/widelands/usr/share/icons/hicolor/32x32/apps/widelands.png \
+ debian/widelands/usr/share/icons/hicolor/32x32/apps/widelands.xpm
+
+override_dh_install:
+ dh_install --list-missing
override_dh_strip:
dh_strip --dbg-package=widelands-dbg
=== modified file 'debian/widelands.menu'
--- debian/widelands.menu 2012-04-07 17:00:40 +0000
+++ debian/widelands.menu 2014-02-20 18:36:09 +0000
@@ -2,4 +2,6 @@
needs="X11" \
section="Games/Strategy" \
title="widelands" \
- command="/usr/games/widelands"
+ longtitle="Fantasy real-time strategy game" \
+ command="/usr/games/widelands" \
+ icon="/usr/share/icons/hicolor/32x32/apps/widelands.xpm"
=== removed file 'debian/widelands.sh'
--- debian/widelands.sh 2012-04-07 17:00:40 +0000
+++ debian/widelands.sh 1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-#! /bin/bash
-mkdir /tmp/widelands-$$
-chmod 700 /tmp/widelands-$$
-cd /tmp/widelands-$$
-ulimit -c 500000
-/var/lib/widelands/widelands.real --record=record --coredump=yes $@ > output
-if [ $? -ne 0 ]
-then
- echo "Uups, widelands seems to have crashed."
- echo
- echo "Gathering some info about your install..."
- uname -a > /tmp/widelands-$$/uname_a
- COLUMNS=120 LC_ALL=C dpkg -l widelands\* > /tmp/widelands-$$/version 2>&1
- tar cf /tmp/widelands-$$.tar /tmp/widelands-$$/ 2>/dev/null
- bzip2 -9 /tmp/widelands-$$.tar
- echo "done"
- echo
- echo "Please report this bug using the interface on"
- echo ' http://sourceforge.net/tracker/?func=add&group_id=40163&atid=427221'
- echo
- echo "Please make sure to provide as much useful information as possible."
- echo " To that extend, you can add the file /tmp/widelands-$$.tar.bz2 to your bug report. It contains :"
- echo " - all the actions you've made while playing (the record file)"
- echo " - a core file (if any)"
- echo " - all messages widelands made during the game (the output file)"
- echo " - the architecture you're playing on (`uname -a`)"
- echo " - the version of the game used (as repported by dpkg)"
- echo
- echo "If you have any screenshot (and if they are relevant to the bug), please include them also."
- echo
- echo "Thanks for your help, and sorry for the inconviniance,"
- echo "the widelands development team."
-fi
-
Follow ups
