widelands-dev team mailing list archive

[Hans Joachim Desserud <launchpad@xxxxxxxxxxxx>]

Hans Joachim Desserud has proposed merging lp:~hjd/widelands/merge-b19-packaging into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~hjd/widelands/merge-b19-packaging/+merge/311346

(Mostly for review, there's a couple of things which should be decided before merging this)


Merged with the Debian packaging for 1:19+repack-1. Currently building for my test PPA for the Ubuntu releases we support https://code.launchpad.net/~hjd/+recipe/widelands-test (worked fine when launching the game on zesty earlier).


Some assumptions:
- I assume we want to continue using our bundled fonts.
- For now, we always build with the bundled minizip. The package is not available in Ubuntu 14.04 so the build would fail when attempting to install all required dependencies. (We could hack around this, if we really want to, and use the embedded one on 14.04 and the packaged version on later releases. It would be easy to do, but extremely hacky, so I'd rather not.)


Some remaining questions:
- I need to investigate what the `get-orig-source` step in the rules file does. This may be something we don'ẗ should or wish to do.
- The appdata file seems to be part of the widelands-data package. I don't know whether this will work as expected, or if it should be part of the widelands package. (I still haven't been able to see an impact of this file in for instance gnome-software, but my PPA should soon have packages ready so that others may test)
- Btw, I see that we have .stub files for the appdata and desktop files, but these are not in the Debian package. What do they do, and should they be included in Debian as well?
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/merge-b19-packaging into lp:widelands.

=== added file 'debian/Debian.todo'
--- debian/Debian.todo	1970-01-01 00:00:00 +0000
+++ debian/Debian.todo	2016-11-20 12:32:08 +0000
@@ -0,0 +1,11 @@
+This package embeeds lua-eris ( https://github.com/fnuecke/eris ), a
+fork of Lua 5.3 for better data persistance. It replaces and provides
+the classical lua interpreter.
+
+This library should be packaged separately, but widelands already
+changed its lua version several times in the past, and this perticular
+version does not seem to be widely used. I would prefer to see some
+real interest from other communities before separating lua-eris.
+
+
+                              -- Martin Quinson, November 2016.
\ No newline at end of file

=== modified file 'debian/changelog'
--- debian/changelog	2016-07-23 10:47:38 +0000
+++ debian/changelog	2016-11-20 12:32:08 +0000
@@ -1,3 +1,71 @@
+widelands (1:19+repack-1widelands1) UNRELEASED; urgency=medium
+
+  * Merged Debian packaging of Widelands 1:19+repack-1. Remaining changes:
+    - Disabled all Debian-patches since applying them might cause conflicts as
+      development moves along in latest trunk. They mostly concern 
+      architectures which we don't have access to build/test with normally, so
+      they would be hard to maintain.
+    - Dropped patches:
+        system-wide_minizip
+          (Should be included in trunk once we iron out the remaining bugs)
+        mips_gcc_ICE_with-03
+        s390_new_architecture
+          (Build 19 built successfully on mips and s390x, so removed these
+          patches. They were already commented out in Debian)
+    - Build using embedded minizip since we support older Ubuntu releases where
+      the package is not available.
+    - Made widelands.desktop localizable.
+    - Translations for appdata and desktop file.
+    - Changed icon path in desktop file.
+    - Re-added font entries to copyright file, since we will most likely be using
+      the embedded fonts.
+    - Modified rules to use our embedded fonts and install all binaries.
+
+ -- Widelands <widelands-dev@xxxxxxxxxxxxxxxxxxx>  Sun, 20 Nov 2016 11:03:07 +0100
+
+widelands (1:19+repack-1) unstable; urgency=medium
+
+  * New upstream release. New features highlight:
+    - Seafaring AI and other AI improvements
+    - Message filtering
+    - New in-game and in-editor help system
+    - Efficient graphics loading and rendering.
+    - New starting condition “Trading Outpost”
+    - New win condition “Artifacts”
+    - 4 Tutorials
+    - Improved Barbarians and Empire campaigns
+    - 3 new maps
+    - No separate worlds anymore. All terrains can now be used on all
+      maps. Old maps stay compatible.
+    - No separate tribes anymore: Though in game the tribes still seem
+      separate, they are in fact now the same tribe with different
+      buildings and workers enabled. This allows for interesting
+      concepts down the line like a mixed economy or trading.
+    - New animations, overlay images and icons
+    - New forested mountains terrains
+    - Many menu redesigns
+    - Improved support for non-Latin scripts and right-to-left languages
+    - Various small balance changes (for example more experience in mines,
+      stronger barbarian soldiers)
+    - Behind the scenes: move to SDL 2, Build system refactoring, move to
+      c++ 11, continuous integration, move to Transifex and merge bot.
+      Also tons of cleanups to the code base.
+
+  * Package is manually repacked to mv debian/ debian.orig/ in
+    upstream tar file.
+  * Change the build-dependencies of SDL to the one of SDL2
+  * Update our patches:
+    - Drop patch kfreebsd-integrated-libraries (integrated upstream)
+    - Comment mips and s390 patches: they may be useless nowadays
+  * Take the new man page from the upstream debian package.
+  * Take the new copyright file from upstream debian package.
+  * New d/watch file by Steven De Herdt (Closes: #844005)
+  * New d/p/system-wide_minizip to not use the embeeded minizip
+    (provided by upstream developpers)
+  * d/control: Bump standards-version to 3.9.8 (remove menu file)
+
+ -- Martin Quinson <mquinson@xxxxxxxxxx>  Sat, 19 Nov 2016 18:36:01 +0100
+
 widelands (1:18-3widelands1) UNRELEASED; urgency=medium
 
   * Merged Debian packaging of Widelands 1:18-3. Remaining changes:

=== modified file 'debian/control'
--- debian/control	2016-07-22 10:08:28 +0000
+++ debian/control	2016-11-20 12:32:08 +0000
@@ -5,11 +5,14 @@
 Uploaders: 
   Martin Quinson <mquinson@xxxxxxxxxx>,
   Enrico Tassi <gareuselesinge@xxxxxxxxxx> 
-Standards-Version: 3.9.5
+Standards-Version: 3.9.8
 Build-Depends: debhelper (>= 9), 
   cmake, 
   doxygen, 
   imagemagick,
+# This package isn't available in older Ubuntu releases.
+# As long as we support 14.04, we build using the embedded one.
+#  libminizip-dev,
   libboost-dev, 
   libboost-regex-dev, 
   libboost-test-dev, 
@@ -20,11 +23,11 @@
   libsdl2-mixer-dev, 
   libsdl2-net-dev, 
   libsdl2-ttf-dev, 
-  python, 
+  python,
   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
+Vcs-Git: https://anonscm.debian.org/git/pkg-games/widelands.git
+Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-games/widelands.git
+#Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/widelands/ <-- Location of old packaging
 Homepage: http://www.widelands.org/
 
 Package: widelands
@@ -32,7 +35,13 @@
 Depends: widelands-data (= ${source:Version}), 
   ${shlibs:Depends}, 
   ${misc:Depends}, 
-  fonts-freefont-ttf, fonts-dejavu-core, fonts-dejavu-extra,
+  fonts-freefont-ttf,
+  fonts-dejavu-core,
+  fonts-dejavu-extra,
+  fonts-hosny-amiri,
+  fonts-lklug-sinhala,
+  fonts-nakula,
+  fonts-wqy-microhei,
 Description: fantasy real-time strategy game
  Widelands is a strategy game aiming for gameplay similar to Settlers II by
  BlueByte.

=== modified file 'debian/copyright'
--- debian/copyright	2016-01-28 06:12:20 +0000
+++ debian/copyright	2016-11-20 12:32:08 +0000
@@ -24,52 +24,24 @@
 
 Files: src/third_party/eris/*
 Copyright: 2013 Florian Nücke, 1994–2013 Lua.org, PUC-Rio.
-License:
-Eris
-Copyright (c) 2013 Florian Nücke.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
------------------------------------------------------------------------------
-
-Lua 5.2.2 from http://www.lua.org/ with patches http://www.lua.org/bugs.html
-slightly modified to access internal library functions for persistence.
-
-Copyright © 1994–2013 Lua.org, PUC-Rio.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+License: Eris
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
 
 Files: src/third_party/minizip/*
 Copyright 1995-2013 Jean-loup Gailly and Mark Adler.
@@ -100,23 +72,7 @@
 
 Files: data/i18n/fonts/Culmus/*
 Copyright: 2010 by Yoram Gnat (gyoramg@xxxxxxxxxxxxxxxxxxxxx).
-License: This package is distributed under the terms of GNU General Public License
-version 2 (see file GNU-GPL).
----------------------------------------------------------------------
-
-"Taamey Frank CLM" fonts are copyright (C) 2010 by Yoram Gnat
-(gyoramg@xxxxxxxxxxxxxxxxxxxxx). All rights reserved.
-
-As a special exception, if you create a document which uses
-this font, and embed this font or unaltered portions of this
-font into the document, this font does not by itself cause
-the resulting document to be covered by the
-GNU General Public License. This exception does not however
-invalidate any other reasons why the document might be covered
-by the GNU General Public License. If you modify this font,
-you may extend this exception to your version of the font,
-but you are not obligated to do so. If you do not wish to do so,
-delete this exception statement from your version.
+License: GPL-2+
 
 Files: data/i18n/fonts/Nakula/*
 Copyright: Nakula Devanagari font © 2006 University of Cambridge. Designed and developed by  IMRC, India. Latin and Cyrillic glyphs from the font Nimbus Roman No9 L Regular, © 1999 (URW)++ Design & Development; Cyrillic glyphs by Valek Filippov © 2001-2002.
@@ -369,7 +325,6 @@
 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 BITSTREAM OR THE GNOME FOUNDATION 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.
 Except as contained in this notice, the names of Gnome, the Gnome Foundation, and Bitstream Inc., shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Font Software without prior written authorization from the Gnome Foundation or Bitstream Inc., respectively. For further information, contact: fonts at gnome dot org.
 
-
 Files: data/i18n/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)

=== modified file 'debian/patches/dbg_symbols'
--- debian/patches/dbg_symbols	2016-07-22 09:52:51 +0000
+++ debian/patches/dbg_symbols	2016-11-20 12:32:08 +0000
@@ -9,12 +9,12 @@
 ===================================================================
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -273,7 +273,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)
+@@ -95,7 +95,7 @@ endif (NOT CMAKE_BUILD_TYPE OR CMAKE_BUI
+ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+   set(WL_DEBUG_FLAGS "-g -DDEBUG")
+ elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
+-  set(WL_OPTIMIZE_FLAGS "-O3")
++  set(WL_OPTIMIZE_FLAGS "-g -O3")
+   set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE")
+ elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
+   set(WL_OPTIMIZE_FLAGS "-O3")

=== modified file 'debian/patches/hurd_PATH_MAX_missing'
--- debian/patches/hurd_PATH_MAX_missing	2016-07-22 09:52:51 +0000
+++ debian/patches/hurd_PATH_MAX_missing	2016-11-20 12:32:08 +0000
@@ -7,8 +7,6 @@
  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 @@
@@ -20,15 +18,13 @@
 +#endif
 +
  FileSystem::FileSystem()
- {
- 	m_root = "";
-Index: b/src/wlapplication.cc
-===================================================================
+    : root_("")
+ {}
 --- a/src/wlapplication.cc
 +++ b/src/wlapplication.cc
 @@ -92,6 +92,10 @@
- #endif
- #endif
+ #include "wui/interactive_player.h"
+ #include "wui/interactive_spectator.h"
  
 +#ifndef PATH_MAX /* This happens, for example on the Hurd architecture */
 + #define PATH_MAX 1024

=== removed file 'debian/patches/mips_gcc_ICE_with-03'
--- debian/patches/mips_gcc_ICE_with-03	2016-07-22 09:52:51 +0000
+++ debian/patches/mips_gcc_ICE_with-03	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-Description: Set compilation level to -02 on mips (it's -03 by default upstream)
- .
- Optimizing further drives gcc nuts and produce ICE.
- .
- https://buildd.debian.org/status/fetch.php?pkg=widelands&arch=mips&ver=1%3A18-1&stamp=1393243179
-Author: Martin Quinson
-Forwarded-Upstream: should be
-
----
- CMakeLists.txt |    6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-Index: b/CMakeLists.txt
-===================================================================
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -264,10 +264,12 @@
-     OUTPUT_VARIABLE WLBUILD_COMPILERVERSION
-   )
-   STRING(REGEX REPLACE ".*(4)\\.(5)\\.([0-9]).*" "\\1.\\2.\\3" WLBUILD_COMPILERVERSION_REP ${WLBUILD_COMPILERVERSION})
--  IF (WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.1" OR WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.2")
--    message("Detected gcc ${WLBUILD_COMPILERVERSION_REP}")
-+  IF (WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.1" OR WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.2" OR PROCESSOR_ARCHITECTURE STREQUAL "mips64" OR PROCESSOR_ARCHITECTURE STREQUAL "mips")
-+    message("Detected gcc ${WLBUILD_COMPILERVERSION_REP} on ${PROCESSOR_ARCHITECTURE}")
-     message("Suffering from gcc bug, disabling -O3")
-     set (WL_COMPILERFLAG_OPTIMIZATIONS "-O2")
-+  else (WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.1" OR WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.2" OR PROCESSOR_ARCHITECTURE STREQUAL "mips64" OR PROCESSOR_ARCHITECTURE STREQUAL "mips")
-+    message("Detected architecture: ${PROCESSOR_ARCHITECTURE}")
-   ENDIF (WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.1" OR WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.2")
- ENDIF (CMAKE_COMPILER_IS_GNUCXX)
- 

=== removed file 'debian/patches/s390_new_architecture'
--- debian/patches/s390_new_architecture	2016-07-22 09:52:51 +0000
+++ debian/patches/s390_new_architecture	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-Description: Port the game to the s390 architecture
-Forwarded-Upstream: should be
-
----
- src/logic/widelands.h |   20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
-
-Index: b/src/logic/widelands.h
-===================================================================
---- 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__) && !defined(__s390x__))
-+	explicit _Index(uintptr_t  const I)
-+		: i(static_cast<value_t>(I))
-+	{
-+		assert(I < std::numeric_limits<value_t>::max());
-+	}
-+#endif
- 
- 	/// For compatibility with old code that use int32_t for building index
- 	/// and use -1 to indicate invalidity.
-@@ -116,6 +123,17 @@
- 	value_t i;
- };
- 
-+#if (defined(__s390__) && !defined(__s390x__)) 
-+#define DEFINE_INDEX(NAME)                                                    \
-+   struct NAME : public _Index<NAME> {                                        \
-+      NAME(NAME const & other = Null()) : _Index<NAME>(other) {}              \
-+      explicit NAME(value_t const I) : _Index<NAME>(I) {}                     \
-+      explicit NAME(size_t  const I) : _Index<NAME>(I) {}                     \
-+      explicit NAME(int32_t const I) __attribute__((deprecated));             \
-+      explicit NAME(uintptr_t  const I) : _Index<NAME>(I) {}                  \
-+   };                                                                         \
-+
-+#else
- #define DEFINE_INDEX(NAME)                                                    \
-    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));             \
-    };                                                                         \
- 
-+#endif /* s390 architecture */
-+
- DEFINE_INDEX(Building_Index)
- DEFINE_INDEX(Ware_Index)
- 

