[SCM] qtconnectivity packaging branch, master, updated. f0e80f60ddaab28515b248a53a57672e56e431ce
Lisandro Damián Nicanor Pérez
lisandro at moszumanska.debian.org
Thu Jan 30 02:41:12 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtconnectivity.git;a=commitdiff;h=f0e80f6
The following commit has been merged in the master branch:
commit f0e80f60ddaab28515b248a53a57672e56e431ce
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Wed Jan 29 23:40:50 2014 -0300
Put files listing above.
---
debian/copyright | 148 ++++++++++++++++++++++++++++---------------------------
1 file changed, 76 insertions(+), 72 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index f3540b0..747e930 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,6 +6,16 @@ Files: *
Copyright: 2013 Digia Plc and/or its subsidiary(-ies)
License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
+Files: examples/*
+ src/nfc/doc/snippets/*
+ src/bluetooth/doc/snippets/*
+Copyright: 2013 Digia Plc and/or its subsidiary(-ies)
+License: BSD-3-clause
+
+Files: *.qdoc
+Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
+License: GFDL-1.3
+
Files: debian/*
Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
2007-2012 Sune Vuorela <debian at pusling.com>
@@ -15,6 +25,72 @@ Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
2012-2013 Timo Jyrinki <timo.jyrinki at canonical.com>
License: LGPL-2.1
+Files: examples/bluetooth/bttennis/tennisserver.h
+ examples/bluetooth/bttennis/tennisserver.cpp
+ examples/bluetooth/bttennis/tennisview.h
+ examples/bluetooth/bttennis/tennisclient.h
+ examples/bluetooth/bttennis/main.cpp
+ examples/bluetooth/bttennis/tennis.h
+ examples/bluetooth/bttennis/tennisclient.cpp
+ examples/bluetooth/bttennis/tennis.cpp
+ examples/bluetooth/bttennis/controller.h
+ examples/bluetooth/bttennis/board.h
+ examples/bluetooth/bttennis/controller.cpp
+ examples/bluetooth/bttennis/tennisview.cpp
+ examples/bluetooth/bttennis/handover.cpp
+ examples/bluetooth/bttennis/handover.h
+ examples/bluetooth/bttennis/board.cpp
+Copyright: 2013 Digia Plc and/or its subsidiary(-ies)
+License: LGPL-2.1 with Digia Qt LGPL Exception 1.1
+
+Files: examples/bluetooth/scanner/doc/src/scanner.qdoc
+ src/nfc/doc/src/nfc-cpp.qdoc
+ src/nfc/doc/src/nfc-qml.qdoc
+ src/nfc/doc/src/examples.qdoc
+ src/nfc/doc/src/nfc-index.qdoc
+ src/nfc/doc/src/nfc-overview.qdoc
+Copyright: 2013 Aaron McCarthy <mccarthy.aaron at gmail.com>
+License: GFDL-1.3
+
+Files: src/nfc/doc/snippets/doc_src_qtnfc.qml
+ src/nfc/doc/snippets/doc_src_qtnfc.cpp
+ src/nfc/doc/snippets/doc_src_qtnfc.pro
+Copyright: 2013 Aaron McCarthy <mccarthy.aaron at gmail.com>
+License: BSD-3-clause
+
+Files: src/nfc/qndefnfcsmartposterrecord.cpp
+ src/nfc/qllcpserver_qnx_p.h
+ src/nfc/qnearfieldtarget_qnx_p.h
+ src/nfc/qllcpsocket_qnx_p.cpp
+ src/nfc/qndefnfcsmartposterrecord.h
+ src/nfc/qnx/qnxnfcmanager_p.h
+ src/nfc/qnx/qnxnfceventfilter_p.h
+ src/nfc/qnx/qnxnfcmanager.cpp
+ src/nfc/qnx/qnxnfceventfilter.cpp
+ src/nfc/qnearfieldmanager_qnx.cpp
+ src/nfc/qllcpserver_qnx_p.cpp
+ src/nfc/qndefnfcsmartposterrecord_p.h
+ src/nfc/qllcpsocket_qnx_p.h
+ src/nfc/qnearfieldmanager_qnx_p.h
+ src/bluetooth/qbluetoothtransferreply_qnx_p.h
+ src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp
+ src/bluetooth/qbluetoothtransfermanager_qnx.cpp
+ src/bluetooth/qnx/ppshelpers.cpp
+ src/bluetooth/qnx/ppshelpers_p.h
+ src/bluetooth/qbluetoothlocaldevice_qnx.cpp
+ src/bluetooth/qbluetoothtransferreply_qnx.cpp
+ src/bluetooth/qbluetoothdevicediscoveryagent_qnx.cpp
+ src/bluetooth/qbluetoothserviceinfo_qnx.cpp
+ src/bluetooth/qbluetoothsocket_qnx.cpp
+ src/bluetooth/qrfcommserver_qnx.cpp
+ tests/auto/qndefnfcsmartposterrecord/tst_qndefnfcsmartposterrecord.cpp
+Copyright: 2011-2013 Research In Motion
+License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
+
+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
+
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
@@ -77,8 +153,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/nfc/doc/snippets/* src/bluetooth/doc/snippets/*
-Copyright: 2013 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:
.
@@ -107,10 +181,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: *.qdoc
-Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
-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
@@ -122,69 +192,3 @@ 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`,
-
-Files: examples/bluetooth/bttennis/tennisserver.h
- examples/bluetooth/bttennis/tennisserver.cpp
- examples/bluetooth/bttennis/tennisview.h
- examples/bluetooth/bttennis/tennisclient.h
- examples/bluetooth/bttennis/main.cpp
- examples/bluetooth/bttennis/tennis.h
- examples/bluetooth/bttennis/tennisclient.cpp
- examples/bluetooth/bttennis/tennis.cpp
- examples/bluetooth/bttennis/controller.h
- examples/bluetooth/bttennis/board.h
- examples/bluetooth/bttennis/controller.cpp
- examples/bluetooth/bttennis/tennisview.cpp
- examples/bluetooth/bttennis/handover.cpp
- examples/bluetooth/bttennis/handover.h
- examples/bluetooth/bttennis/board.cpp
-Copyright: 2013 Digia Plc and/or its subsidiary(-ies)
-License: LGPL-2.1 with Digia Qt LGPL Exception 1.1
-
-Files: examples/bluetooth/scanner/doc/src/scanner.qdoc
- src/nfc/doc/src/nfc-cpp.qdoc
- src/nfc/doc/src/nfc-qml.qdoc
- src/nfc/doc/src/examples.qdoc
- src/nfc/doc/src/nfc-index.qdoc
- src/nfc/doc/src/nfc-overview.qdoc
-Copyright: 2013 Aaron McCarthy <mccarthy.aaron at gmail.com>
-License: GFDL-1.3
-
-Files: src/nfc/doc/snippets/doc_src_qtnfc.qml
- src/nfc/doc/snippets/doc_src_qtnfc.cpp
- src/nfc/doc/snippets/doc_src_qtnfc.pro
-Copyright: 2013 Aaron McCarthy <mccarthy.aaron at gmail.com>
-License: BSD-3-clause
-
-Files: src/nfc/qndefnfcsmartposterrecord.cpp
- src/nfc/qllcpserver_qnx_p.h
- src/nfc/qnearfieldtarget_qnx_p.h
- src/nfc/qllcpsocket_qnx_p.cpp
- src/nfc/qndefnfcsmartposterrecord.h
- src/nfc/qnx/qnxnfcmanager_p.h
- src/nfc/qnx/qnxnfceventfilter_p.h
- src/nfc/qnx/qnxnfcmanager.cpp
- src/nfc/qnx/qnxnfceventfilter.cpp
- src/nfc/qnearfieldmanager_qnx.cpp
- src/nfc/qllcpserver_qnx_p.cpp
- src/nfc/qndefnfcsmartposterrecord_p.h
- src/nfc/qllcpsocket_qnx_p.h
- src/nfc/qnearfieldmanager_qnx_p.h
- src/bluetooth/qbluetoothtransferreply_qnx_p.h
- src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp
- src/bluetooth/qbluetoothtransfermanager_qnx.cpp
- src/bluetooth/qnx/ppshelpers.cpp
- src/bluetooth/qnx/ppshelpers_p.h
- src/bluetooth/qbluetoothlocaldevice_qnx.cpp
- src/bluetooth/qbluetoothtransferreply_qnx.cpp
- src/bluetooth/qbluetoothdevicediscoveryagent_qnx.cpp
- src/bluetooth/qbluetoothserviceinfo_qnx.cpp
- src/bluetooth/qbluetoothsocket_qnx.cpp
- src/bluetooth/qrfcommserver_qnx.cpp
- tests/auto/qndefnfcsmartposterrecord/tst_qndefnfcsmartposterrecord.cpp
-Copyright: 2011-2013 Research In Motion
-License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
-
-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
--
qtconnectivity packaging
More information about the pkg-kde-commits
mailing list