Added a couple of in-line comments. Diff comments:
> > === modified file 'debian/copyright' > --- debian/copyright 2017-03-12 11:22:07 +0000 > +++ debian/copyright 2018-11-25 16:21:32 +0000 > @@ -424,21 +241,92 @@ > Files: debian/* > Copyright: 2004-2013 Martin Quinson <[email protected]> > 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 This is adjusted based on how I saw the copyright file had been updated in Debian. By splitting out the license it looks like one can simply refer to it which saves us a lot of repetition and makes it slightly more readable. > + 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. > > > === 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> I was a bit confused at this, but it wasn't present in the Debian appdata-file, and from re-skimming the bug report it looks like the icon issue was resolved by adjusting the desktop-file. > <name>Widelands</name> > <name xml:lang="ko">와이드랜드</name> > <summary>A real-time build-up strategy game</summary> -- https://code.launchpad.net/~hjd/widelands/packaging-19-repack-6/+merge/359393 Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/packaging-19-repack-6 into lp:widelands. _______________________________________________ Mailing list: https://launchpad.net/~widelands-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
