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

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

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

The following commit has been merged in the kubuntu_unstable branch:
commit a84f25fdbe30aa56ae7c268440cc02eed933bd8a
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Aug 28 21:15:46 2015 +0300

    Update debian/copyright.
---
 debian/changelog |   1 +
 debian/copyright | 105 ++++++++++++++++++++++---------------------------------
 2 files changed, 42 insertions(+), 64 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 79b3330..4c99a09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ qtsensors-opensource-src (5.5.0-1) UNRELEASED; urgency=medium
   * Do not run tests during arch-indep builds.
   * Build-depend on libqt5xcbqpa5, it is needed to run tests under Xvfb.
   * Refresh disable_local_tests.diff.
+  * Update debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 28 Aug 2015 15:06:31 +0300
 
diff --git a/debian/copyright b/debian/copyright
index 88b8e39..f7809ed 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,10 +3,9 @@ Upstream-Name: qtsensors-opensource-src
 Source: https://download.qt.io/official_releases/qt/*/submodules/
 
 Files: *
-Copyright: 2012-2014 Digia Plc and/or its subsidiary(-ies)
-           2013 BogDan Vatra <bogdan at kde.org>
+Copyright: 2015 The Qt Company Ltd.
            2012 Lorn Potter
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+License: LGPL-2.1-or-3 with Qt-1.1 exception
 
 Files: debian/*
 Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
@@ -18,53 +17,51 @@ Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
            2013-2014 Dmitry Shachnev <mitya57 at debian.org>
 License: LGPL-2.1
 
+Files: src/plugins/sensors/android/*
+Copyright: 2013 BogDan Vatra <bogdan at kde.org>
+           2015 The Qt Company Ltd.
+License: LGPL-2.1-or-3 with Qt-1.1 exception
+
 Files: config.tests/bbsensor_compass/main.cpp
-       config.tests/bbsensor_header/main.cpp
        config.tests/bbsensor_holster/main.cpp
        src/plugins/sensors/blackberry/*
-       src/sensors/qaltimeter.h
+       src/imports/sensors/qmlaltimeter.*
+       src/imports/sensors/qmlambienttemperaturesensor.*
+       src/imports/sensors/qmldistancesensor.*
+       src/imports/sensors/qmlholstersensor.*
+       src/imports/sensors/qmlpressuresensor.*
+       src/sensors/qaltimeter*
+       src/sensors/qambienttemperaturesensor*
+       src/sensors/qdistancesensor*
+       src/sensors/qholstersensor*
+       src/sensors/qpressuresensor*
        src/sensors/qsensorbackend_p.h
-       src/sensors/qpressuresensor.cpp
-       src/sensors/qambienttemperaturesensor.cpp
-       src/sensors/qpressuresensor_p.h
-       src/sensors/qpressuresensor.h
-       src/sensors/qambienttemperaturesensor_p.h
-       src/sensors/qholstersensor.h
-       src/sensors/qaltimeter.cpp
-       src/sensors/qholstersensor_p.h
-       src/sensors/qaltimeter_p.h
-       src/sensors/qambienttemperaturesensor.h
-       src/sensors/qholstersensor.cpp
-Copyright: 2012 Research In Motion
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+Copyright: 2013 Research In Motion
+           2014 BlackBerry Limited
+License: LGPL-2.1-or-3 with Qt-1.1 exception
 
 Files: src/plugins/sensors/android/src/androidaccelerometer.cpp
 Copyright: 2014 BlackBerry Limited
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+           2013 BogDan Vatra <bogdan at kde.org>
+License: LGPL-2.1-or-3 with Qt-1.1 exception
 
 Files: examples/*
        src/sensors/doc/snippets/*
        tests/auto/legacy_sensors_qml/tst_qsensor.qml
-Copyright: 2012 Digia Plc and/or its subsidiary(-ies)
+Copyright: 2015 The Qt Company Ltd.
 License: BSD-3-clause
 
-Files: examples/sensors/sensor_explorer/import/propertyinfo.h
-       examples/sensors/sensor_explorer/import/sensoritem.h
-       examples/sensors/sensor_explorer/import/explorer.cpp
-       examples/sensors/sensor_explorer/import/propertyinfo.cpp
-       examples/sensors/sensor_explorer/import/explorer.h
-       examples/sensors/sensor_explorer/import/sensoritem.cpp
-Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+Files: *.qdoc
+Copyright: 2015 The Qt Company Ltd.
+License: GFDL-NIV-1.3
 
-Files: doc/config/scripts/superfish.js
-Copyright: 2008 Joel Birch
-License: MIT
+Files: src/sensors/doc/src/compatmap.qdoc
+       src/sensors/doc/src/genericbackend.qdoc
+Copyright: 2012 Research In Motion
+License: GFDL-NIV-1.3
 
-Files: *.qdoc
-Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
-           2012 Research In Motion
-           2013 Jolla Mobile
+Files: src/sensors/doc/src/sensorfwbackend.qdoc
+Copyright: 2013 Jolla Mobile
 License: GFDL-NIV-1.3
 
 License: GFDL-NIV-1.3
@@ -79,7 +76,7 @@ License: GFDL-NIV-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: 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
@@ -88,16 +85,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
@@ -142,9 +140,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
@@ -157,24 +155,3 @@ License: BSD-3-clause
  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  (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: MIT
- 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. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.

-- 
qtsensors packaging

More information about the pkg-kde-commits mailing list