[SCM] qtsystems packaging branch, master, updated. 00b5912400b45fbcf7486370b08f9c2b4b88fbaf
Timo Jyrinki
timo at moszumanska.debian.org
Tue Jul 15 07:53:33 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtsystems.git;a=commitdiff;h=13af95f
The following commit has been merged in the master branch:
commit 13af95f2604bdcae53449b9be53abe2275a54b96
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date: Tue Jul 15 07:47:03 2014 +0000
wrap-and-sort control and copyright files
---
debian/control | 55 +++++++++++++++++++++++++++++++++----------------------
debian/copyright | 29 ++++++++++++++---------------
2 files changed, 47 insertions(+), 37 deletions(-)
diff --git a/debian/control b/debian/control
index 7ebe27b..f2d2ec9 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@ Source: qtsystems-opensource-src
Section: libs
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Timo Jyrinki <timo at debian.org>
+Uploaders: Timo Jyrinki <timo at debian.org>,
Build-Depends: debhelper (>= 9),
+ libqt5sql5-sqlite (>= 5.3.0~),
pkg-kde-tools,
qtbase5-private-dev (>= 5.3.0~),
qtdeclarative5-private-dev (>= 5.3.0~),
- libqt5sql5-sqlite (>= 5.3.0~),
Standards-Version: 3.9.4
Homepage: http://qt-project.org/
Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtsystems.git
@@ -16,8 +16,9 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/qt/qtsystems.git;a=summ
Package: libqt5serviceframework5
Architecture: any
Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends},
+Depends: ${misc:Depends},
+ ${shlibs:Depends},
Description: Qt Systems module - service framework
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
@@ -31,8 +32,10 @@ Description: Qt Systems module - service framework
Package: qtdeclarative5-serviceframework-plugin
Architecture: any
Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: libqt5serviceframework5, ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends},
+Depends: libqt5serviceframework5,
+ ${misc:Depends},
+ ${shlibs:Depends},
Description: Qt Systems module - service framework QML plugin
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
@@ -46,8 +49,9 @@ Description: Qt Systems module - service framework QML plugin
Package: libqt5publishsubscribe5
Architecture: any
Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends},
+Depends: ${misc:Depends},
+ ${shlibs:Depends},
Description: Qt Systems module - publish subscribe
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
@@ -61,8 +65,10 @@ Description: Qt Systems module - publish subscribe
Package: qtdeclarative5-publishsubscribe-plugin
Architecture: any
Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: libqt5publishsubscribe5, ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends},
+Depends: libqt5publishsubscribe5,
+ ${misc:Depends},
+ ${shlibs:Depends},
Description: Qt Systems module - publish subscribe QML plugin
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
@@ -76,8 +82,9 @@ Description: Qt Systems module - publish subscribe QML plugin
Package: libqt5systeminfo5
Architecture: any
Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends},
+Depends: ${misc:Depends},
+ ${shlibs:Depends},
Description: Qt Systems module - system info
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
@@ -91,8 +98,10 @@ Description: Qt Systems module - system info
Package: qtdeclarative5-systeminfo-plugin
Architecture: any
Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: libqt5systeminfo5, ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends},
+Depends: libqt5systeminfo5,
+ ${misc:Depends},
+ ${shlibs:Depends},
Description: Qt Systems module - System Info QML plugin
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
@@ -110,7 +119,7 @@ Depends: libqt5publishsubscribe5 (= ${binary:Version}),
libqt5serviceframework5 (= ${binary:Version}),
libqt5systeminfo5 (= ${binary:Version}),
qtbase5-dev,
- ${misc:Depends}
+ ${misc:Depends},
Description: Qt 5 Systems development files
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
@@ -125,7 +134,8 @@ Description: Qt 5 Systems development files
Package: qtsystems5-private-dev
Architecture: any
Section: libdevel
-Depends: qtsystems5-dev (= ${binary:Version}), ${misc:Depends}
+Depends: qtsystems5-dev (= ${binary:Version}),
+ ${misc:Depends},
Description: Qt 5 Systems private development files
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
@@ -142,12 +152,12 @@ Description: Qt 5 Systems private development files
Package: qtsystems5-tools
Architecture: any
Section: libdevel
-Pre-Depends: ${misc:Pre-Depends}
+Pre-Depends: ${misc:Pre-Depends},
Depends: libqt5publishsubscribe5 (= ${binary:Version}),
libqt5serviceframework5 (= ${binary:Version}),
libqt5systeminfo5 (= ${binary:Version}),
${misc:Depends},
- ${shlibs:Depends}
+ ${shlibs:Depends},
Description: Qt 5 Systems tools
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
@@ -162,8 +172,9 @@ Description: Qt 5 Systems tools
Package: qtsystems5-examples
Architecture: any
Section: libdevel
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends},
+Depends: ${misc:Depends},
+ ${shlibs:Depends},
Description: Qt 5 Systems examples
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
@@ -181,8 +192,8 @@ Section: debug
Depends: libqt5publishsubscribe5 (= ${binary:Version}),
libqt5serviceframework5 (= ${binary:Version}),
libqt5systeminfo5 (= ${binary:Version}),
- ${misc:Depends}
-Suggests: qtsystems5-examples (= ${binary:Version})
+ ${misc:Depends},
+Suggests: qtsystems5-examples (= ${binary:Version}),
Description: Qt Systems library debugging symbols
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
diff --git a/debian/copyright b/debian/copyright
index df675c3..a6f97f1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -87,24 +87,24 @@ Copyright: 2010 John Resig
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
- "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
+ 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
+ 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
+ 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.
Files: tests/auto/cmake/test_modules/main.cpp
@@ -160,4 +160,3 @@ License: GFDL-1.3
Files: examples/systeminfo/stub.h examples/systeminfo/qml-deviceinfo/main.cpp examples/systeminfo/qml-deviceinfo/qml-deviceinfo.qml examples/systeminfo/qml-storageinfo/main.cpp examples/systeminfo/qml-storageinfo/qml-storage.qml examples/systeminfo/qml-battery/main.cpp examples/systeminfo/qml-battery/qml-battery.qml doc/src/serviceframework/snippets/code/doc_src_lgpl.qdoc
Copyright: 2012-2013 Digia Plc and/or its subsidiary(-ies)
License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
-
--
qtsystems packaging
More information about the pkg-kde-commits
mailing list