=== modified file 'debian/patches/series'
--- debian/patches/series	2016-07-22 09:52:51 +0000
+++ debian/patches/series	2016-11-20 12:32:08 +0000
@@ -0,0 +1,5 @@
+# mips_gcc_ICE_with-03
+# s390_new_architecture
+# system-wide_minizip
+# hurd_PATH_MAX_missing
+# dbg_symbols

=== modified file 'debian/rules'
--- debian/rules	2016-07-23 12:10:37 +0000
+++ debian/rules	2016-11-20 12:32:08 +0000
@@ -14,7 +14,9 @@
 	CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 	  dh_auto_configure -Scmake -- \
 		-DWL_INSTALL_BASEDIR=/usr/share/games/widelands \
+		-DWL_INSTALL_BINDIR=games \
 		-DWL_INSTALL_DATADIR=/usr/share/games/widelands/data \
+		-DWL_INSTALL_PREFIX=/usr \
 		-DOPTION_USE_GLBINDING:BOOL=OFF \
 		-DCMAKE_BUILD_TYPE=Release
 
@@ -23,12 +25,25 @@
 
 override_dh_auto_install:
 	dh_auto_install --parallel
-	mkdir -p debian/tmp/usr/share/applications/
+	mkdir -p  debian/tmp/usr/share/applications/
 	cp debian/widelands.desktop debian/tmp/usr/share/applications/
