[SCM] qttools packaging branch, experimental, updated. debian/5.3.2-3-3-gb292e6a

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit b292e6a680d9179f7ce39a13f69901473b5f13b1
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Oct 10 10:30:39 2014 +0400

    Make Unicode data license text readable, and give it a short name without spaces.
---
 debian/changelog |  5 ++++-
 debian/copyright | 36 ++++++++++++++++++++++++++++++------
 2 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6508580..166cfa3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,10 @@
 qttools-opensource-src (5.3.2-4) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
-  * Use correct exception syntax in debian/copyright.
+  * debian/copyright:
+    - Use correct syntax for exceptions.
+    - Make Unicode data license text readable, and give it
+      a short name without spaces (MIT-Unicode).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 08 Oct 2014 21:59:06 +0400
 
diff --git a/debian/copyright b/debian/copyright
index 87d3a65..2248d7e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -209,12 +209,36 @@ License: GFDL-1.3
 
 Files: src/makeqpf/Blocks.txt
 Copyright: 1991-2006 Unicode, Inc.
-License: Unicode, Inc. License Agreement
- Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software") to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or Software are furnished to do so, provided that (a) the above copyright notice(s) and this permission notice appear with all copies of the Data Files or Software, (b) both the above copyright notice(s) and this permission notice appear in associated documentation, and (c) there is clear notice in each modified Data File or in the Software as well as in the documentation associated with the Data File(s) or Software that the data or software has been modified.
- .
- THE DATA FILES AND SOFTWARE ARE 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 OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE.
- .
- Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder.
+License: MIT-Unicode
+ Permission is hereby granted, free of charge, to any person obtaining a copy of
+ the Unicode data files and any associated documentation (the "Data Files") or
+ Unicode software and any associated documentation (the "Software") to deal in
+ the Data Files or Software without restriction, including without limitation the
+ rights to use, copy, modify, merge, publish, distribute, and/or sell copies of
+ the Data Files or Software, and to permit persons to whom the Data Files or
+ Software are furnished to do so, provided that:
+ (a) the above copyright notice(s) and this permission notice appear with all
+     copies of the Data Files or Software,
+ (b) both the above copyright notice(s) and this permission notice appear in
+     associated documentation, and
+ (c) there is clear notice in each modified Data File or in the Software as well
+     as in the documentation associated with the Data File(s) or Software that
+     the data or software has been modified.
+ .
+ THE DATA FILES AND SOFTWARE ARE 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 OF THIRD
+ PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+ NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+ DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR
+ SOFTWARE.
+ .
+ Except as contained in this notice, the name of a copyright holder shall not be
+ used in advertising or otherwise to promote the sale, use or other dealings in
+ these Data Files or Software without prior written authorization of the
+ copyright holder.
 
 License: GFDL-1.3
  GNU Free Documentation License Usage

-- 
qttools packaging