Merge lp:~hjd/widelands/packaging-19-repack-6 into lp:widelands

Proposed by Hans Joachim Desserud
Status: Merged
Merged at revision: 8975
Proposed branch: lp:~hjd/widelands/packaging-19-repack-6
Merge into: lp:widelands
Diff against target: 503 lines (+163/-209)
8 files modified
debian/changelog (+63/-0)
debian/control (+1/-1)
debian/copyright (+91/-203)
debian/gbp.conf (+2/-0)
debian/patches/series (+1/-0)
debian/rules (+1/-1)
debian/widelands.appdata.xml (+2/-2)
debian/widelands.appdata.xml.stub (+2/-2)
To merge this branch: bzr merge lp:~hjd/widelands/packaging-19-repack-6
Reviewer Review Type Date Requested Status
GunChleoc Approve
Klaus Halfmann review Approve
Review via email: mp+359393@code.launchpad.net

Commit message

Merging in the latest changes from the packaging in Debian.

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

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Hans Joachim Desserud (hjd) wrote :

Added a couple of in-line comments.

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4290. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/459450558.
Appveyor build 4084. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_hjd_widelands_packaging_19_repack_6-4084.

Revision history for this message
GunChleoc (gunchleoc) wrote :

I have enabled Disco in the dailies now, because we will want to support it.

Some of the changes in appdata.xml need reverting. BTW these changes would be overwritten anyway, because we have a stub file so that we can automatically pull and insert translations from Transifex.

8941. By Hans Joachim Desserud

Merged latest trunk

8942. By Hans Joachim Desserud

Removed deprecated Applications category from desktop file

8943. By Hans Joachim Desserud

Updated appdata: enable content_rating

8944. By Hans Joachim Desserud

Updated appdata: added icon

Revision history for this message
Hans Joachim Desserud (hjd) wrote :

Re-added the commented part, and documented them in the changelog. I wasn't aware some of them were done intentionally. With them listed in the changelog it should be easier to avoid similar mistakes in the future and hopefully they can be added to Debian when the next release happens, further reducing the delta.

Revision history for this message
GunChleoc (gunchleoc) wrote :

Thanks!

I did not work on my Ubuntu without the extra <icon>. The Appdata spec doesn't seem to be 100% stable yet, so I'll rather err on the side of caution.

@bunnybot merge

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4325. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/467358463.
Appveyor build 4120. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_hjd_widelands_packaging_19_repack_6-4120.

Revision history for this message
bunnybot (widelandsofficial) wrote :

Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways.

Travis build 4325. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/467358463.

8945. By Hans Joachim Desserud

Merged latest master

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4345. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/469120403.
Appveyor build 4139. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_hjd_widelands_packaging_19_repack_6-4139.

8946. By Hans Joachim Desserud

Merged latest trunk. Should work better now that trunk is green again on Travis

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4356. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/470934295.
Appveyor build 4150. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_hjd_widelands_packaging_19_repack_6-4150.

8947. By Hans Joachim Desserud

... and merge trunk once again to unbreak appveyor

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4360. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/471615611.
Appveyor build 4154. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_hjd_widelands_packaging_19_repack_6-4154.

8948. By Hans Joachim Desserud

Remerge trunk again. Resolve conflict

8949. By Hans Joachim Desserud

Fix up merge conflict. Looks like these were removed after all

Revision history for this message
Klaus Halfmann (klaus-halfmann) wrote :

Now what is the status of this branch?

The chages look validd for me, but I
* have no Debian system around ATM
* I would not know what to test anyway

review: Approve (review)
Revision history for this message
GunChleoc (gunchleoc) wrote :

The changes made to debian/widelands.appdata.xml need to be made in debian/widelands.appdata.xml.stub instead, because they would be overwritten by translation updates.

It's just a reordering though, so I'll leave it up to hjd whether he wants this changed or not.

review: Approve
8950. By Hans Joachim Desserud

Merge latest trunk

8951. By Hans Joachim Desserud

Remerge trunk

8952. By Hans Joachim Desserud

Also apply appdata reorder in the stub file to avoid overwriting changes next time translations are pulled in