-	# Probably need to remove other duplicated license files in data/i18n/fonts
+	# Take care of the fonts (use system-wide ones)
+	# Not doing so would violate the Debian Policy, preventing the package to enter the official repositories
+	# Skip this part for our packages, since we use the embedded fonts :/
+	# rm -r debian/tmp/usr/share/games/widelands/data/i18n/fonts/amiri
+	# ln -s /usr/share/fonts/opentype/fonts-hosny-amiri debian/tmp/usr/share/games/widelands/data/i18n/fonts
+	# rm -r debian/tmp/usr/share/games/widelands/data/i18n/fonts/DejaVu
+	# ln -s /usr/share/fonts/truetype/dejavu debian/tmp/usr/share/games/widelands/data/i18n/fonts/DejaVu
+	# rm -r debian/tmp/usr/share/games/widelands/data/i18n/fonts/MicroHei
+	# ln -s /usr/share/fonts/truetype/wqy debian/tmp/usr/share/games/widelands/data/i18n/fonts/MicroHei
+	# rm -r debian/tmp/usr/share/games/widelands/data/i18n/fonts/Nakula
+	# ln -s /usr/share/fonts/truetype/Nakula debian/tmp/usr/share/games/widelands/data/i18n/fonts
+	# rm -r debian/tmp/usr/share/games/widelands/data/i18n/fonts/Sinhala
+	# ln -s /usr/share/fonts/truetype/sinhala debian/tmp/usr/share/games/widelands/data/i18n/fonts/Sinhala
+	# Remove the licenses that are included in debian/copyright
+	rm debian/tmp/usr/share/games/widelands/data/i18n/fonts/Culmus/LICENSE
 	rm debian/tmp/usr/share/games/widelands/data/i18n/fonts/Widelands/LICENSE
