r15945 - in packages/trunk/supertuxkart/debian: . patches
Vincent Cheng
vcheng at moszumanska.debian.org
Sun Dec 4 02:41:19 UTC 2016
Author: vcheng
Date: 2016-12-04 02:41:18 +0000 (Sun, 04 Dec 2016)
New Revision: 15945
Added:
packages/trunk/supertuxkart/debian/patches/replace-fonts-ubuntu-with-cantarell.patch
packages/trunk/supertuxkart/debian/supertuxkart-data.links
Modified:
packages/trunk/supertuxkart/debian/changelog
packages/trunk/supertuxkart/debian/control
packages/trunk/supertuxkart/debian/copyright
packages/trunk/supertuxkart/debian/patches/series
Log:
supertuxkart: Remove non-free Ubuntu Font Family fonts, replaced with Cantarell
Modified: packages/trunk/supertuxkart/debian/changelog
===================================================================
--- packages/trunk/supertuxkart/debian/changelog 2016-12-04 02:18:58 UTC (rev 15944)
+++ packages/trunk/supertuxkart/debian/changelog 2016-12-04 02:41:18 UTC (rev 15945)
@@ -1,6 +1,10 @@
-supertuxkart (0.9.2-2) UNRELEASED; urgency=medium
+supertuxkart (0.9.2+dfsg-2) UNRELEASED; urgency=medium
- *
+ * Remove non-free Ubuntu Font Family fonts, replaced with Cantarell.
+ (Closes: #830751)
+ - Add new dependency on fonts-cantarell.
+ - Add debian/patches/replace-fonts-ubuntu-with-cantarell.patch to replace
+ references to Ubuntu Font Family fonts.
-- Vincent Cheng <vcheng at debian.org> Sat, 03 Dec 2016 17:17:52 -0800
Modified: packages/trunk/supertuxkart/debian/control
===================================================================
--- packages/trunk/supertuxkart/debian/control 2016-12-04 02:18:58 UTC (rev 15944)
+++ packages/trunk/supertuxkart/debian/control 2016-12-04 02:41:18 UTC (rev 15945)
@@ -55,6 +55,8 @@
Package: supertuxkart-data
Architecture: all
+Depends:
+ fonts-cantarell
Suggests:
supertuxkart
Depends:
Modified: packages/trunk/supertuxkart/debian/copyright
===================================================================
--- packages/trunk/supertuxkart/debian/copyright 2016-12-04 02:18:58 UTC (rev 15944)
+++ packages/trunk/supertuxkart/debian/copyright 2016-12-04 02:41:18 UTC (rev 15945)
@@ -841,6 +841,25 @@
==========
+
+data/ttf
+~~~~~~~~~~
+GNU FreeFont (FreeSans, FreeSansBold) is released under the GPLv3
+
+wqyMicroHei is released under the GPLv3 with font embedding exception and Apache-2.0 licenses
+ By Qianqian Fang and The WenQuanYi Project Contributors
+ Copyright (C) 2008-2009 The WenQuanYi Project Board of Trustees
+ Copyright (C) 2007 Google Corporation
+
+Noto Naskh Arabic UI is released under Apache-2.0 license
+
+Cantarell font is released under the SIL open font license 1.1
+
+SigmarOne is released under the SIL open font license 1.1 ( https://www.google.com/fonts/specimen/Sigmar+One )
+
+
+==========
+
License: Creative Commons by-sa 3.0
---
THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
@@ -1112,3 +1131,55 @@
under this License, such additional rights are deemed to be included in
the License; this License is not intended to restrict the license of any
rights under applicable law.
+
+
+==========
+
+License: SIL OPEN FONT LICENSE Version 1.1
+---
+
+Copyright (c) 2011, Vernon Adams (vern at newtypography.co.uk),
+with Reserved Font Name Sigmar One.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+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: packages/trunk/supertuxkart/debian/patches/replace-fonts-ubuntu-with-cantarell.patch
===================================================================
--- packages/trunk/supertuxkart/debian/patches/replace-fonts-ubuntu-with-cantarell.patch (rev 0)
+++ packages/trunk/supertuxkart/debian/patches/replace-fonts-ubuntu-with-cantarell.patch 2016-12-04 02:41:18 UTC (rev 15945)
@@ -0,0 +1,32 @@
+Description: Remove non-free Ubuntu Font Family fonts, replaced with Cantarell
+Origin: upstream, https://github.com/supertuxkart/stk-code/commit/19acdad9b4784a84e1ae87cd2e2953ebe6df97bc
+Bug: https://github.com/supertuxkart/stk-code/issues/2570
+Bug-Debian: https://bugs.debian.org/830751
+Last-Update: 2016-12-03
+
+--- a/data/stk_config.xml
++++ b/data/stk_config.xml
+@@ -411,11 +411,11 @@
+ which leads to crash with STK), but the fonts are to blame, what's the point of not
+ using industry standard nowadays...
+ -->
+- <font default="Ubuntu-R.ttf"
++ <font default="Cantarell-Regular.otf"
+ default_fallback="FreeSans.ttf"
+ cjk="wqy-microhei.ttf"
+ ar="NotoNaskhArabicUI-Bold.ttf"
+- bold="Ubuntu-B.ttf"
++ bold="Cantarell-Bold.otf"
+ bold_fallback="FreeSansBold.ttf"
+ digit="SigmarOne.otf" />
+
+--- a/data/ttf/LICENSE
++++ b/data/ttf/LICENSE
+@@ -7,6 +7,6 @@
+
+ Noto Naskh Arabic UI is released under Apache-2.0 license
+
+-Ubuntu font is released under the ubuntu font license (http://font.ubuntu.com/licence/)
++Cantarell font is released under the SIL open font license 1.1
+
+ SigmarOne is released under the SIL open font license 1.1 ( https://www.google.com/fonts/specimen/Sigmar+One )
Modified: packages/trunk/supertuxkart/debian/patches/series
===================================================================
--- packages/trunk/supertuxkart/debian/patches/series 2016-12-04 02:18:58 UTC (rev 15944)
+++ packages/trunk/supertuxkart/debian/patches/series 2016-12-04 02:41:18 UTC (rev 15945)
@@ -1,6 +1,7 @@
build_against_system_enet.patch
link_against_system_libs.patch
remove_irrlicht_embedded_libs.patch
+replace-fonts-ubuntu-with-cantarell.patch
# Irrlicht patches taken directly from irrlicht source package in Debian
irrlicht/arch-support.diff
irrlicht/use-system-libs.diff
Added: packages/trunk/supertuxkart/debian/supertuxkart-data.links
===================================================================
--- packages/trunk/supertuxkart/debian/supertuxkart-data.links (rev 0)
+++ packages/trunk/supertuxkart/debian/supertuxkart-data.links 2016-12-04 02:41:18 UTC (rev 15945)
@@ -0,0 +1,2 @@
+usr/share/fonts/opentype/cantarell/Cantarell-Bold.otf usr/share/games/supertuxkart/data/ttf/Cantarell-Bold.otf
+usr/share/fonts/opentype/cantarell/Cantarell-Regular.otf usr/share/games/supertuxkart/data/ttf/Cantarell-Regular.otf
More information about the Pkg-games-commits
mailing list