[SCM] qbs packaging branch, master, updated. debian/1.3.3+dfsg-4-4-g7a95986

Sun Mar 8 17:43:25 UTC 2015

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

The following commit has been merged in the master branch:
commit 7a959868d50d191a8546165c61d233f13cf31aa2
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Mar 8 20:43:01 2015 +0300

    Update copyright information.
---
 debian/changelog             |  1 +
 debian/copyright             | 53 ++++++++++++++++++++++++++------------------
 debian/qbs-doc-html.doc-base |  2 +-
 3 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4e5fe23..d839cbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qbs (1.3.4+dfsg-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Drop increase_timeout.diff, applied upstream.
   * Replace endianness.diff with upstream patch.
+  * Update copyright information.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 08 Mar 2015 20:10:53 +0300
 
diff --git a/debian/copyright b/debian/copyright
index 2de32e7..f9414da 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,33 +4,43 @@ Source: http://download.qt-project.org/official_releases/qbs/
 Files-Excluded: doc/templates/scripts/jquery.js
 
 Files: *
-Copyright: 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: src/lib/corelib/jsextensions/domxml.*
-Copyright: 2014, BogDan Vatra <bogdan at kde.org>
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+Copyright: 2015, BogDan Vatra <bogdan at kde.org>
+License: LGPL-2.1-or-3 with Qt-1.1 exception
 
 Files: src/plugins/scanner/cpp/*
-Copyright: 2014, Digia Plc and/or its subsidiary(-ies)
+Copyright: 2015, The Qt Company Ltd.
            2008, Roberto Raggi <roberto.raggi at gmail.com>
-License: LGPL-2.1-or-3 with Digia-1.1 exception and Expat
+License: LGPL-2.1-or-3 with Qt-1.1 exception and Expat
 
-Files: doc/reference/*
+Files: examples/cocoa-application/*
        examples/cocoa-touch-application/*
-Copyright: 2014, Digia Plc and/or its subsidiary(-ies)
-           2014, Petroules Corporation
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+       src/lib/corelib/jsextensions/domxml.*
+       src/lib/corelib/jsextensions/propertylist.*
+       src/lib/corelib/tools/architectures.cpp
+       src/lib/corelib/tools/shellutils.*
+Copyright: 2015, The Qt Company Ltd.
+           2015, Petroules Corporation
+License: LGPL-2.1-or-3 with Qt-1.1 exception
 
-Files: examples/helloworld-*/*
-Copyright: 2014, Digia Plc and/or its subsidiary(-ies)
+Files: doc/templates/scripts/superfish.js
+Copyright: 2008, Joel Birch <joeldbirch at gmail.com>
+License: Expat
+
+Files: examples/*.qbs
+       examples/helloworld-*/*
+       tests/auto/blackbox/testdata/dynamicRuleOutputs/*
+Copyright: 2015, The Qt Company Ltd.
 License: BSD-3-clause
 
 Files: debian/*
-Copyright: 2014, Dmitry Shachnev <mitya57 at debian.org>
+Copyright: 2014-2015, Dmitry Shachnev <mitya57 at debian.org>
 License: LGPL-2.1+
 
-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
@@ -39,16 +49,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
@@ -108,9 +119,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 Plc 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
diff --git a/debian/qbs-doc-html.doc-base b/debian/qbs-doc-html.doc-base
index 09ee9e5..c0aca98 100644
--- a/debian/qbs-doc-html.doc-base
+++ b/debian/qbs-doc-html.doc-base
@@ -1,6 +1,6 @@
 Document: qbs-doc-html
 Title: QBS Documentation
-Author: Digia Plc and/or its subsidiary(-ies)
+Author: The Qt Company Ltd.
 Abstract: Documentation of the Qt Build Suite
  Qt Build Suite (QBS) is a tool that helps simplify the build process for
  developing projects across multiple platforms. QBS can be used for any

-- 
qbs packaging