-	# Do not include the GPL-2 license file again to keep lintian happy
-	# (but the file is listed from the user interface, so dont kill it completely)
+	# The GPL-2 license is listed from the user interface, so dont kill it completely
 	# (we cannot patch the user interface because that's in a translated text)
 	if cmp --quiet debian/tmp/usr/share/games/widelands/COPYING /usr/share/common-licenses/GPL-2 ; then \
 	  rm debian/tmp/usr/share/games/widelands/COPYING; \
@@ -42,11 +57,22 @@
 	# Take care of the logo
 	for size in 16 32 48 64 128 ; do \
 	  mkdir -p debian/tmp/usr/share/icons/hicolor/$${size}x$${size}/apps ; \
-	  cp debian/tmp/usr/share/games/widelands/data/images/logos/wl-ico-$${size}.png \
+	  cp ./debian/tmp/usr/share/games/widelands/data/images/logos/wl-ico-$${size}.png \
 	     debian/tmp/usr/share/icons/hicolor/$${size}x$${size}/apps/widelands.png; \
 	done
 	convert debian/tmp/usr/share/icons/hicolor/32x32/apps/widelands.png \
 	        debian/tmp/usr/share/icons/hicolor/32x32/apps/widelands.xpm
+	# Remove binaries that are not intended for the user (according to SirVer)
+	# We want all binaries for our PPA...
+	# for b in wl_map_info wl_map_object_info wl_render_richtext ; do \
+	#  rm debian/tmp/usr/$${b} ;\
+	# done
+	# Move the main binary to the right location (no idea why it's misplaced)
+	# ... but we want to place them in the right location so that the .install files work
+	mkdir debian/tmp/usr/games
+	for b in wl_map_info wl_map_object_info wl_render_richtext widelands ; do \
+	  mv debian/tmp/usr/$${b} debian/tmp/usr/games ;\
+	done
 	# appdata
 	mkdir -p debian/tmp/usr/share/appdata/
 	cp debian/widelands.appdata.xml debian/tmp/usr/share/appdata/
