[SCM] modemmanager-qt packaging branch, kubuntu_unstable, updated. 0200ff8099d0a645ac9e0206985ebba077d8a9ae
Kubuntu CI (Harald Sitter)
kubuntu-ci-guest at moszumanska.debian.org
Sat Apr 11 21:43:06 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/modemmanager-qt.git;a=commitdiff;h=0200ff8
The following commit has been merged in the kubuntu_unstable branch:
commit 0200ff8099d0a645ac9e0206985ebba077d8a9ae
Merge: 327b6fad1516450f2073842ecf64578ddd1b7c55 5b925a7e0b301c5e5facb90348a81fc895d4c191
Author: Jonathan Riddell <jr at jriddell.org>
Date: Sat Apr 11 23:34:53 2015 +0200
merge in unstable
debian/changelog | 11 +
debian/control | 38 +-
debian/copyright | 4 +-
debian/libkf5modemmanagerqt5.symbols | 417 ----------------
...erqt5.install => libkf5modemmanagerqt6.install} | 2 +-
debian/libkf5modemmanagerqt6.symbols | 540 +++++++++++++++++++++
debian/meta/upstream_scm.json | 1 -
debian/rules | 5 +-
debian/tests/control | 10 +-
debian/tests/testsuite | 9 +-
debian/tests/testsuite.xsession | 10 +
debian/watch | 4 +-
12 files changed, 600 insertions(+), 451 deletions(-)
diff --cc debian/changelog
index 325edda,baafacf..3f49ef7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,13 +1,32 @@@
-modemmanager-qt (5.8.50-0ubuntu1) UNRELEASED; urgency=medium
++modemmanager-qt (5.9.0-0ubuntu1) vivid; urgency=medium
+
++ [ Harald Sitter ]
+ * Library moved to frameworks release scope, renamed source.
+ * So version bump 6, adjust package naming accordingly
+ * Fix install file to not wildcard the entire soversion, so the build breaks
+ when upstream does a bump again
+ * Mark the lib and dbg package multiarch same
+
+ -- Harald Sitter <sitter at kde.org> Thu, 02 Apr 2015 10:26:25 +0200
+
+libmm-qt (4:5.2.2-1) experimental; urgency=medium
+
+ * New upstream release (5.2.1).
+ * New upstream release (5.2.2).
+
+ -- Maximiliano Curia <maxy at debian.org> Wed, 25 Mar 2015 23:17:28 +0100
+
+libmm-qt (4:5.2.0-1) experimental; urgency=medium
+
+ * Prepare initial Debian release.
+ * Update build dependencies to build against experimental and to
+ follow cmake.
+ * Update copyright information.
+ * Update install files.
+ * Add basic autopkgtests support.
+
+ -- Maximiliano Curia <maxy at debian.org> Tue, 10 Feb 2015 20:00:50 +0100
+
libmm-qt (5.2.2-0ubuntu1) vivid; urgency=medium
* New upstream release
diff --cc debian/control
index 1e883fa,ee8ba34..54cc1ef
--- a/debian/control
+++ b/debian/control
@@@ -1,21 -1,20 +1,21 @@@
- Source: libmm-qt
- Section: libs
- Priority: optional
+ Source: modemmanager-qt
+ Priority: extra
Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Build-Depends: cmake,
- debhelper (>= 9.0.0),
- extra-cmake-modules (>= 1.3.0~),
- libkf5networkmanagerqt-dev (>= 5.8.0),
+Uploaders: Maximiliano Curia <maxy at debian.org>
+Build-Depends: cmake (>= 2.8.12),
+ debhelper (>= 9),
- extra-cmake-modules (>= 1.3.0~),
- libkf5networkmanagerqt-dev,
- modemmanager-dev (>= 1.0),
++ extra-cmake-modules (>= 5.9.0),
++ libkf5networkmanagerqt-dev (>= 5.9.0),
+ modemmanager-dev,
pkg-config,
pkg-kde-tools (>= 0.15.15ubuntu1~),
- qtbase5-dev (>= 5.2.0)
+ qtbase5-dev
Standards-Version: 3.9.6
+ Section: libs
+ Homepage: https://projects.kde.org/projects/frameworks/modemmanager-qt
XS-Testsuite: autopkgtest
- Homepage: https://projects.kde.org/projects/kde/workspace/libmm-qt
- Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/plasma/libmm-qt.git
- Vcs-Git: git://anonscm.debian.org/pkg-kde/plasma/libmm-qt.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/frameworks/modemmanager-qt.git
++Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/frameworks/modemmanager-qt.git/
+ Vcs-Git: git://anonscm.debian.org/pkg-kde/frameworks/modemmanager-qt.git
Package: libkf5modemmanagerqt-dev
Section: libdevel
@@@ -38,14 -36,14 +37,15 @@@ Depends: ${misc:Depends}, ${shlibs:Depe
Description: Qt wrapper library for ModemManager
Qt wrapper for ModemManager DBus API.
.
- This package is part of the KDE Plasma.
+ This package is part of the KDE Frameworks.
- Package: libkf5modemmanagerqt5-dbg
+ Package: libkf5modemmanagerqt6-dbg
Section: debug
+Priority: extra
Architecture: any
- Depends: libkf5modemmanagerqt5 (= ${binary:Version}), ${misc:Depends}
+ Multi-Arch: same
Recommends: qtbase5-dbg
+ Depends: libkf5modemmanagerqt6 (= ${binary:Version}), ${misc:Depends}
Description: Qt wrapper for networkmanager - debug files
Qt wrapper for ModemManager DBus API.
.
diff --cc debian/copyright
index e65e352,4da2cd4..7c5f560
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,47 -1,39 +1,47 @@@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
- Upstream-Name: libmm-qt
- Source: git://anongit.kde.org/libmm-qt
+ Upstream-Name: modemmanager-qt
-Source: ftp://ftp.kde.org/pub/kde/stable/frameworks/modemmanager-qt
++Source: http://download.kde.org/stable/frameworks/
Files: *
-Copyright: 2013-2014 Lukas Tinkl <ltinkl at redhat.com> <jgrulich at redhat.com>
- 2013 Grulich <jgrulich at redhat.com>
- 2010-2013 Lamarque Souza <lamarque at kde.org>
- 2008, 2011 Will Stephenson <wstephenson at kde.org>
- 2013 Anant Kamath <kamathanant at gmail.com>
- 2013 Daniel Nicoletti <dantti12 at gmail.com>
- 2013 Lamarque V. Souza <lamarque at kde.org>
- 2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
-License: LGPL-KDEeV
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) version 3, or any
- later version accepted by the membership of KDE e.V. (or its
- successor approved by the membership of KDE e.V.), which shall
- act as a proxy defined in Section 6 of version 3 of the license.
- .
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
+Copyright: 2013, Anant Kamath <kamathanant at gmail.com>
+ 2013, Daniel Nicoletti <dantti12 at gmail.com>
+ 2013, Digia Plc and/or its subsidiary(-ies)
+ 2013-2014, Lukas Tinkl <jgrulich at redhat.com>
+ 2010-2013, Lamarque Souza <lamarque at kde.org>
+ 2013-2014, Lukas Tinkl <ltinkl at redhat.com>
+ 2008-2011, Will Stephenson <wstephenson at kde.org>
+License: LGPL-2.1+3+KDEeV
+
+Files: cmake/FindModemManager.cmake
+Copyright: 2006, Alexander Neundorf <neundorf at kde.org>
+ 2007, Will Stephenson <wstephenson at kde.org>
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
.
- You should have received a copy of the GNU Lesser General Public
- License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ 1. Redistributions of source code must retain the copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
.
- 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".
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ 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.
Files: examples/main.cpp
-Copyright: 2013 Jan Grulich <jgrulich at redhat.com>
-License: GPL-KDEeV
+Copyright: 2013, Jan Grulich <jgrulich at redhat.com>
+License: GPL-2+3+KDEeV
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2 of
diff --cc debian/tests/testsuite
index dabe645,00220b9..00220b9
mode 100755,100644..100755
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
--
modemmanager-qt packaging
More information about the pkg-kde-commits
mailing list