[SCM] qtbase packaging branch, master, updated. debian/5.0.2+dfsg1-5-14-g3212898

Wed Jun 19 21:34:43 UTC 2013

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

The following commit has been merged in the master branch:
commit 321289820e0c3c884cb3873171c919f408ff1ae7
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Jun 19 18:34:09 2013 -0300

    No-op wrap-and-sort of debian/copyright.
---
 debian/copyright |   67 +++++++++++++++++++++++++++---------------------------
 1 file changed, 33 insertions(+), 34 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 3d18725..45260f8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -33,7 +33,7 @@ Files: tests/auto/cmake/* src/gui/kernel/qplatformmenu.h src/gui/kernel/qplatfor
 Copyright: 2011 Klarälvdalens Datakonsult AB, a KDAB Group company
 License: LGPL-2.1 with Digia Qt LGPL Exception 1.1
 
-Files: tests/manual/cocoa/menus/main.cpp src/plugins/platforms/cocoa/qcocoamenubar.mm src/plugins/platforms/cocoa/qcocoamenuitem.mm src/plugins/platforms/cocoa/qcocoamenu.h src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm src/plugins/platforms/cocoa/qcocoasystemtrayicon.h src/plugins/platforms/cocoa/qcocoamenubar.h src/plugins/platforms/cocoa/qcocoamenuitem.h src/plugins/platforms/cocoa/qcocoamenu.mm 
+Files: tests/manual/cocoa/menus/main.cpp src/plugins/platforms/cocoa/qcocoamenubar.mm src/plugins/platforms/cocoa/qcocoamenuitem.mm src/plugins/platforms/cocoa/qcocoamenu.h src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm src/plugins/platforms/cocoa/qcocoasystemtrayicon.h src/plugins/platforms/cocoa/qcocoamenubar.h src/plugins/platforms/cocoa/qcocoamenuitem.h src/plugins/platforms/cocoa/qcocoamenu.mm
 Copyright: 2011 Klarälvdalens Datakonsult AB, a KDAB Group company
            2007-2008 Apple, Inc.
 License: LGPL-2.1 with Digia Qt LGPL Exception 1.1
@@ -60,7 +60,7 @@ Files: src/network/kernel/qdnslookup_p.h src/network/kernel/qdnslookup_unix.cpp
 Copyright: 2012 Jeremy Lain
 License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
 
-Files: src/network/doc/snippets/code/src_network_kernel_qdnslookup.cpp examples/network/dnslookup/dnslookup.cpp examples/network/dnslookup/dnslookup.h 
+Files: src/network/doc/snippets/code/src_network_kernel_qdnslookup.cpp examples/network/dnslookup/dnslookup.cpp examples/network/dnslookup/dnslookup.h
 Copyright: 2012 Jeremy Lain
 License: BSD-3-clause
 
@@ -137,11 +137,11 @@ Files: src/corelib/thread/qmutex.cpp src/corelib/thread/qmutex_p.h tests/auto/to
 Copyright: 2011-2012 Olivier Goffart
 License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
 
-Files: src/network/ssl/qsslcertificateextension_p.h src/network/ssl/qsslcertificateextension.cpp src/network/ssl/qsslcertificateextension.h 
+Files: src/network/ssl/qsslcertificateextension_p.h src/network/ssl/qsslcertificateextension.cpp src/network/ssl/qsslcertificateextension.h
 Copyright: 2011 Richard J. Moore
 License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
 
-Files: tests/benchmarks/corelib/tools/qalgorithms/tst_qalgorithms.cpp tests/benchmarks/corelib/kernel/qcoreapplication/main.cpp 
+Files: tests/benchmarks/corelib/tools/qalgorithms/tst_qalgorithms.cpp tests/benchmarks/corelib/kernel/qcoreapplication/main.cpp
 Copyright: 2011-2012 Robin Burchell
 License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
 
@@ -240,7 +240,7 @@ License:
  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. 
+ org.
  .
  Arev Fonts Copyright
  .
@@ -264,7 +264,7 @@ License:
  the words "Tavmjong Bah" or the word "Arev".
  .
  This License becomes null and void to the extent applicable to Fonts
- or Font Software that has been modified and is distributed under the 
+ or Font Software that has been modified and is distributed under the
  "Tavmjong Bah Arev" names.
  .
  The Font Software may be sold as part of a larger software package but
@@ -306,7 +306,7 @@ Files: lib/fonts/micro_40_50.qpf lib/fonts/japanese_230_50.qpf lib/fonts/fixed_1
 Copyright: -
 License: Public Domain
  A public domain font. Share and enjoy. http://www.X.org
- 
+
 Files: lib/fonts/unifont_160_50.qpf
 Copyright: Roman Czyborra
 License:
@@ -318,7 +318,7 @@ License:
  and have given a quick thought about whether Roman might perhaps be interested
  to read what you did with his stuff. Horizontal rules don't apply.
 
-Files: tests/manual/widgets/itemviews/delegate/example.cpp tests/manual/widgets/itemviews/qheaderview/qheaderviewtest1.cpp tests/manual/widgets/qgraphicsview/rubberband/rubberbandtest.cpp tests/benchmarks/gui/itemviews/qheaderview/qheaderviewbench.cpp tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp 
+Files: tests/manual/widgets/itemviews/delegate/example.cpp tests/manual/widgets/itemviews/qheaderview/qheaderviewtest1.cpp tests/manual/widgets/qgraphicsview/rubberband/rubberbandtest.cpp tests/benchmarks/gui/itemviews/qheaderview/qheaderviewbench.cpp tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
 Copyright: 2012 Thorbjørn Lund Martsum
 License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
 
@@ -331,37 +331,37 @@ Copyright: 1991-2012 Unicode, Inc.
 License: Unicode, Inc. License Agreement
  COPYRIGHT AND PERMISSION NOTICE
  .
- Copyright © 1991-2012 Unicode, Inc. All rights reserved. 
+ Copyright © 1991-2012 Unicode, Inc. All rights reserved.
  Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
  .
- 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 
+ 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)  
+ 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 
+ 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. 
+ 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.
 
 Files: src/gui/text/qharfbuzz_copy_p.h
        src/3rdparty/harfbuzz/*
@@ -924,7 +924,7 @@ Files: *.qdoc
 Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
 License: GFDL-1.3
 
-Files: src/printsupport/kernel/qprinterinfo.cpp 
+Files: src/printsupport/kernel/qprinterinfo.cpp
 Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
 License: GFDL-1.3
 
@@ -939,4 +939,3 @@ License: GFDL-1.3
  .
  On Debian systems, the complete text of the GFDL-1.3 license can be found in
  `/usr/share/common-licenses/GFDL-1.3`,
-

-- 
qtbase packaging