@@ -54,3 +80,6 @@
 override_dh_install:
 	dh_install --fail-missing
 
+# TODO need to figure out what this does
+get-orig-source:
+	uscan --verbose --force-download

=== modified file 'debian/watch'
--- debian/watch	2016-01-22 07:20:01 +0000
+++ debian/watch	2016-11-20 12:32:08 +0000
@@ -1,7 +1,7 @@
 # test this watch file using:
 # uscan --watchfile debian/watch --upstream-version 0.0.1 --package widelands
 #
-version=3
-opts="uversionmangle=s/^/build/,uversionmangle=s/-rc$/~rc/,dversionmangle=s/^1://" \
-https://launchpad.net/widelands/+download https://launchpad.net/widelands/.*/widelands-(.*)-src\.tar\.bz2
-
+version=4
+opts="uversionmangle=s/-rc/~rc/,dversionmangle=s/^1://" \
+https://launchpad.net/widelands/+download \
+https://launchpad.net/widelands/.*/widelands-(?:b[[:alpha:]]*)?(\d[^\s/]*)-src\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)

=== modified file 'debian/widelands-data.install'
--- debian/widelands-data.install	2016-01-22 07:20:01 +0000
+++ debian/widelands-data.install	2016-11-20 12:32:08 +0000
@@ -1,1 +1,2 @@
 usr/share/games