Revision history for this message
GunChleoc (gunchleoc) wrote :

@bunnybot merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2017-11-27 17:35:31 +0000
+++ debian/changelog 2019-02-09 19:02:16 +0000
@@ -1,3 +1,66 @@
1widelands (1:19+repack-6widelands1) UNRELEASED; urgency=medium
2
3 * Changed build dependencies:
4 - New build dependencies required:
5 libboost-system-dev
6 - No longer needed:
7 libsdl2-net-dev
8 - Also dropped version-specific glew alternative.
9 1.6 doesn't seem to be around anymore and the versionless one
10 seems to work across the different distro releases we build for
11 * Build with ASAN disabled since parts of the code atm breaks
12 * Various minor typo and whitespace fixes
13 * Removed deprecated Applications category from desktop file
14 * Updated appdata: enable content_rating
15 * Updated appdata: added icon
16 * Additional translations for appdata and desktop file.
17 * Update copyright year from 2013 to 2018.
18 * Merged Debian packaging of Widelands 1:19+repack-6. Remaining changes:
19 - Revert debhelper/compat level to 9. (Ubuntu 14.04 doesn't have debhelper 10.)
20 - Disabled all Debian-patches since applying them might cause conflicts as
21 development moves along in latest trunk. They mostly concern
22 architectures which we don't have access to build/test with normally, so
23 they would be hard to maintain.
24 - Dropped patches:
25 gcc7
26 (Already applied in trunk)
27 system-wide_minizip
28 (Should be included in trunk once we iron out the remaining bugs)
29 widelands_ICU_63.1
30 (Already applied in trunk)
31 - Build using embedded minizip since we support older Ubuntu releases where
32 the package is not available.
33 - .stub-files to make widelands.desktop and appdata localizable.
34 - Re-added font entries to copyright file, since we will most likely be using
35 the embedded fonts.
36 - Modified rules to use our embedded fonts and install all binaries.
37 - Comment out get-orig-source. We just want to build current trunk
38
39 -- Widelands <widelands-dev@lists.launchpad.net> Sun, 25 Nov 2018 12:06:04 +0100
40
41widelands (1:19+repack-6) unstable; urgency=medium
42
43 * Team upload.
44 * Fix FTBFS with ICU 63.1.
45 Thanks to László Böszörményi (GCS) for the report and patch.
46 (Closes: #913513)
47
48 -- Markus Koschany <apo@debian.org> Sat, 17 Nov 2018 18:35:44 +0100
49
50widelands (1:19+repack-5) unstable; urgency=medium
51
52 [ Jeremy Bicha ]
53 * Team upload.
54 * Use hicolor theme icon for .desktop (Closes: #857644) (LP: #1789023)
55 * Add minimal debian/gbp.conf
56
57 [ Markus Koschany ]
58 * Switch to compat level 11.
59 * Declare compliance with Debian Policy 4.2.1.
60 * d/control: Change priority from extra to optional.
61
62 -- Markus Koschany <apo@debian.org> Sun, 09 Sep 2018 22:10:46 +0200
63
1widelands (1:19+repack-4widelands1) UNRELEASED; urgency=medium64widelands (1:19+repack-4widelands1) UNRELEASED; urgency=medium
265
3 * Changed build dependencies:66 * Changed build dependencies:
467
=== modified file 'debian/control'
--- debian/control 2017-08-26 09:24:28 +0000
+++ debian/control 2019-02-09 19:02:16 +0000
@@ -1,6 +1,6 @@
1Source: widelands1Source: widelands
2Section: games2Section: games
3Priority: extra3Priority: optional
4Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>4Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
5Uploaders:5Uploaders:
6 Martin Quinson <mquinson@debian.org>,6 Martin Quinson <mquinson@debian.org>,
77
=== modified file 'debian/copyright'
--- debian/copyright 2017-03-12 11:22:07 +0000
+++ debian/copyright 2019-02-09 19:02:16 +0000
@@ -1,26 +1,10 @@
1Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/1Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
2Upstream-Name: widelands2Upstream-Name: widelands
3Source: http://www.widelands.org/3Source: http://www.widelands.org/
44
5Files: *5Files: *
6Copyright: 2002-2013 by the Widelands Development Team6Copyright: 2002-2018 by the Widelands Development Team
7License: GPL-2+7License: GPL-2+
8 This program is free software; you can redistribute it and/or
9 modify it under the terms of the GNU General Public License
10 as published by the Free Software Foundation; either version 2
11 of the License, or (at your option) any later version.
12 .
13 This program is distributed in the hope that it will be useful,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 GNU General Public License for more details.
17 .
18 You should have received a copy of the GNU General Public License
19 along with this program; if not, write to the Free Software
20 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
21 .
22 On Debian systems, the complete text of the GNU General Public
23 License version 2 can be found in "/usr/share/common-licenses/GPL-2".
248
25Files: src/third_party/eris/*9Files: src/third_party/eris/*
26Copyright: 2013 Florian Nücke, 1994–2013 Lua.org, PUC-Rio.10Copyright: 2013 Florian Nücke, 1994–2013 Lua.org, PUC-Rio.
@@ -76,10 +60,7 @@
7660
77Files: data/i18n/fonts/Nakula/*61Files: data/i18n/fonts/Nakula/*
78Copyright: 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.62Copyright: 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.
79License:63License: GPL-2+
80These 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.
81
82These 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.
8364
84Files: data/i18n/fonts/Sinhala/*65Files: data/i18n/fonts/Sinhala/*
85Copyright: 2004,2008 Anuradha Ratnaweera and Harshani Devadithya, 2006 Harshula Jayasuriya, 1994, The Wellcome Trust, London66Copyright: 2004,2008 Anuradha Ratnaweera and Harshani Devadithya, 2006 Harshula Jayasuriya, 1994, The Wellcome Trust, London
@@ -230,89 +211,7 @@
230211
231Files: data/i18n/fonts/*mmrCensus*212Files: data/i18n/fonts/*mmrCensus*
232Copyright: SIG, http://www.myanmarlanguage.org/site-info/SIG-Myanmar-Language213Copyright: SIG, http://www.myanmarlanguage.org/site-info/SIG-Myanmar-Language
233License: SIL Open Font License, Version 1.1 (http://scripts.sil.org/OFL)214License: SIL-Open-Font-License
234 PREAMBLE
235 The goals of the Open Font License (OFL) are to stimulate worldwide
236 development of collaborative font projects, to support the font creation
237 efforts of academic and linguistic communities, and to provide a free and
238 open framework in which fonts may be shared and improved in partnership
239 with others.
240 .
241 The OFL allows the licensed fonts to be used, studied, modified and
242 redistributed freely as long as they are not sold by themselves. The
243 fonts, including any derivative works, can be bundled, embedded,
244 redistributed and/or sold with any software provided that any reserved
245 names are not used by derivative works. The fonts and derivatives,
246 however, cannot be released under any other type of license. The
247 requirement for fonts to remain under this license does not apply
248 to any document created using the fonts or their derivatives.
249 .
250 DEFINITIONS
251 "Font Software" refers to the set of files released by the Copyright
252 Holder(s) under this license and clearly marked as such. This may
253 include source files, build scripts and documentation.
254 .
255 "Reserved Font Name" refers to any names specified as such after the
256 copyright statement(s).
257 .
258 "Original Version" refers to the collection of Font Software components as
259 distributed by the Copyright Holder(s).
260 .
261 "Modified Version" refers to any derivative made by adding to, deleting,
262 or substituting -- in part or in whole -- any of the components of the
263 Original Version, by changing formats or by porting the Font Software to a
264 new environment.
265 .
266 "Author" refers to any designer, engineer, programmer, technical
267 writer or other person who contributed to the Font Software.
268 .
269 PERMISSION & CONDITIONS
270 Permission is hereby granted, free of charge, to any person obtaining
271 a copy of the Font Software, to use, study, copy, merge, embed, modify,
272 redistribute, and sell modified and unmodified copies of the Font
273 Software, subject to the following conditions:
274 .
275 1) Neither the Font Software nor any of its individual components,
276 in Original or Modified Versions, may be sold by itself.
277 .
278 2) Original or Modified Versions of the Font Software may be bundled,
279 redistributed and/or sold with any software, provided that each copy
280 contains the above copyright notice and this license. These can be
281 included either as stand-alone text files, human-readable headers or
282 in the appropriate machine-readable metadata fields within text or
283 binary files as long as those fields can be easily viewed by the user.
284 .
285 3) No Modified Version of the Font Software may use the Reserved Font
286 Name(s) unless explicit written permission is granted by the corresponding
287 Copyright Holder. This restriction only applies to the primary font name as
288 presented to the users.
289 .
290 4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
291 Software shall not be used to promote, endorse or advertise any
292 Modified Version, except to acknowledge the contribution(s) of the
293 Copyright Holder(s) and the Author(s) or with their explicit written
294 permission.
295 .
296 5) The Font Software, modified or unmodified, in part or in whole,
297 must be distributed entirely under this license, and must not be
298 distributed under any other license. The requirement for fonts to
299 remain under this license does not apply to any document created
300 using the Font Software.
301 .
302 TERMINATION
303 This license becomes null and void if any of the above conditions are
304 not met.
305 .
306 DISCLAIMER
307 THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
308 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
309 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
310 OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
311 COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
312 INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
313 DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
314 FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
315 OTHER DEALINGS IN THE FONT SOFTWARE.
316215
317Files: data/i18n/fonts/DejaVu/*216Files: data/i18n/fonts/DejaVu/*
318Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is a trademark of Bitstream, Inc.217Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is a trademark of Bitstream, Inc.
@@ -327,92 +226,10 @@
327226
328Files: data/i18n/fonts/Widelands/Widelands.ttf227Files: data/i18n/fonts/Widelands/Widelands.ttf
329Copyright: 2006-2010, Peter Schwanemann (Peter (AT) drehatlas (DOT) de)228Copyright: 2006-2010, Peter Schwanemann (Peter (AT) drehatlas (DOT) de)
330License: SIL Open Font License, Version 1.1 (http://scripts.sil.org/OFL)229License: SIL-Open-Font-License
331 PREAMBLE
332 The goals of the Open Font License (OFL) are to stimulate worldwide
333 development of collaborative font projects, to support the font creation
334 efforts of academic and linguistic communities, and to provide a free and
335 open framework in which fonts may be shared and improved in partnership
336 with others.
337 .
338 The OFL allows the licensed fonts to be used, studied, modified and
339 redistributed freely as long as they are not sold by themselves. The
340 fonts, including any derivative works, can be bundled, embedded,
341 redistributed and/or sold with any software provided that any reserved
342 names are not used by derivative works. The fonts and derivatives,
343 however, cannot be released under any other type of license. The
344 requirement for fonts to remain under this license does not apply
345 to any document created using the fonts or their derivatives.
346 .
347 DEFINITIONS
348 "Font Software" refers to the set of files released by the Copyright
349 Holder(s) under this license and clearly marked as such. This may
350 include source files, build scripts and documentation.
351 .
352 "Reserved Font Name" refers to any names specified as such after the
353 copyright statement(s).
354 .
355 "Original Version" refers to the collection of Font Software components as
356 distributed by the Copyright Holder(s).
357 .
358 "Modified Version" refers to any derivative made by adding to, deleting,
359 or substituting -- in part or in whole -- any of the components of the
360 Original Version, by changing formats or by porting the Font Software to a
361 new environment.
362 .
363 "Author" refers to any designer, engineer, programmer, technical
364 writer or other person who contributed to the Font Software.
365 .
366 PERMISSION & CONDITIONS
367 Permission is hereby granted, free of charge, to any person obtaining
368 a copy of the Font Software, to use, study, copy, merge, embed, modify,
369 redistribute, and sell modified and unmodified copies of the Font
370 Software, subject to the following conditions:
371 .
372 1) Neither the Font Software nor any of its individual components,
373 in Original or Modified Versions, may be sold by itself.
374 .
375 2) Original or Modified Versions of the Font Software may be bundled,
376 redistributed and/or sold with any software, provided that each copy
377 contains the above copyright notice and this license. These can be
378 included either as stand-alone text files, human-readable headers or
379 in the appropriate machine-readable metadata fields within text or
380 binary files as long as those fields can be easily viewed by the user.
381 .
382 3) No Modified Version of the Font Software may use the Reserved Font
383 Name(s) unless explicit written permission is granted by the corresponding
384 Copyright Holder. This restriction only applies to the primary font name as
385 presented to the users.
386 .
387 4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
388 Software shall not be used to promote, endorse or advertise any
389 Modified Version, except to acknowledge the contribution(s) of the
390 Copyright Holder(s) and the Author(s) or with their explicit written
391 permission.
392 .
393 5) The Font Software, modified or unmodified, in part or in whole,
394 must be distributed entirely under this license, and must not be
395 distributed under any other license. The requirement for fonts to
396 remain under this license does not apply to any document created
397 using the Font Software.
398 .
399 TERMINATION
400 This license becomes null and void if any of the above conditions are
401 not met.
402 .
403 DISCLAIMER
404 THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
405 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
406 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
407 OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
408 COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
409 INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
410 DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
411 FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
412 OTHER DEALINGS IN THE FONT SOFTWARE.
413230
414Files: data/tribes/*/*.png231Files: data/tribes/*/*.png
415Copyright: 2002-2013 by the Widelands Development Team232Copyright: 2002-2018 by the Widelands Development Team
416License: GPL-2+233License: GPL-2+
417 The media files of Widelands are distributed under the same license234 The media files of Widelands are distributed under the same license
418 than the game itself. The blender source files are not included in the same235 than the game itself. The blender source files are not included in the same
@@ -424,21 +241,92 @@
424Files: debian/*241Files: debian/*
425Copyright: 2004-2013 Martin Quinson <mquinson@debian.org>242Copyright: 2004-2013 Martin Quinson <mquinson@debian.org>
426License: GPL-2+243License: GPL-2+
427 This package is free software; you can redistribute it and/or modify244
428 it under the terms of the GNU General Public License as published by245License: GPL-2+
429 the Free Software Foundation; either version 2 of the License, or
430 (at your option) any later version.
431 .
432 This package is distributed in the hope that it will be useful,
433 but WITHOUT ANY WARRANTY; without even the implied warranty of
434 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
435 GNU General Public License for more details.
436 .
437 You should have received a copy of the GNU General Public License
438 along with this program. If not, see <http://www.gnu.org/licenses/>
439 .
440 On Debian systems, the complete text of the GNU General246 On Debian systems, the complete text of the GNU General
441 Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".247 Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
442248
443249License: SIL-Open-Font-License
250 PREAMBLE
251 The goals of the Open Font License (OFL) are to stimulate worldwide
252 development of collaborative font projects, to support the font creation
253 efforts of academic and linguistic communities, and to provide a free and
254 open framework in which fonts may be shared and improved in partnership
255 with others.
256 .
257 The OFL allows the licensed fonts to be used, studied, modified and
258 redistributed freely as long as they are not sold by themselves. The
259 fonts, including any derivative works, can be bundled, embedded,
260 redistributed and/or sold with any software provided that any reserved
261 names are not used by derivative works. The fonts and derivatives,
262 however, cannot be released under any other type of license. The
263 requirement for fonts to remain under this license does not apply
264 to any document created using the fonts or their derivatives.
265 .
266 DEFINITIONS
267 "Font Software" refers to the set of files released by the Copyright
268 Holder(s) under this license and clearly marked as such. This may
269 include source files, build scripts and documentation.
270 .
271 "Reserved Font Name" refers to any names specified as such after the
272 copyright statement(s).
273 .
274 "Original Version" refers to the collection of Font Software components as
275 distributed by the Copyright Holder(s).
276 .
277 "Modified Version" refers to any derivative made by adding to, deleting,
278 or substituting -- in part or in whole -- any of the components of the
279 Original Version, by changing formats or by porting the Font Software to a
280 new environment.
281 .
282 "Author" refers to any designer, engineer, programmer, technical
283 writer or other person who contributed to the Font Software.
284 .
285 PERMISSION & CONDITIONS
286 Permission is hereby granted, free of charge, to any person obtaining
287 a copy of the Font Software, to use, study, copy, merge, embed, modify,
288 redistribute, and sell modified and unmodified copies of the Font
289 Software, subject to the following conditions:
290 .
291 1) Neither the Font Software nor any of its individual components,
292 in Original or Modified Versions, may be sold by itself.
293 .
294 2) Original or Modified Versions of the Font Software may be bundled,
295 redistributed and/or sold with any software, provided that each copy
296 contains the above copyright notice and this license. These can be
297 included either as stand-alone text files, human-readable headers or
298 in the appropriate machine-readable metadata fields within text or
299 binary files as long as those fields can be easily viewed by the user.
300 .
301 3) No Modified Version of the Font Software may use the Reserved Font
302 Name(s) unless explicit written permission is granted by the corresponding
303 Copyright Holder. This restriction only applies to the primary font name as
304 presented to the users.
305 .
306 4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
307 Software shall not be used to promote, endorse or advertise any
308 Modified Version, except to acknowledge the contribution(s) of the
309 Copyright Holder(s) and the Author(s) or with their explicit written
310 permission.
311 .
312 5) The Font Software, modified or unmodified, in part or in whole,
313 must be distributed entirely under this license, and must not be
314 distributed under any other license. The requirement for fonts to
315 remain under this license does not apply to any document created
316 using the Font Software.
317 .
318 TERMINATION
319 This license becomes null and void if any of the above conditions are
320 not met.
321 .
322 DISCLAIMER
323 THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
324 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
325 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
326 OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
327 COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
328 INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
329 DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
330 FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
331 OTHER DEALINGS IN THE FONT SOFTWARE.
444332
445333
=== added file 'debian/gbp.conf'
--- debian/gbp.conf 1970-01-01 00:00:00 +0000
+++ debian/gbp.conf 2019-02-09 19:02:16 +0000
@@ -0,0 +1,2 @@
1[DEFAULT]
2pristine-tar = True
03
=== modified file 'debian/patches/series'
--- debian/patches/series 2017-08-26 09:24:28 +0000
+++ debian/patches/series 2019-02-09 19:02:16 +0000
@@ -2,3 +2,4 @@
2# hurd_PATH_MAX_missing2# hurd_PATH_MAX_missing
3# dbg_symbols3# dbg_symbols
4# gcc7.patch4# gcc7.patch
5# widelands_ICU_63.1.patch
56
=== modified file 'debian/rules'
--- debian/rules 2018-03-02 06:01:51 +0000
+++ debian/rules 2019-02-09 19:02:16 +0000
@@ -7,7 +7,7 @@
7LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)7LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
88
9%:9%:
10 dh $@ $(DH_ARGS) --parallel --buildsystem=cmake10 dh $@ $(DH_ARGS) --buildsystem=cmake
1111
1212
13override_dh_auto_configure:13override_dh_auto_configure:
1414
=== modified file 'debian/widelands.appdata.xml'
--- debian/widelands.appdata.xml 2019-02-03 08:19:12 +0000
+++ debian/widelands.appdata.xml 2019-02-09 19:02:16 +0000
@@ -267,6 +267,8 @@
267 <caption>Map Selection Screen</caption>267 <caption>Map Selection Screen</caption>
268 </screenshot>268 </screenshot>
269 </screenshots>269 </screenshots>
270 <url type="homepage">https://wl.widelands.org/</url>
271 <update_contact>widelands-dev_at_lists.launchpad.net</update_contact>
270 <releases>272 <releases>
271 <release date="2016-11-11" version="Build 19"/>273 <release date="2016-11-11" version="Build 19"/>
272 <release date="2014-02-22" version="Build 18"/>274 <release date="2014-02-22" version="Build 18"/>
@@ -379,13 +381,11 @@
379 <translation type="gettext">tribes</translation>381 <translation type="gettext">tribes</translation>
380 <translation type="gettext">mp_scenario_smugglers.wmf</translation>382 <translation type="gettext">mp_scenario_smugglers.wmf</translation>
381 <translation type="gettext">scenario_fri02.wmf</translation>383 <translation type="gettext">scenario_fri02.wmf</translation>
382 <url type="homepage">https://wl.widelands.org/</url>
383 <url type="bugtracker">https://bugs.launchpad.net/widelands</url>384 <url type="bugtracker">https://bugs.launchpad.net/widelands</url>
384 <url type="donation">https://wl.widelands.org/wiki/The%20Widelands%20Project/</url>385 <url type="donation">https://wl.widelands.org/wiki/The%20Widelands%20Project/</url>
385 <url type="help">https://wl.widelands.org/wiki/Game%20Manual/</url>386 <url type="help">https://wl.widelands.org/wiki/Game%20Manual/</url>
386 <url type="translate">https://wl.widelands.org/wiki/TranslatingWidelands/</url>387 <url type="translate">https://wl.widelands.org/wiki/TranslatingWidelands/</url>
387 <developer_name>The Widelands Development Team</developer_name>388 <developer_name>The Widelands Development Team</developer_name>
388 <update_contact>widelands-dev_at_lists.launchpad.net</update_contact>
389 <content_rating type="oars-1.0">389 <content_rating type="oars-1.0">
390 <content_attribute id="violence-cartoon">moderate</content_attribute>390 <content_attribute id="violence-cartoon">moderate</content_attribute>
391 <content_attribute id="violence-fantasy">none</content_attribute>391 <content_attribute id="violence-fantasy">none</content_attribute>
392392
=== modified file 'debian/widelands.appdata.xml.stub'
--- debian/widelands.appdata.xml.stub 2018-08-27 09:54:10 +0000
+++ debian/widelands.appdata.xml.stub 2019-02-09 19:02:16 +0000
@@ -28,6 +28,8 @@
28 <caption>Map Selection Screen</caption>28 <caption>Map Selection Screen</caption>
29 </screenshot>29 </screenshot>
30 </screenshots>30 </screenshots>
31 <url type="homepage">https://wl.widelands.org/</url>
32 <update_contact>widelands-dev_at_lists.launchpad.net</update_contact>
31 <releases>33 <releases>
32 <release date="2016-11-11" version="Build 19"/>34 <release date="2016-11-11" version="Build 19"/>
33 <release date="2014-02-22" version="Build 18"/>35 <release date="2014-02-22" version="Build 18"/>
@@ -51,13 +53,11 @@
51 <release date="2002-08-27" version="Build 1"/>53 <release date="2002-08-27" version="Build 1"/>
52 </releases>54 </releases>
53 LANGUAGES_HOOK55 LANGUAGES_HOOK
54 <url type="homepage">https://wl.widelands.org/</url>
55 <url type="bugtracker">https://bugs.launchpad.net/widelands</url>56 <url type="bugtracker">https://bugs.launchpad.net/widelands</url>
56 <url type="donation">https://wl.widelands.org/wiki/The%20Widelands%20Project/</url>57 <url type="donation">https://wl.widelands.org/wiki/The%20Widelands%20Project/</url>
57 <url type="help">https://wl.widelands.org/wiki/Game%20Manual/</url>58 <url type="help">https://wl.widelands.org/wiki/Game%20Manual/</url>
58 <url type="translate">https://wl.widelands.org/wiki/TranslatingWidelands/</url>59 <url type="translate">https://wl.widelands.org/wiki/TranslatingWidelands/</url>
59 <developer_name>The Widelands Development Team</developer_name>60 <developer_name>The Widelands Development Team</developer_name>
60 <update_contact>widelands-dev_at_lists.launchpad.net</update_contact>
61 <content_rating type="oars-1.0">61 <content_rating type="oars-1.0">
62 <content_attribute id="violence-cartoon">moderate</content_attribute>62 <content_attribute id="violence-cartoon">moderate</content_attribute>
63 <content_attribute id="violence-fantasy">none</content_attribute>63 <content_attribute id="violence-fantasy">none</content_attribute>

Subscribers

People subscribed via source and target branches

to status/vote changes: