From e2d2e822f427ae226fa566512f095e6071b6aa2c Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Date: Tue, 25 Sep 2012 11:22:25 +0200
Subject: [PATCH] ttf-gentium: added license stuff

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
---
 .../ttf-fonts/ttf-gentium/OFL.gz              | Bin 1963 -> 0 bytes
 .../ttf-fonts/ttf-gentium_1.02.bb             | 113 ++----------------
 2 files changed, 7 insertions(+), 106 deletions(-)
 delete mode 100644 meta-oe/recipes-graphics/ttf-fonts/ttf-gentium/OFL.gz

diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-gentium/OFL.gz b/meta-oe/recipes-graphics/ttf-fonts/ttf-gentium/OFL.gz
deleted file mode 100644
index 7ebada75728080de1b1ee7676484bdbfab6822b1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1963
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

diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb
index ee27c12eb9..3c49e24836 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb
@@ -2,12 +2,13 @@ require ttf.inc
 
 DESCRIPTION = "Gentium fonts - TTF Version"
 HOMEPAGE = "http://scripts.sil.org/gentium"
-LICENSE = "SIL Open Font License"
+LICENSE = "OFL"
 LICENSE_URL = "http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=OFL"
-PR = "r5"
+LIC_FILES_CHKSUM = "file://OFL;md5=33a5bf7b98a9c0ae87430760ba762295 \
+"
+PR = "r6"
 
-SRC_URI = "${DEBIAN_MIRROR}/main/t/ttf-gentium/ttf-gentium_${PV}.orig.tar.gz \
-           file://OFL.gz"
+SRC_URI = "${DEBIAN_MIRROR}/main/t/ttf-gentium/ttf-gentium_${PV}.orig.tar.gz "
 
 S = "${WORKDIR}/ttf-sil-gentium-${PV}"
 
@@ -16,8 +17,8 @@ do_install_append() {
     install -d ${D}${datadir}/doc/ttf-gentium/
     install -d ${D}${datadir}/doc/ttf-gentium-alt/
 
-    install -m 0644 ${WORKDIR}/OFL ${D}${datadir}/doc/ttf-gentium/
-    install -m 0644 ${WORKDIR}/OFL ${D}${datadir}/doc/ttf-gentium-alt/
+    install -m 0644 ${S}/OFL ${D}${datadir}/doc/ttf-gentium/
+    install -m 0644 ${S}/OFL ${D}${datadir}/doc/ttf-gentium-alt/
 
 }
 
@@ -31,105 +32,5 @@ FILES_${PN} = "${datadir}/fonts/truetype/GenI*.ttf \
                ${datadir}/fonts/truetype/GenR*.ttf \
 	       ${datadir}/doc/ttf-gentium/*"
 
-#
-# License
-#
-# Gentium is released under the SIL Open Font License - please read it carefully
-# and do not download the fonts unless you agree to the terms of the license:
-#
-# This Font Software is Copyright (c) 2003-2005, SIL International
-# (http://scripts.sil.org/). All Rights Reserved.
-#
-# "Gentium" is a Reserved Font Name for this Font Software. "SIL" is a Reserved
-# Font Name for this Font Software.
-#
-# This Font Software is licensed under the SIL Open Font License, Version 1.0. No
-# modification of the license is permitted, only verbatim copy is allowed. This
-# license is copied below, and is also available with a FAQ
-# at:http://scripts.sil.org/OFL SIL OPEN FONT LICENSE
-#
-# Version 1.0 - 22 November 2005
-#
-# PREAMBLE
-#
-# The goals of the Open Font License (OFL) are to stimulate worldwide development
-# of cooperative font projects, to support the font creation efforts of academic
-# and linguistic communities, and to provide an 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
-# sold with any software provided that the font names of derivative works are
-# changed. The fonts and derivatives, however, cannot be released under any other
-# type of license.
-#
-# DEFINITIONS
-#
-# "Font Software" refers to any and all of the following:
-#
-#     * font files data files source code build scripts documentation
-#
-# "Reserved Font Name" refers to the Font Software name as seen by users and any
-# other names as specified after the copyright statement.
-#
-# "Standard Version" refers to the collection of Font Software components as
-# distributed by the Copyright Holder.
-#
-# "Modified Version" refers to any derivative font software made by adding to,
-# deleting, or substituting -- in part or in whole -- any of the components of
-# the Standard 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 Standard
-# or Modified Versions, may be sold by itself.
-#
-# 2) Standard or Modified Versions of the Font Software may be bundled,
-# redistributed and 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),
-# in part or in whole, unless explicit written permission is granted by the
-# Copyright Holder. This restriction applies to all references stored in the Font
-# Software, such as the font menu name and other font description fields, which
-# are used to differentiate the font from others.
-#
-# 4) The name(s) of the Copyright Holder 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 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 using this license, and may not be distributed under any other
-# license.
-#
-# 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.
-
 SRC_URI[md5sum] = "4c3e6ae586be277537ebb68f2a45b883"
 SRC_URI[sha256sum] = "4746c04c9a4ad9e0788a38e0a2f81919a630d8070ceabc89f156b6d41d8ceb37"