+usr/share/appdata/widelands.appdata.xml

=== modified file 'debian/widelands.appdata.xml'
--- debian/widelands.appdata.xml	2016-11-20 09:44:45 +0000
+++ debian/widelands.appdata.xml	2016-11-20 12:32:08 +0000
@@ -8,14 +8,14 @@
   <summary>A real-time build-up strategy game</summary>
   <summary xml:lang="bg">Стратегическа игра за изграждане на цивилизация в реално време</summary>
   <summary xml:lang="ca">Un joc d'estratègia i construcció a temps real </summary>
-  <summary xml:lang="cs">Real-time budovatelská strategická hra</summary>
+  <summary xml:lang="cs">Real-time budovací strategická hra</summary>
   <summary xml:lang="da">Et realtids opbygningsstrategispil</summary>
   <summary xml:lang="de">Echtzeitbasiertes Aufbau-Strategiespiel</summary>
   <summary xml:lang="es">Un juego de estrategia y construcción en tiempo real</summary>
   <summary xml:lang="eu">Denbora errealeko eraikuntza eta estrategia jokoa</summary>
   <summary xml:lang="fi">Reaaliaikainen strategiapeli</summary>
   <summary xml:lang="fr">Un jeu de stratégie et de construction en temps réel </summary>
-  <summary xml:lang="gd">Geama ro-innleachd togail fìor-ama</summary>
+  <summary xml:lang="gd">Geama ro-innleachd togail fìor-ùine</summary>
   <summary xml:lang="hu">Egy valós idejű, építkezős stratégiai játék</summary>
   <summary xml:lang="it">Un gioco di costruzione e strategia in tempo reale</summary>
   <summary xml:lang="la">Ludus strategicae exstructionis in tempore vero</summary>
