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
1=== modified file 'debian/changelog'
2--- debian/changelog 2017-11-27 17:35:31 +0000
3+++ debian/changelog 2019-02-09 19:02:16 +0000
4@@ -1,3 +1,66 @@
5+widelands (1:19+repack-6widelands1) UNRELEASED; urgency=medium
6+
7+ * Changed build dependencies:
8+ - New build dependencies required:
9+ libboost-system-dev
10+ - No longer needed:
11+ libsdl2-net-dev
12+ - Also dropped version-specific glew alternative.
13+ 1.6 doesn't seem to be around anymore and the versionless one
14+ seems to work across the different distro releases we build for
15+ * Build with ASAN disabled since parts of the code atm breaks
16+ * Various minor typo and whitespace fixes
17+ * Removed deprecated Applications category from desktop file
18+ * Updated appdata: enable content_rating
19+ * Updated appdata: added icon
20+ * Additional translations for appdata and desktop file.
21+ * Update copyright year from 2013 to 2018.
22+ * Merged Debian packaging of Widelands 1:19+repack-6. Remaining changes:
23+ - Revert debhelper/compat level to 9. (Ubuntu 14.04 doesn't have debhelper 10.)
24+ - Disabled all Debian-patches since applying them might cause conflicts as
25+ development moves along in latest trunk. They mostly concern
26+ architectures which we don't have access to build/test with normally, so
27+ they would be hard to maintain.
28+ - Dropped patches:
29+ gcc7
30+ (Already applied in trunk)
31+ system-wide_minizip
32+ (Should be included in trunk once we iron out the remaining bugs)
33+ widelands_ICU_63.1
34+ (Already applied in trunk)
35+ - Build using embedded minizip since we support older Ubuntu releases where
36+ the package is not available.
37+ - .stub-files to make widelands.desktop and appdata localizable.
38+ - Re-added font entries to copyright file, since we will most likely be using
39+ the embedded fonts.
40+ - Modified rules to use our embedded fonts and install all binaries.
41+ - Comment out get-orig-source. We just want to build current trunk
42+
43+ -- Widelands <widelands-dev@lists.launchpad.net> Sun, 25 Nov 2018 12:06:04 +0100
44+
45+widelands (1:19+repack-6) unstable; urgency=medium
46+
47+ * Team upload.
48+ * Fix FTBFS with ICU 63.1.
49+ Thanks to László Böszörményi (GCS) for the report and patch.
50+ (Closes: #913513)
51+
52+ -- Markus Koschany <apo@debian.org> Sat, 17 Nov 2018 18:35:44 +0100
53+
54+widelands (1:19+repack-5) unstable; urgency=medium
55+
56+ [ Jeremy Bicha ]
57+ * Team upload.
58+ * Use hicolor theme icon for .desktop (Closes: #857644) (LP: #1789023)
59+ * Add minimal debian/gbp.conf
60+
61+ [ Markus Koschany ]
62+ * Switch to compat level 11.
63+ * Declare compliance with Debian Policy 4.2.1.
64+ * d/control: Change priority from extra to optional.
65+
66+ -- Markus Koschany <apo@debian.org> Sun, 09 Sep 2018 22:10:46 +0200
67+
68 widelands (1:19+repack-4widelands1) UNRELEASED; urgency=medium
69
70 * Changed build dependencies:
71
72=== modified file 'debian/control'
73--- debian/control 2017-08-26 09:24:28 +0000
74+++ debian/control 2019-02-09 19:02:16 +0000
75@@ -1,6 +1,6 @@
76 Source: widelands
77 Section: games
78-Priority: extra
79+Priority: optional
80 Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
81 Uploaders:
82 Martin Quinson <mquinson@debian.org>,
83
84=== modified file 'debian/copyright'
85--- debian/copyright 2017-03-12 11:22:07 +0000
86+++ debian/copyright 2019-02-09 19:02:16 +0000
87@@ -1,26 +1,10 @@
88-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
89+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
90 Upstream-Name: widelands
91 Source: http://www.widelands.org/
92
93 Files: *
94-Copyright: 2002-2013 by the Widelands Development Team
95+Copyright: 2002-2018 by the Widelands Development Team
96 License: GPL-2+
97- This program is free software; you can redistribute it and/or
98- modify it under the terms of the GNU General Public License
99- as published by the Free Software Foundation; either version 2
100- of the License, or (at your option) any later version.
101- .
102- This program is distributed in the hope that it will be useful,
103- but WITHOUT ANY WARRANTY; without even the implied warranty of
104- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
105- GNU General Public License for more details.
106- .
107- You should have received a copy of the GNU General Public License
108- along with this program; if not, write to the Free Software
109- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
110- .
111- On Debian systems, the complete text of the GNU General Public
112- License version 2 can be found in "/usr/share/common-licenses/GPL-2".
113
114 Files: src/third_party/eris/*
115 Copyright: 2013 Florian Nücke, 1994–2013 Lua.org, PUC-Rio.
116@@ -76,10 +60,7 @@
117
118 Files: data/i18n/fonts/Nakula/*
119 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.
120-License:
121-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.
122-
123-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.
124+License: GPL-2+
125
126 Files: data/i18n/fonts/Sinhala/*
127 Copyright: 2004,2008 Anuradha Ratnaweera and Harshani Devadithya, 2006 Harshula Jayasuriya, 1994, The Wellcome Trust, London
128@@ -230,89 +211,7 @@
129
130 Files: data/i18n/fonts/*mmrCensus*
131 Copyright: SIG, http://www.myanmarlanguage.org/site-info/SIG-Myanmar-Language
132-License: SIL Open Font License, Version 1.1 (http://scripts.sil.org/OFL)
133- PREAMBLE
134- The goals of the Open Font License (OFL) are to stimulate worldwide
135- development of collaborative font projects, to support the font creation
136- efforts of academic and linguistic communities, and to provide a free and
137- open framework in which fonts may be shared and improved in partnership
138- with others.
139- .
140- The OFL allows the licensed fonts to be used, studied, modified and
141- redistributed freely as long as they are not sold by themselves. The
142- fonts, including any derivative works, can be bundled, embedded,
143- redistributed and/or sold with any software provided that any reserved
144- names are not used by derivative works. The fonts and derivatives,
145- however, cannot be released under any other type of license. The
146- requirement for fonts to remain under this license does not apply
147- to any document created using the fonts or their derivatives.
148- .
149- DEFINITIONS
150- "Font Software" refers to the set of files released by the Copyright
151- Holder(s) under this license and clearly marked as such. This may
152- include source files, build scripts and documentation.
153- .
154- "Reserved Font Name" refers to any names specified as such after the
155- copyright statement(s).
156- .
157- "Original Version" refers to the collection of Font Software components as
158- distributed by the Copyright Holder(s).
159- .
160- "Modified Version" refers to any derivative made by adding to, deleting,
161- or substituting -- in part or in whole -- any of the components of the
162- Original Version, by changing formats or by porting the Font Software to a
163- new environment.
164- .
165- "Author" refers to any designer, engineer, programmer, technical
166- writer or other person who contributed to the Font Software.
167- .
168- PERMISSION & CONDITIONS
169- Permission is hereby granted, free of charge, to any person obtaining
170- a copy of the Font Software, to use, study, copy, merge, embed, modify,
171- redistribute, and sell modified and unmodified copies of the Font
172- Software, subject to the following conditions:
173- .
174- 1) Neither the Font Software nor any of its individual components,
175- in Original or Modified Versions, may be sold by itself.
176- .
177- 2) Original or Modified Versions of the Font Software may be bundled,
178- redistributed and/or sold with any software, provided that each copy
179- contains the above copyright notice and this license. These can be
180- included either as stand-alone text files, human-readable headers or
181- in the appropriate machine-readable metadata fields within text or
182- binary files as long as those fields can be easily viewed by the user.
183- .
184- 3) No Modified Version of the Font Software may use the Reserved Font
185- Name(s) unless explicit written permission is granted by the corresponding
186- Copyright Holder. This restriction only applies to the primary font name as
187- presented to the users.
188- .
189- 4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
190- Software shall not be used to promote, endorse or advertise any
191- Modified Version, except to acknowledge the contribution(s) of the
192- Copyright Holder(s) and the Author(s) or with their explicit written
193- permission.
194- .
195- 5) The Font Software, modified or unmodified, in part or in whole,
196- must be distributed entirely under this license, and must not be
197- distributed under any other license. The requirement for fonts to
198- remain under this license does not apply to any document created
199- using the Font Software.
200- .
201- TERMINATION
202- This license becomes null and void if any of the above conditions are
203- not met.
204- .
205- DISCLAIMER
206- THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
207- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
208- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
209- OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
210- COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
211- INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
212- DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
213- FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
214- OTHER DEALINGS IN THE FONT SOFTWARE.
215+License: SIL-Open-Font-License
216
217 Files: data/i18n/fonts/DejaVu/*
218 Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is a trademark of Bitstream, Inc.
219@@ -327,92 +226,10 @@
220
221 Files: data/i18n/fonts/Widelands/Widelands.ttf
222 Copyright: 2006-2010, Peter Schwanemann (Peter (AT) drehatlas (DOT) de)
223-License: SIL Open Font License, Version 1.1 (http://scripts.sil.org/OFL)
224- PREAMBLE
225- The goals of the Open Font License (OFL) are to stimulate worldwide
226- development of collaborative font projects, to support the font creation
227- efforts of academic and linguistic communities, and to provide a free and
228- open framework in which fonts may be shared and improved in partnership
229- with others.
230- .
231- The OFL allows the licensed fonts to be used, studied, modified and
232- redistributed freely as long as they are not sold by themselves. The
233- fonts, including any derivative works, can be bundled, embedded,
234- redistributed and/or sold with any software provided that any reserved
235- names are not used by derivative works. The fonts and derivatives,
236- however, cannot be released under any other type of license. The
237- requirement for fonts to remain under this license does not apply
238- to any document created using the fonts or their derivatives.
239- .
240- DEFINITIONS
241- "Font Software" refers to the set of files released by the Copyright
242- Holder(s) under this license and clearly marked as such. This may
243- include source files, build scripts and documentation.
244- .
245- "Reserved Font Name" refers to any names specified as such after the
246- copyright statement(s).
247- .
248- "Original Version" refers to the collection of Font Software components as
249- distributed by the Copyright Holder(s).
250- .
251- "Modified Version" refers to any derivative made by adding to, deleting,
252- or substituting -- in part or in whole -- any of the components of the
253- Original Version, by changing formats or by porting the Font Software to a
254- new environment.
255- .
256- "Author" refers to any designer, engineer, programmer, technical
257- writer or other person who contributed to the Font Software.
258- .
259- PERMISSION & CONDITIONS
260- Permission is hereby granted, free of charge, to any person obtaining
261- a copy of the Font Software, to use, study, copy, merge, embed, modify,
262- redistribute, and sell modified and unmodified copies of the Font
263- Software, subject to the following conditions:
264- .
265- 1) Neither the Font Software nor any of its individual components,
266- in Original or Modified Versions, may be sold by itself.
267- .
268- 2) Original or Modified Versions of the Font Software may be bundled,
269- redistributed and/or sold with any software, provided that each copy
270- contains the above copyright notice and this license. These can be
271- included either as stand-alone text files, human-readable headers or
272- in the appropriate machine-readable metadata fields within text or
273- binary files as long as those fields can be easily viewed by the user.
274- .
275- 3) No Modified Version of the Font Software may use the Reserved Font
276- Name(s) unless explicit written permission is granted by the corresponding
277- Copyright Holder. This restriction only applies to the primary font name as
278- presented to the users.
279- .
280- 4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
281- Software shall not be used to promote, endorse or advertise any
282- Modified Version, except to acknowledge the contribution(s) of the
283- Copyright Holder(s) and the Author(s) or with their explicit written
284- permission.
285- .
286- 5) The Font Software, modified or unmodified, in part or in whole,
287- must be distributed entirely under this license, and must not be
288- distributed under any other license. The requirement for fonts to
289- remain under this license does not apply to any document created
290- using the Font Software.
291- .
292- TERMINATION
293- This license becomes null and void if any of the above conditions are
294- not met.
295- .
296- DISCLAIMER
297- THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
298- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
299- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
300- OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
301- COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
302- INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
303- DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
304- FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
305- OTHER DEALINGS IN THE FONT SOFTWARE.
306+License: SIL-Open-Font-License
307
308 Files: data/tribes/*/*.png
309-Copyright: 2002-2013 by the Widelands Development Team
310+Copyright: 2002-2018 by the Widelands Development Team
311 License: GPL-2+
312 The media files of Widelands are distributed under the same license
313 than the game itself. The blender source files are not included in the same
314@@ -424,21 +241,92 @@
315 Files: debian/*
316 Copyright: 2004-2013 Martin Quinson <mquinson@debian.org>
317 License: GPL-2+
318- This package is free software; you can redistribute it and/or modify
319- it under the terms of the GNU General Public License as published by
320- the Free Software Foundation; either version 2 of the License, or
321- (at your option) any later version.
322- .
323- This package is distributed in the hope that it will be useful,
324- but WITHOUT ANY WARRANTY; without even the implied warranty of
325- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
326- GNU General Public License for more details.
327- .
328- You should have received a copy of the GNU General Public License
329- along with this program. If not, see <http://www.gnu.org/licenses/>
330- .
331+
332+License: GPL-2+
333 On Debian systems, the complete text of the GNU General
334 Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
335
336-
337+License: SIL-Open-Font-License
338+ PREAMBLE
339+ The goals of the Open Font License (OFL) are to stimulate worldwide
340+ development of collaborative font projects, to support the font creation
341+ efforts of academic and linguistic communities, and to provide a free and
342+ open framework in which fonts may be shared and improved in partnership
343+ with others.
344+ .
345+ The OFL allows the licensed fonts to be used, studied, modified and
346+ redistributed freely as long as they are not sold by themselves. The
347+ fonts, including any derivative works, can be bundled, embedded,
348+ redistributed and/or sold with any software provided that any reserved
349+ names are not used by derivative works. The fonts and derivatives,
350+ however, cannot be released under any other type of license. The
351+ requirement for fonts to remain under this license does not apply
352+ to any document created using the fonts or their derivatives.
353+ .
354+ DEFINITIONS
355+ "Font Software" refers to the set of files released by the Copyright
356+ Holder(s) under this license and clearly marked as such. This may
357+ include source files, build scripts and documentation.
358+ .
359+ "Reserved Font Name" refers to any names specified as such after the
360+ copyright statement(s).
361+ .
362+ "Original Version" refers to the collection of Font Software components as
363+ distributed by the Copyright Holder(s).
364+ .
365+ "Modified Version" refers to any derivative made by adding to, deleting,
366+ or substituting -- in part or in whole -- any of the components of the
367+ Original Version, by changing formats or by porting the Font Software to a
368+ new environment.
369+ .
370+ "Author" refers to any designer, engineer, programmer, technical
371+ writer or other person who contributed to the Font Software.
372+ .
373+ PERMISSION & CONDITIONS
374+ Permission is hereby granted, free of charge, to any person obtaining
375+ a copy of the Font Software, to use, study, copy, merge, embed, modify,
376+ redistribute, and sell modified and unmodified copies of the Font
377+ Software, subject to the following conditions:
378+ .
379+ 1) Neither the Font Software nor any of its individual components,
380+ in Original or Modified Versions, may be sold by itself.
381+ .
382+ 2) Original or Modified Versions of the Font Software may be bundled,
383+ redistributed and/or sold with any software, provided that each copy
384+ contains the above copyright notice and this license. These can be
385+ included either as stand-alone text files, human-readable headers or
386+ in the appropriate machine-readable metadata fields within text or
387+ binary files as long as those fields can be easily viewed by the user.
388+ .
389+ 3) No Modified Version of the Font Software may use the Reserved Font
390+ Name(s) unless explicit written permission is granted by the corresponding
391+ Copyright Holder. This restriction only applies to the primary font name as
392+ presented to the users.
393+ .
394+ 4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
395+ Software shall not be used to promote, endorse or advertise any
396+ Modified Version, except to acknowledge the contribution(s) of the
397+ Copyright Holder(s) and the Author(s) or with their explicit written
398+ permission.
399+ .
400+ 5) The Font Software, modified or unmodified, in part or in whole,
401+ must be distributed entirely under this license, and must not be
402+ distributed under any other license. The requirement for fonts to
403+ remain under this license does not apply to any document created
404+ using the Font Software.
405+ .
406+ TERMINATION
407+ This license becomes null and void if any of the above conditions are
408+ not met.
409+ .
410+ DISCLAIMER
411+ THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
412+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
413+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
414+ OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
415+ COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
416+ INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
417+ DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
418+ FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
419+ OTHER DEALINGS IN THE FONT SOFTWARE.
420
421
422=== added file 'debian/gbp.conf'
423--- debian/gbp.conf 1970-01-01 00:00:00 +0000
424+++ debian/gbp.conf 2019-02-09 19:02:16 +0000
425@@ -0,0 +1,2 @@
426+[DEFAULT]
427+pristine-tar = True
428
429=== modified file 'debian/patches/series'
430--- debian/patches/series 2017-08-26 09:24:28 +0000
431+++ debian/patches/series 2019-02-09 19:02:16 +0000
432@@ -2,3 +2,4 @@
433 # hurd_PATH_MAX_missing
434 # dbg_symbols
435 # gcc7.patch
436+# widelands_ICU_63.1.patch
437
438=== modified file 'debian/rules'
439--- debian/rules 2018-03-02 06:01:51 +0000
440+++ debian/rules 2019-02-09 19:02:16 +0000
441@@ -7,7 +7,7 @@
442 LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
443
444 %:
445- dh $@ $(DH_ARGS) --parallel --buildsystem=cmake
446+ dh $@ $(DH_ARGS) --buildsystem=cmake
447
448
449 override_dh_auto_configure:
450
451=== modified file 'debian/widelands.appdata.xml'
452--- debian/widelands.appdata.xml 2019-02-03 08:19:12 +0000
453+++ debian/widelands.appdata.xml 2019-02-09 19:02:16 +0000
454@@ -267,6 +267,8 @@
455 <caption>Map Selection Screen</caption>
456 </screenshot>
457 </screenshots>
458+ <url type="homepage">https://wl.widelands.org/</url>
459+ <update_contact>widelands-dev_at_lists.launchpad.net</update_contact>
460 <releases>
461 <release date="2016-11-11" version="Build 19"/>
462 <release date="2014-02-22" version="Build 18"/>
463@@ -379,13 +381,11 @@
464 <translation type="gettext">tribes</translation>
465 <translation type="gettext">mp_scenario_smugglers.wmf</translation>
466 <translation type="gettext">scenario_fri02.wmf</translation>
467- <url type="homepage">https://wl.widelands.org/</url>
468 <url type="bugtracker">https://bugs.launchpad.net/widelands</url>
469 <url type="donation">https://wl.widelands.org/wiki/The%20Widelands%20Project/</url>
470 <url type="help">https://wl.widelands.org/wiki/Game%20Manual/</url>
471 <url type="translate">https://wl.widelands.org/wiki/TranslatingWidelands/</url>
472 <developer_name>The Widelands Development Team</developer_name>
473- <update_contact>widelands-dev_at_lists.launchpad.net</update_contact>
474 <content_rating type="oars-1.0">
475 <content_attribute id="violence-cartoon">moderate</content_attribute>
476 <content_attribute id="violence-fantasy">none</content_attribute>
477
478=== modified file 'debian/widelands.appdata.xml.stub'
479--- debian/widelands.appdata.xml.stub 2018-08-27 09:54:10 +0000
480+++ debian/widelands.appdata.xml.stub 2019-02-09 19:02:16 +0000
481@@ -28,6 +28,8 @@
482 <caption>Map Selection Screen</caption>
483 </screenshot>
484 </screenshots>
485+ <url type="homepage">https://wl.widelands.org/</url>
486+ <update_contact>widelands-dev_at_lists.launchpad.net</update_contact>
487 <releases>
488 <release date="2016-11-11" version="Build 19"/>
489 <release date="2014-02-22" version="Build 18"/>
490@@ -51,13 +53,11 @@
491 <release date="2002-08-27" version="Build 1"/>
492 </releases>
493 LANGUAGES_HOOK
494- <url type="homepage">https://wl.widelands.org/</url>
495 <url type="bugtracker">https://bugs.launchpad.net/widelands</url>
496 <url type="donation">https://wl.widelands.org/wiki/The%20Widelands%20Project/</url>
497 <url type="help">https://wl.widelands.org/wiki/Game%20Manual/</url>
498 <url type="translate">https://wl.widelands.org/wiki/TranslatingWidelands/</url>
499 <developer_name>The Widelands Development Team</developer_name>
500- <update_contact>widelands-dev_at_lists.launchpad.net</update_contact>
501 <content_rating type="oars-1.0">
502 <content_attribute id="violence-cartoon">moderate</content_attribute>
503 <content_attribute id="violence-fantasy">none</content_attribute>

Subscribers

People subscribed via source and target branches

to status/vote changes: