[SCM] qtsensors packaging branch, master, updated. 1777e6fb79ff3a312fb7f4a164871e68a61a9229

Tue Oct 22 00:57:14 UTC 2013

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

The following commit has been merged in the master branch:
commit a91ef4b1f234cdee546b6889a5dc024bc890db4b
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Oct 21 21:56:08 2013 -0300

    Tidy up debian/copyright.
---
 debian/copyright |  107 ++++++++++++++++++++++++++++++------------------------
 1 file changed, 60 insertions(+), 47 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index e0d8858..334412a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -15,6 +15,66 @@ Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
            2012-2013 Timo Jyrinki <timo.jyrinki at canonical.com>
 License: LGPL-2.1
 
+Files: tests/auto/cmake/test_modules/main.cpp
+Copyright: 2012 Klarälvdalens Datakonsult AB, a KDAB Group company
+License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
+
+Files: src/plugins/sensors/blackberry/*
+       config.tests/bbsensor_compass/main.cpp
+       config.tests/bbsensor_header/main.cpp
+Copyright: 2012 Research In Motion
+License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
+
+Files: examples/*
+       src/sensors/doc/snippets/*
+       tests/auto/legacy_sensors_qml/tst_qsensor.qml
+Copyright: 2012 Digia Plc and/or its subsidiary(-ies)
+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 with Digia Qt LGPL Exception 1.1 or GPL-3
+
+Files: src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.cpp
+       src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.h
+Copyright: 2012 Lorn Potter
+License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
+
+Files: doc/config/scripts/superfish.js
+Copyright: 2008 Joel Birch
+License: MIT
+
+Files: doc/config/scripts/jquery.js
+Copyright: 2010 John Resig
+           2010 The Dojo Foundation
+License: MIT
+
+Files: *.qdoc
+Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
+License: GFDL-1.3
+
+Files: src/sensors/doc/src/genericbackend.qdoc
+       src/sensors/doc/src/compatmap.qdoc
+Copyright: 2012 Research In Motion
+License: GFDL-NIV-1.3
+
+License: GFDL-NIV-1.3
+ GNU Free Documentation License Usage
+ Alternatively, this file may be used under the terms of the GNU Free
+ Documentation License version 1.3 as published by the Free Software
+ Foundation and appearing in the file included in the packaging of
+ this file.  Please review the following information to ensure
+ the GNU Free Documentation License version 1.3 requirements
+ will be met: http://www.gnu.org/copyleft/fdl.html.
+ .
+ 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 with Digia Qt LGPL Exception 1.1
  GNU Lesser General Public License version 2.1:
  This file may be used under the terms of the GNU Lesser General Public
@@ -53,14 +113,6 @@ License: LGPL-2.1 with Digia Qt LGPL Exception 1.1
  Furthermore, you are not required to apply this additional permission to a
  modified version of the Library.
 
-Files: tests/auto/cmake/test_modules/main.cpp
-Copyright: 2012 Klarälvdalens Datakonsult AB, a KDAB Group company
-License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
-
-Files: src/plugins/sensors/blackberry/* config.tests/bbsensor_compass/main.cpp config.tests/bbsensor_header/main.cpp
-Copyright: 2012 Research In Motion
-License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
-
 License: GPL-3
  GNU General Public License Usage
  .
@@ -85,8 +137,6 @@ License: LGPL-2.1
  On Debian systems, the complete text of the LGPL-2.1 license can be found in
  `/usr/share/common-licenses/LGPL-2.1`,
 
-Files: examples/* src/sensors/doc/snippets/* tests/auto/legacy_sensors_qml/tst_qsensor.qml
-Copyright: 2012 Digia Plc and/or its subsidiary(-ies)
 License: BSD-3-clause
  You may use this file under the terms of the BSD license as follows:
  .
@@ -115,23 +165,6 @@ 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."
 
-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 with Digia Qt LGPL Exception 1.1 or GPL-3
-
-Files: src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.cpp src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.h
-Copyright: 2012 Lorn Potter
-License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
-
-Files: doc/config/scripts/superfish.js
-Copyright: 2008 Joel Birch
-License: MIT
-
-Files: doc/config/scripts/jquery.js
-Copyright: 2010 John Resig
-           2010 The Dojo Foundation
-License: MIT
-
 License: MIT
  Permission is hereby granted, free of charge, to any person obtaining
  a copy of this software and associated documentation files (the
@@ -152,23 +185,3 @@ License: MIT
  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.
-
-Files: *.qdoc
-Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
-License: GFDL-1.3
-
-Files: src/sensors/doc/src/genericbackend.qdoc src/sensors/doc/src/compatmap.qdoc
-Copyright: 2012 Research In Motion
-License: GFDL-1.3
-
-License: GFDL-1.3
- GNU Free Documentation License Usage
- Alternatively, this file may be used under the terms of the GNU Free
- Documentation License version 1.3 as published by the Free Software
- Foundation and appearing in the file included in the packaging of
- this file.  Please review the following information to ensure
- the GNU Free Documentation License version 1.3 requirements
- will be met: http://www.gnu.org/copyleft/fdl.html.
- .
- On Debian systems, the complete text of the GFDL-1.3 license can be found in
- `/usr/share/common-licenses/GFDL-1.3`,

-- 
qtsensors packaging