@@ -47,10 +47,10 @@
       El Widelands ofereix un mode d'un sol jugador amb campanyes que narren les històries de les tribus i la seva lluita en l'univers del Widelands. No obstant, els modes multijugador, a través d'Internet o xarxa LAN, són més interessants: permeten construir imperis junts o enfrontar-vos fins que només quedi pols. El Widelands també disposa d'una intel·ligència artificial que fa les partides més interessants.
     </p>
     <p xml:lang="cs">
-      Jsi vladařem malého kmenu. Tvým úkolem je postavit a dále budovat svou osadu. Každý člen tvého kmenu hraje svou roli ve výrobě surovin a dalším růstu.
+      Stanete se vůdcem malého klanu. Vašim úkolem je vybudovat prosperující osídlení. Každý člen Vašeho klanu přispěje svým dílem k vytváření zdrojů a dalšímu růstu.
     </p>
     <p xml:lang="cs">
-      Widelands nabízí hru jednoho hráče s kamapní, která vyprávý příběhy kmenů a jejich boj o přežití ve vesmíru Widelands. Nicméně, pravá zábava je, když spolu s kamarády přes internet nebo LAN budujete své říše - nebo když bojujete mezi sebou abyste druhého rozdrtili na prach. Widelands má také umělou inteligenci, se kterou můžete soupeřit.
+      Widelands nabízí mód jednoho hráče a kampaněmi, které vyprávějí příběhy klanů a jejich zápasu ve vesmíru Widelands. Opravdová zábava ale začíná až po spojení s přáteli přes internet nebo LAN a budování společných říší - nebo při vzájemném zápasu a rozdrcení nepřátel v prach. Ve Widelands můžete také k zápasu vyzvat umělou inteligenci.
     </p>
     <p xml:lang="da">
       Du er leder af en lille klan. Din opgave er at opbygge en stadig voksende bebyggelse. Hvert medlem af din klan vil udføre sin del for at fremstille flere ressourcer til understøttelse af denne vækst.
@@ -180,6 +180,7 @@
   <url type="homepage">https://wl.widelands.org/</url>
   <update_contact>widelands-dev_at_lists.launchpad.net</update_contact>
   <releases>
+    <release date="2016-11-11" version="Build 19"/>
     <release date="2014-02-22" version="Build 18"/>
     <release date="2012-04-23" version="Build 17"/>
     <release date="2011-04-15" version="Build 16"/>

=== modified file 'debian/widelands.desktop'
--- debian/widelands.desktop	2016-11-20 09:44:45 +0000
+++ debian/widelands.desktop	2016-11-20 12:32:08 +0000
@@ -1,6 +1,5 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
 Type=Application
 Name=Widelands
 GenericName=Strategy Game

=== modified file 'debian/widelands.install'
--- debian/widelands.install	2016-09-16 16:31:32 +0000
+++ debian/widelands.install	2016-11-20 12:32:08 +0000
@@ -1,7 +1,3 @@
-usr/widelands usr/games
-usr/wl_map_info usr/games
-usr/wl_map_object_info usr/games
-usr/wl_render_richtext usr/games
-usr/share/appdata
+usr/games
 usr/share/applications
-usr/share/icons
+usr/share/icons
\ No newline at end of file

=== removed file 'debian/widelands.menu'
--- debian/widelands.menu	2016-01-22 07:20:01 +0000
+++ debian/widelands.menu	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-?package(widelands):\
-	needs="X11" \
-	section="Games/Strategy" \
-	title="widelands" \
-	longtitle="Fantasy real-time strategy game" \
-	command="/usr/games/widelands" \
-	icon="/usr/share/icons/hicolor/32x32/apps/widelands.xpm"