[SCM] networkmanager-qt packaging branch, master, updated. 7ce37f04234f287539fab976ad921a4756e7c243
Maximiliano Curia
maxy at moszumanska.debian.org
Sat Mar 14 23:22:22 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/networkmanager-qt.git;a=commitdiff;h=b89137a
The following commit has been merged in the master branch:
commit b89137af16d3c7aca5014a74df0c1f211c1f6e3d
Merge: cfadfca8b95b9fd3c8aed3d148554cef24bd89e4 b9e9b6ac5223ada5bbc7db064362b4af1c3ff36a
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Wed Mar 4 11:06:49 2015 +0100
Merge remote-tracking branch 'origin/kubuntu_vivid_archive'
Conflicts:
debian/changelog
debian/control
debian/copyright
debian/libkf5networkmanagerqt-dev.install
debian/libkf5networkmanagerqt6.symbols
debian/tests/control
debian/tests/testsuite.xsession
debian/watch
debian/changelog | 35 ++++++++++++++++++++++++++++++++++
debian/control | 9 ++++-----
debian/libkf5networkmanagerqt6.symbols | 16 +++++++++++++++-
debian/watch | 5 ++---
4 files changed, 56 insertions(+), 9 deletions(-)
diff --cc debian/changelog
index b9067cc,777df0e..b22bdd3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,80 +1,53 @@@
+networkmanager-qt (5.7.0-1~) UNRELEASED; urgency=medium
+
+ * New upstream release (5.7.0).
+
+ -- Maximiliano Curia <maxy at debian.org> Tue, 24 Feb 2015 17:52:55 +0100
+
+ networkmanager-qt (5.7.0-0ubuntu1) vivid; urgency=medium
+
+ * New upstream release
+
+ -- Harald Sitter <sitter at kde.org> Tue, 10 Feb 2015 16:37:04 +0100
+
+networkmanager-qt (5.6.0-1) experimental; urgency=medium
+
+ * New upstream release (5.6.0)
+ * Importing packaging from kubuntu efforts.
+ * Bump Standards-Version to 3.9.6, no changes needed.
+ * Update install files.
+ * Update build dependencies to follow cmake.
+ * Update copyright information.
+ * Add missing -dev dependency.
+ * Update symbols files.
+
+ -- Maximiliano Curia <maxy at debian.org> Sat, 24 Jan 2015 19:05:01 +0100
++
+ networkmanager-qt (5.6.0-0ubuntu2) vivid; urgency=medium
+
+ * Rebuild with network-manager 0.9.10.0 for new symbols
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 28 Jan 2015 13:32:56 +0100
+
+ networkmanager-qt (5.6.0-0ubuntu1) vivid; urgency=medium
+
+ * New upstream release
+ * Upstream renamed to networkmanager-qt and new version number
+ to release as part of Frameworks (instead of Plasma)
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Mon, 05 Jan 2015 12:19:39 +0100
+
+ libnm-qt (5.1.1-0ubuntu1) vivid; urgency=medium
+
+ * New upstream release.
-
- -- Scarlett Clark <sgclark at kubuntu.org> Mon, 10 Nov 2014 19:49:54 +0100
-
-libnm-qt (5.1.0.1-0ubuntu1) UNRELEASED; urgency=medium
-
- [ Jonathan Riddell ]
- * New upstream beta release
-
- [ Scarlett Clark ]
+ * Update copyright file to use GPL-KDEeV and LGPL-KDEeV to resolve
+ lintian space error.
+
- -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 01 Oct 2014 16:10:40 +0200
++ -- Scarlett Clark <sgclark at kubuntu.org> Mon, 10 Nov 2014 19:49:54 +0100
+
+ libnm-qt (5.0.93-0ubuntu1) utopic; urgency=medium
+
+ * New upstream release
- * Remove no-human-maintainers lintian-override per ScottK.
++ * Remove no-human-maintainers lintian-override per ScottK.
+
+ -- Scarlett Clark <sgclark at kubuntu.org> Thu, 18 Sep 2014 07:22:50 -0700
-
-libnm-qt (5.0.92-0ubuntu1) UNRELEASED; urgency=medium
-
- [ Jonathan Riddell ]
- * New upstream release
-
- [ Harald Sitter ]
- * switch to new pkg-kde-tools
-
- -- Jonathan Riddell <jriddell at ubuntu.com> Sun, 10 Aug 2014 17:06:20 +0200
-
-libnm-qt (5.0.91-0ubuntu1) utopic; urgency=medium
-
- [ Jonathan Riddell ]
- * New upstream release
-
- [ Scarlett Clark ]
- * Update watch to http://download.kde.org
-
- -- Jonathan Riddell <jriddell at ubuntu.com> Thu, 10 Jul 2014 21:25:03 +0200
-
-libnm-qt (5.0.90-0ubuntu1) utopic; urgency=medium
-
- * New upstream release
- * Upstream set on new version number
-
- -- Jonathan Riddell <jriddell at ubuntu.com> Mon, 07 Jul 2014 14:39:50 +0200
-
-libnm-qt (0.9.9~git20140614-0ubuntu1) utopic; urgency=medium
-
- [ Scarlett Clark ]
- * Initial release.
- * Grab newest git from upstream.
- * Add -dev depend
- * Rename to match soname and re-version
-
- -- Scarlett Clark <scarlett at scarlettgatelyclark.com> Fri, 13 Jun 2014 10:24:08 +0100
diff --cc debian/control
index 8e4ca92,a941a12..26867db
--- a/debian/control
+++ b/debian/control
@@@ -1,28 -1,25 +1,27 @@@
Source: networkmanager-qt
Priority: extra
Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Build-Depends: cmake,
- debhelper (>= 9.0.0),
+Uploaders: Maximiliano Curia <maxy at debian.org>
+Build-Depends: cmake (>= 2.8.12),
+ debhelper (>= 9),
- extra-cmake-modules (>= 1.6.0),
- libnm-glib-dev (>= 0.9.8.4),
- libnm-util-dev (>= 0.9.8.4),
+ extra-cmake-modules (>= 1.7.0),
+ libnm-glib-dev (>= 0.9.10.0),
+ libnm-util-dev (>= 0.9.10.0),
pkg-config,
pkg-kde-tools (>= 0.15.15ubuntu1~),
- qtbase5-dev
-Standards-Version: 3.9.5
+ qtbase5-dev (>= 5.2.0)
+Standards-Version: 3.9.6
Section: libs
-Homepage: https://projects.kde.org/projects/kde/frameworks/libnm-qt
-XS-Testsuite: autopkgtest
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/plasma/libnm-qt.git
-Vcs-Git: git://anonscm.debian.org/pkg-kde/plasma/libnm-qt.git
+Homepage: https://projects.kde.org/projects/frameworks/networkmanager-qt
- XS-Testsuite: autopkgtest
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/frameworks/networkmanager-qt.git
+Vcs-Git: git://anonscm.debian.org/pkg-kde/frameworks/networkmanager-qt.git
Package: libkf5networkmanagerqt-dev
Section: libdevel
Architecture: any
Depends: libkf5networkmanagerqt6 (= ${binary:Version}),
- libnm-glib-dev (>= 0.9.8.4),
++ libnm-glib-dev (>= 0.9.10.0),
+ qtbase5-dev (>= 5.2.0),
${misc:Depends},
${shlibs:Depends}
Description: Qt wrapper for NetworkManager - devel files.
diff --cc debian/watch
index 5903cfb,8371e07..7ec19e9
--- a/debian/watch
+++ b/debian/watch
@@@ -1,4 -1,4 +1,3 @@@
version=3
- http://download.kde.org/unstable/frameworks/([\d\.]+)/networkmanager-qt-(.*)\.tar\.xz
-http://download.kde.org/unstable/plasma/([\d\.]+)/libnm-qt-(.*)\.tar\.xz
--
- http://download.kde.org/stable/frameworks/([\d\.]+)/networkmanager-qt-(.*)\.tar\.xz
-http://download.kde.org/stable/plasma/([\d\.]+)/libnm-qt-(.*)\.tar\.xz
++http://download.kde.org/unstable/frameworks/([\d.]+)/networkmanager-qt-([\d.]+)\.tar\.xz
++http://download.kde.org/stable/frameworks/([\d.]+)/networkmanager-qt-([\d.]+)\.tar\.xz
--
networkmanager-qt packaging
More information about the pkg-kde-commits
mailing list