[Pkg-e-commits] [SCM] Enlightenment 17 branch, master, updated. 821a719eecadef0bdf3540c1eec6389c43230a7d

Fri Mar 21 15:17:00 UTC 2008

The following commit has been merged in the master branch:
commit 821a719eecadef0bdf3540c1eec6389c43230a7d
Author: Jan Luebbe <jluebbe at debian.org>
Date:   Fri Mar 21 16:18:11 2008 +0100

    Document copyright of the Bitstream Vera fonts and change debian/copyright to the proposed machine-parseable format.

diff --git a/debian/copyright b/debian/copyright
index 0937908..a788ce8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,41 +1,86 @@
-This package was debianized by Blake Barnett <shadoi at soulmachine.net> on
-Sat, 28 Nov 2004 14:26:46 -0700.
-
-The source code is from the e17/apps/e module of the enlightenment CVS
-tree. For more information, see:
-
-  http://www.enlightenment.org/cvs.html
-
-Upstream Author: Carsten Haitzler <raster at rasterman.com>
+This package was downloaded from: http://download.enlightenment.org/snapshots/
 
-Copyright:
-
-  Copyright (C) 2000 Carsten Haitzler and various contributors (see AUTHORS)
+This package was debianized by Blake Barnett <shadoi at soulmachine.net> on
+ Sat, 28 Nov 2004 14:26:46 -0700.
 
+Files: *
+Copyright: © 2000 Carsten Haitzler and various contributors (see AUTHORS)
 License:
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to
+ deal in the Software without restriction, including without limitation the
+ rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ sell copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies of the Software, its documentation and marketing & publicity
+ materials, and acknowledgment shall be given in the documentation, materials
+ and software packages that this Software was used.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to
-  deal in the Software without restriction, including without limitation the
-  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-  sell copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies of the Software, its documentation and marketing & publicity
-  materials, and acknowledgment shall be given in the documentation, materials
-  and software packages that this Software was used.
+Files: data/fonts/Vera*.ttf
+Copyright: © 2003 Bitstream, Inc.
+License: 
+ 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.
 
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-  THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Files: debian/*
+Copyright: © 2006-2008 Debian Pkg-e Team <pkg-e-devel at lists.alioth.debian.org>
+License: GPL-2+
+ The Debian packaging information licensed is under the GPL, version 2 or
+ later.
 
-On Debian systems, the complete text of the BSD License can be found
-in `/usr/share/common-licenses/BSD'.
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License (version 2) can be found in `/usr/share/common-licenses/GPL-2'.
 
-The Debian packaging is:
-   (C) 2006 2007,Debian Pkg-e Team <pkg-e-devel at lists.alioth.debian.org>
-and is licensed under the GPL, see `/usr/share/common-licenses/GPL'.

-- 
Enlightenment 17

