[SCM] plasma-nm packaging branch, kubuntu_wily_archive, updated. debian/5.2.2-2-34-g8bf9346

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-nm.git;a=commitdiff;h=8bf9346

The following commit has been merged in the kubuntu_wily_archive branch:
commit 8bf93469744887f23d0cf6809b6ef4dd0efea32e
Merge: eb489562b7067aece62c7e980351566172d32201 de6f36e5d782259f65a015db491f2fc93ee53a53
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Jun 29 18:44:14 2015 +0200

    merge master

 debian/.gitattributes |   1 +
 debian/changelog      |  59 +++++++----
 debian/control        |  47 ++++++---
 debian/copyright      | 281 ++++++++++++++++++++++++++++++--------------------
 debian/watch          |   5 +-
 5 files changed, 244 insertions(+), 149 deletions(-)

diff --cc debian/changelog
index 5c33545,2466dbf..0936f00
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,25 +1,45 @@@
 +plasma-nm (4:5.3.2-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 29 Jun 2015 17:34:36 +0200
 +
 +plasma-nm (4:5.3.1-0ubuntu1) wily; urgency=medium
 +
 +  [ Jonathan Riddell ]
 +  * Plasma 5.3 beta
 +  * new upstream release
 +
 +  [ Scarlett Clark ]
 +  * Vivid backport
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 05 Jun 2015 02:41:20 +0200
 +
+ plasma-nm (4:5.3.1-1~) UNRELEASED; urgency=medium
+ 
+   * New upstream release (5.3.0).
+   * Remove upstream patch:
+     upstream_fix_newmodemmanager_framework_integration.patch
+   * New upstream release (5.3.1).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 05 Jun 2015 11:56:05 +0200
+ 
+ plasma-nm (4:5.2.2-2) experimental; urgency=medium
+ 
+   * Merge with kubuntu changes.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Thu, 23 Apr 2015 15:29:20 +0200
+ 
+ plasma-nm (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:44 +0100
+ 
  plasma-nm (4:5.2.2-0ubuntu2) vivid; urgency=medium
  
    * Add upstream patch upstream_fix_newmodemmanager_framework_integration
diff --cc debian/control
index f52b0f1,7e6e0c4..a7c4a6f
--- a/debian/control
+++ b/debian/control
@@@ -1,19 -1,37 +1,37 @@@
  Source: plasma-nm
- Priority: extra
+ Section: kde
+ Priority: optional
  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.3.0~),
                 gettext,
+                kinit-dev,
+                kio-dev,
+                libkf5completion-dev,
+                libkf5configwidgets-dev,
+                libkf5coreaddons-dev,
+                libkf5dbusaddons-dev,
                 libkf5declarative-dev (>= 5.2.0),
+                libkf5i18n-dev,
+                libkf5iconthemes-dev,
+                libkf5itemviews-dev,
                 libkf5kdelibs4support-dev (>= 5.2.0),
-                libkf5networkmanagerqt-dev (>= 4:5.3.2),
+                libkf5networkmanagerqt-dev (>= 5.6.0-0ubuntu2),
+                libkf5notifications-dev,
+                libkf5service-dev,
+                libkf5solid-dev,
                 libkf5wallet-dev (>= 5.2.0),
-                libopenconnect-dev,
+                libkf5widgetsaddons-dev,
+                libkf5windowsystem-dev,
+                libkf5xmlgui-dev,
++               libnm-dev (>= 0.9.8.4),
+                libopenconnect-dev (>= 3.99~),
                 mobile-broadband-provider-info,
-                modemmanager-dev,
-                modemmanager-qt-dev,
-                network-manager-dev,
+                modemmanager-dev (>= 1.0.0~),
+                modemmanager-qt-dev (>= 5.9.0~),
+                network-manager-dev (>= 0.9.8.4),
 -               libnm-dev (>= 0.9.8.4),
                 pkg-config,
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
                 plasma-framework-dev (>= 5.2.0),

-- 
plasma-nm packaging