[SCM] qtbase packaging branch, experimental, updated. debian/5.4.2+dfsg-4-34-g106057d

Lisandro Damián Nicanor Pérez lisandro at moszumanska.debian.org
Mon Jul 6 21:26:16 UTC 2015


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

The following commit has been merged in the experimental branch:
commit 106057dbe505eb362506c98cf5cc1bc26bfbc4a8
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Jul 6 18:25:33 2015 -0300

    Remove unused debian/copyright entries.
---
 debian/copyright | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 128e86c..b5f6a06 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -102,8 +102,6 @@ Files: src/plugins/platforms/qnx/*
        config.tests/unix/slog2/slog2.cpp
        mkspecs/blackberry-x86-qcc/qplatformdefs.h
        mkspecs/qnx-x86-qcc/qplatformdefs.h
-       mkspecs/blackberry-armv7le-qcc/qplatformdefs.h
-       mkspecs/qnx-armv7le-qcc/qplatformdefs.h
        src/corelib/io/qstandardpaths_blackberry.cpp
        src/corelib/io/qurl.cpp
        src/corelib/kernel/qeventdispatcher_blackberry.cpp
@@ -578,10 +576,6 @@ Copyright: 2003, 2006 Matteo Frigo
            2003, 2006 Massachusetts Institute of Technology
 License: Expat
 
-Files: src/3rdparty/des/des.cpp
-Copyright: 1997-2005 Simon Tatham
-License: Expat
-
 Files: src/3rdparty/easing/easing.cpp
 Copyright: 2001 Robert Penner
 License: BSD-3-clause
@@ -1122,22 +1116,6 @@ 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`,
 
-License: Expat
- 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 or substantial portions of the Software.
- .
- 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
-
 License: Apache-2.0
   Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

-- 
qtbase packaging



More information about the pkg-kde-commits mailing list