[SCM] qtbase packaging branch, master, updated. debian/5.0.2+dfsg1-1-2-g7196123

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=7196123

The following commit has been merged in the master branch:
commit 7196123d67321806baf1943b4efe8b69d32ec331
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat Apr 20 16:17:15 2013 -0300

    Remove the licenses of the removed fonts from debian/copyright.
---
 debian/changelog |    3 +-
 debian/copyright |   58 ------------------------------------------------------
 2 files changed, 2 insertions(+), 59 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8feaa72..28f6e73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 qtbase-opensource-src (5.0.2+dfsg1-2) UNRELEASED; urgency=low
 
-
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Remove the licenses of the removed fonts from debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 20 Apr 2013 16:15:45 -0300
 
diff --git a/debian/copyright b/debian/copyright
index db4ba2b..3d18725 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -180,64 +180,6 @@ License:
  suitability of this software for any purpose.  It is provided "as
  is" without express or implied warranty.
 
-Files: lib/fonts/UT*
-Copyright: 1989 Adobe Systems Incorporated
-License: Adobe Copyright license
- Permission to use, reproduce, display and distribute the listed typefaces
- is hereby granted, provided that the Adobe Copyright notice appears in all
- whole and partial copies of the software and that the following trademark
- symbol and attribution appear in all unmodified copies of the software:
- .
-        Copyright (c) 1989 Adobe Systems Incorporated
-        Utopia (R)
-        Utopia is a registered trademark of Adobe Systems Incorporated
-
-Files: lib/fonts/l*
-Copyright: 2001 by Bigelow & Holmes Inc.
-License: Luxi font license
- Luxi fonts copyright (c) 2001 by Bigelow & Holmes Inc. Luxi font 
- instruction code copyright (c) 2001 by URW++ GmbH. All Rights 
- Reserved. Luxi is a registered trademark of Bigelow & Holmes Inc.
- .
- Permission is hereby granted, free of charge, to any person obtaining 
- a copy of these Fonts and associated documentation files (the "Font 
- Software"), to deal in the Font Software, including without 
- limitation the rights to use, copy, merge, publish, distribute, 
- sublicense, 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.
- .
- The Font Software may not be modified, altered, or added to, and in 
- particular the designs of glyphs or characters in the Fonts may not 
- be modified nor may additional glyphs or characters be added to the 
- Fonts. This License becomes null and void when the Fonts or Font 
- Software have been modified.
- .
- 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 
- BIGELOW & HOLMES INC. OR URW++ GMBH. 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 Bigelow & Holmes 
- Inc. and URW++ GmbH. 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 Bigelow & Holmes Inc. and URW++ GmbH.
- .
- For further information, contact:
- .
- info at urwpp.de
- or
- design at bigelowandholmes.com
-
 Files: lib/fonts/c0*
 Copyright: 1989-1992 Bitstream Inc., Cambridge, MA.
 License: Bitstream license

-- 
qtbase packaging