[SCM] qtsvg packaging branch, kubuntu_unstable, updated. debian/5.5.0-1

Rohan Garg rohangarg-guest at moszumanska.debian.org
Tue Sep 8 16:16:20 UTC 2015


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

The following commit has been merged in the kubuntu_unstable branch:
commit 1e1da505f26a7225918f8417d787d503802f432a
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Aug 27 18:38:00 2015 +0300

    Update debian/copyright.
---
 debian/changelog |  1 +
 debian/copyright | 57 ++++++++++++++++++++++----------------------------------
 2 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0e53c4d..2f981af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtsvg-opensource-src (5.5.0-1) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * New upstream release.
   * Bump Qt build-dependencies to 5.5.0.
+  * Update debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 27 Aug 2015 18:25:17 +0300
 
diff --git a/debian/copyright b/debian/copyright
index 689a178..67fe366 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,8 +3,8 @@ Upstream-Name: qtsvg-opensource-src
 Source: https://download.qt.io/official_releases/qt/*/submodules/
 
 Files: *
-Copyright: 2012-2014 Digia Plc and/or its subsidiary(-ies)
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+Copyright: 2015 The Qt Company Ltd.
+License: LGPL-2.1-or-3 with Qt-1.1 exception
 
 Files: debian/*
 Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
@@ -18,22 +18,25 @@ License: LGPL-2.1
 
 Files: src/svg/qtsvgglobal.h
 Copyright: 2012 Intel Corporation
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+License: LGPL-2.1-or-3 with Qt-1.1 exception
 
 Files: *.qdoc
-Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
+Copyright: 2015 The Qt Company Ltd.
 License: GFDL-NIV-1.3
 
 Files: examples/*
-       src/svg/doc/snippets/*
-Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
-           2007 Ariya Hidayat
+Copyright: 2015 The Qt Company Ltd.
 License: BSD-3-clause
 
-Files: src/svg/qsvghandler.cpp src/svg/doc/src/svglicense.qdoc
+Files: examples/svg/embedded/fluidlauncher/pictureflow.*
+Copyright: 2007 Ariya Hidayat <ariya at kde.org>
+           2015 The Qt Company Ltd.
+License: BSD-3-clause
+
+Files: src/svg/qsvghandler.cpp
 Copyright: 2002 USC/Information Sciences Institute
-           2012 Digia Plc and/or its subsidiary(-ies).
-License: MIT-ISI and LGPL-2.1-or-3 with Digia-1.1 exception
+           2015 The Qt Company Ltd.
+License: MIT-ISI and LGPL-2.1-or-3 with Qt-1.1 exception
 
 License: GFDL-NIV-1.3
  GNU Free Documentation License Usage
@@ -59,10 +62,9 @@ License: BSD-3-clause
      notice, this list of conditions and the following disclaimer in
      the documentation and/or other materials provided with the
      distribution.
-   * Neither the name of Digia Corporation and its Subsidiary(-ies) nor
-     the names of its contributors may be used to endorse or promote
-     products derived from this software without specific prior written
-     permission.
+   * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) nor the
+     names of its contributors may be used to endorse or promote products
+     derived from this software without specific prior written permission.
  .
  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -76,7 +78,7 @@ License: BSD-3-clause
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+License: LGPL-2.1-or-3 with Qt-1.1 exception
  GNU Lesser General Public License:
  This file may be used under the terms of the GNU Lesser General Public
  License version 2.1 or version 3 as published by the Free Software
@@ -85,16 +87,17 @@ License: LGPL-2.1-or-3 with Digia-1.1 exception
  information to ensure the GNU Lesser General Public License requirements
  will be met: https://www.gnu.org/licenses/lgpl.html.
  .
- In addition, as a special exception, Digia gives you certain additional
- rights. These rights are described in the Digia Qt LGPL Exception
- version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+ In addition, as a special exception, The Qt Company gives you certain
+ additional rights. These rights are described in The Qt Company Qt LGPL
+ Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+ package.
  .
  On Debian systems, the complete text of the GNU Lesser General Public
  License version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1`.
  The complete text of the GNU Lesser General Public License version 3 can be
  found in `/usr/share/common-licenses/LGPL-3`.
  .
- Digia Qt LGPL Exception version 1.1:
+ The Qt Company LGPL Exception version 1.1:
  As an additional permission to the GNU Lesser General Public License version
  2.1, the object code form of a "work that uses the Library" may incorporate
  material from a header file that is part of the Library.  You may distribute
@@ -148,19 +151,3 @@ License: MIT-ISI
  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 THIS SOFTWARE.
-
-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.

-- 
qtsvg packaging



More information about the pkg-kde-commits mailing list