[DRE-commits] [SCM] ruby-ttfunk.git branch, master, updated. upstream/1.0.2+dfsg-9-gf94f4e4

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit f94f4e459fbcfe9a5d48eda50ed60d9bb4d3d039
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Sat Sep 10 15:22:23 2011 +0200

    add copyright info for /data/fonts/DejaVuSans.ttf
    
    Although not present in the binary package, this copy of the DejaVu font
    can be useful to run examples directly from the source package.

diff --git a/debian/copyright b/debian/copyright
index 1af1381..1216fe7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,8 @@
 Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
 Upstream-Name: ttfunk
 Source: http://github.com/sandal/ttfunk
- Source has been repacked to exclude a copy of Comic Sans MS TrueType font.
+ Source has been repacked to exclude a copy of Comic Sans MS TrueType
+ non-free font in data/fonts/.
 
 Files: *
 Copyright: Copyright 2008, 2011 Gregory Brown <gregory.t.brown at gmail.com>
@@ -14,6 +15,10 @@ Copyright: Copyright 2008, 2011 Gregory Brown <gregory.t.brown at gmail.com>
            Copyright 2011 Brad Ediger <brad.ediger at madriska.com>
 License: Ruby or GPL-2 or GPL-3
 
+Files: data/fonts/DejaVuSans.ttf
+Copyright: Copyright 2003 Bitstream, Inc.
+License: Bitstream
+Comment: DejaVu changes are in public domain
 
 Files: debian/*
 Copyright: Copyright 2011 Cédric Boutillier <cedric.boutillier at gmail.com>
@@ -106,4 +111,47 @@ License: GPL-3
  On Debian systems, full text of the GPL-3 license can be found
  in `/usr/share/common-licenses/GPL-3'
 
-
+License: Bitstream
+ Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
+ a trademark of Bitstream, Inc.
+ .
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of the fonts accompanying this license ("Fonts") and associated
+ documentation files (the "Font Software"), to reproduce and distribute the
+ Font Software, including without limitation the rights to use, copy, merge,
+ publish, distribute, and/or sell copies of the Font Software, and to permit
+ persons to whom the Font Software is furnished to do so, subject to the
+ following conditions:
+ .
+ The above copyright and trademark notices and this permission notice shall
+ be included in all copies of one or more of the Font Software typefaces.
+ .
+ The Font Software may be modified, altered, or added to, and in particular
+ the designs of glyphs or characters in the Fonts may be modified and
+ additional glyphs or characters may be added to the Fonts, only if the fonts
+ are renamed to names not containing either the words "Bitstream" or the word
+ "Vera".
+ .
+ This License becomes null and void to the extent applicable to Fonts or Font
+ Software that has been modified and is distributed under the "Bitstream
+ Vera" names.
+ .
+ The Font Software may be sold as part of a larger software package but no
+ copy of one or more of the Font Software typefaces may be sold by itself.
+ .
+ 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 BITSTREAM OR THE GNOME
+ FOUNDATION 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.
+ .
+ Except as contained in this notice, the names of Gnome, the Gnome
+ Foundation, and Bitstream Inc., shall not be used in advertising or
+ otherwise to promote the sale, use or other dealings in this Font Software
+ without prior written authorization from the Gnome Foundation or Bitstream
+ Inc., respectively. For further information, contact: fonts at gnome dot
+ org. 

-- 
ruby-ttfunk.git