widelands-dev team mailing list archive

[Hans Joachim Desserud <launchpad@xxxxxxxxxxxx>]

Hans Joachim Desserud has proposed merging lp:~hjd/widelands/packaging-19-repack-6 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~hjd/widelands/packaging-19-repack-6/+merge/359393

Merging in the latest changes from the packaging in Debian.

Simplified copyright file, disabled new patch (already applied in trunk) and overall minor tweaks.

Did a test-run in https://code.launchpad.net/~hjd/+recipe/widelands-test, built successfully for most Ubuntu releases. The only one where it failed was Ubuntu Disco (the current development branch), and it seems this haven't been enabled yet in the daily PPA. Though I doubt it is a regression.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/packaging-19-repack-6 into lp:widelands.

=== modified file 'debian/changelog'
--- debian/changelog	2017-11-27 17:35:31 +0000
+++ debian/changelog	2018-11-25 16:21:32 +0000
@@ -1,3 +1,64 @@
+widelands (1:19+repack-6widelands1) UNRELEASED; urgency=medium
+
+  * Changed build dependencies:
+      - New build dependencies required:
+        libboost-system-dev
+      - No longer needed:
+        libsdl2-net-dev
+      - Also dropped version-specific glew alternative.
+        1.6 doesn't seem to be around anymore and the versionless one
+        seems to work across the different distro releases we build for
+  * Build with ASAN disabled since parts of the code atm breaks
+  * Various minor typo and whitespace fixes
+  * Merged Debian packaging of Widelands 1:19+repack-6. Remaining changes:
+    - Revert debhelper/compat level to 9. (Ubuntu 14.04 doesn't have debhelper 10.)
+    - 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:
+        gcc7 
+          (Already applied in trunk)
+        system-wide_minizip
+          (Should be included in trunk once we iron out the remaining bugs)
+        widelands_ICU_63.1
+          (Already applied in trunk)
+    - Build using embedded minizip since we support older Ubuntu releases where
+      the package is not available.
+    - .stub-files to make widelands.desktop and appdata localizable.
+    - Additional translations for appdata and desktop file.
+    - Re-added font entries to copyright file, since we will most likely be using
+      the embedded fonts.
+    - Update copyright year from 2013 to 2018.
+    - Modified rules to use our embedded fonts and install all binaries.
+    - Comment out get-orig-source. We just want to build current trunk
+
+
+ -- Widelands <widelands-dev@xxxxxxxxxxxxxxxxxxx>  Sun, 25 Nov 2018 12:06:04 +0100
+
+widelands (1:19+repack-6) unstable; urgency=medium
+
+  * Team upload.
+  * Fix FTBFS with ICU 63.1.
+    Thanks to László Böszörményi (GCS) for the report and patch.
+    (Closes: #913513)
+
+ -- Markus Koschany <apo@xxxxxxxxxx>  Sat, 17 Nov 2018 18:35:44 +0100
+
+widelands (1:19+repack-5) unstable; urgency=medium
+
+  [ Jeremy Bicha ]
+  * Team upload.
+  * Use hicolor theme icon for .desktop (Closes: #857644) (LP: #1789023)
+  * Add minimal debian/gbp.conf
+
+  [ Markus Koschany ]
+  * Switch to compat level 11.
+  * Declare compliance with Debian Policy 4.2.1.
+  * d/control: Change priority from extra to optional.
+
+ -- Markus Koschany <apo@xxxxxxxxxx>  Sun, 09 Sep 2018 22:10:46 +0200
+
 widelands (1:19+repack-4widelands1) UNRELEASED; urgency=medium
 
   * Changed build dependencies:

=== modified file 'debian/control'
--- debian/control	2017-08-26 09:24:28 +0000
+++ debian/control	2018-11-25 16:21:32 +0000
@@ -1,6 +1,6 @@
 Source: widelands
 Section: games
-Priority: extra
+Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel@xxxxxxxxxxxxxxxxxxxxxxx>
 Uploaders:
   Martin Quinson <mquinson@xxxxxxxxxx>,

=== modified file 'debian/copyright'
--- debian/copyright	2017-03-12 11:22:07 +0000
+++ debian/copyright	2018-11-25 16:21:32 +0000
@@ -1,26 +1,10 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://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
+Copyright: 2002-2018 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: src/third_party/eris/*
 Copyright: 2013 Florian Nücke, 1994–2013 Lua.org, PUC-Rio.
@@ -76,10 +60,7 @@
 
 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.
-License:
-These fonts are free software; you can redistribute them and/or modify them 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.
-
-These fonts are distributed in the hope that they 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.
+License: GPL-2+
 
 Files: data/i18n/fonts/Sinhala/*
 Copyright: 2004,2008 Anuradha Ratnaweera and Harshani Devadithya, 2006 Harshula Jayasuriya, 1994, The Wellcome Trust, London
@@ -230,89 +211,7 @@
 
 Files: data/i18n/fonts/*mmrCensus*
 Copyright: SIG, http://www.myanmarlanguage.org/site-info/SIG-Myanmar-Language
-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.
+License: SIL-Open-Font-License
 
 Files: data/i18n/fonts/DejaVu/*
 Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is a trademark of Bitstream, Inc.
@@ -327,92 +226,10 @@
 
 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)
- 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.
+License: SIL-Open-Font-License
 
 Files: data/tribes/*/*.png
-Copyright: 2002-2013 by the Widelands Development Team
+Copyright: 2002-2018 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
@@ -424,21 +241,92 @@
 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/>
- .
+
+License: GPL-2+
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
-
+License: SIL-Open-Font-License
+ 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.
 

=== added file 'debian/gbp.conf'
--- debian/gbp.conf	1970-01-01 00:00:00 +0000
+++ debian/gbp.conf	2018-11-25 16:21:32 +0000
@@ -0,0 +1,2 @@
+[DEFAULT]
+pristine-tar = True

=== modified file 'debian/org.widelands.widelands.desktop'
--- debian/org.widelands.widelands.desktop	2018-10-26 05:29:19 +0000
+++ debian/org.widelands.widelands.desktop	2018-11-25 16:21:32 +0000
@@ -76,4 +76,4 @@
 Icon=widelands
 TryExec=widelands
 Exec=widelands
-Categories=Game;StrategyGame;
+Categories=Application;Game;StrategyGame;

=== modified file 'debian/patches/series'
--- debian/patches/series	2017-08-26 09:24:28 +0000
+++ debian/patches/series	2018-11-25 16:21:32 +0000
@@ -2,3 +2,4 @@
 # hurd_PATH_MAX_missing
 # dbg_symbols
 # gcc7.patch
+# widelands_ICU_63.1.patch

=== modified file 'debian/rules'
--- debian/rules	2018-03-02 06:01:51 +0000
+++ debian/rules	2018-11-25 16:21:32 +0000
@@ -7,7 +7,7 @@
 LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 
 %:
-	dh $@ $(DH_ARGS) --parallel --buildsystem=cmake
+	dh $@ $(DH_ARGS) --buildsystem=cmake
 
 
 override_dh_auto_configure:

=== modified file 'debian/widelands.appdata.xml'
--- debian/widelands.appdata.xml	2018-11-02 08:04:23 +0000
+++ debian/widelands.appdata.xml	2018-11-25 16:21:32 +0000
@@ -4,7 +4,6 @@
   <id>org.widelands.widelands.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-2.0</project_license>
-  <icon type="stock">widelands</icon>
   <name>Widelands</name>
   <name xml:lang="ko">와이드랜드</name>
   <summary>A real-time build-up strategy game</summary>
@@ -261,6 +260,8 @@
       <caption>Map Selection Screen</caption>
     </screenshot>
   </screenshots>
+  <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"/>
@@ -373,14 +374,12 @@
   <translation type="gettext">scenario_tutorial02_warfare.wmf</translation>
   <translation type="gettext">mp_scenario_smugglers.wmf</translation>
   <translation type="gettext">map_the_green_plateau.wmf</translation>
-  <url type="homepage">https://wl.widelands.org/</url>
   <url type="bugtracker">https://bugs.launchpad.net/widelands</url>
   <url type="donation">https://wl.widelands.org/wiki/The%20Widelands%20Project/</url>
   <url type="help">https://wl.widelands.org/wiki/Game%20Manual/</url>
   <url type="translate">https://wl.widelands.org/wiki/TranslatingWidelands/</url>
   <developer_name>The Widelands Development Team</developer_name>
-  <update_contact>widelands-dev_at_lists.launchpad.net</update_contact>
-  <content_rating type="oars-1.0">
+  <x-content_rating type="oars-1.0">
     <content_attribute id="violence-cartoon">moderate</content_attribute>
     <content_attribute id="violence-fantasy">none</content_attribute>
     <content_attribute id="violence-realistic">none</content_attribute>
@@ -401,5 +400,5 @@
     <content_attribute id="social-contacts">none</content_attribute>
     <content_attribute id="money-purchasing">none</content_attribute>
     <content_attribute id="money-gambling">none</content_attribute>
-  </content_rating>
+  </x-content_rating>
 </component>