Merge lp:~ari-tczew/ubuntu/saucy/networkmanagement/lp-1205545 into lp:ubuntu/saucy/networkmanagement

[Artur Rona]

[Daniel Holbach (dholbach)]

Thanks. Uploaded.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-17 22:19:06 +0000
+++ debian/changelog	2013-07-28 22:12:27 +0000
@@ -1,3 +1,33 @@
+networkmanagement (0.9.0.9-1ubuntu1) saucy; urgency=low
+
+  [ Artur Rona ]
+  * Merge from Debian unstable. (LP: #1205545) Remaining changes:
+    - debian/control:
+      + Suggest instead of recommend network-manager plugins.
+      + Breaks/Replaces old kde-workspace-data for moved icon.
+    - debian/plasma-widget-networkmanagement.install:
+      + Add .desktop files for Modem Manager.
+  * Stop shipping unused headers. (LP: #1195498)
+
+  [ Felix Geyer ]
+  * debian/plasma-widget-networkmanagement.install:
+    - Add missing solid_modemmanager05.so.
+
+ -- Artur Rona <[e-mail]>  Sat, 27 Jul 2013 01:19:42 +0200
+
+networkmanagement (0.9.0.9-1) unstable; urgency=low
+
+  [ Felix Geyer ]
+  * Replace kdebase-workspace with kde-workspace in package dependencies.
+  * Add network-manager-openconnect to Suggests.
+  * Switch to debhelper compat level v9 which exports build flags.
+
+  [ Michael Biebl ]
+  * New upstream release.
+  * Bump minimum required version of network-manager to 0.9.8.
+
+ -- Michael Biebl <[e-mail]>  Fri, 28 Jun 2013 22:44:59 +0200
+
 networkmanagement (0.9.0.9-0ubuntu1) saucy; urgency=low
 
   * New upstream release. 
@@ -138,6 +168,13 @@
 
  -- Michael Biebl <[e-mail]>  Sat, 12 May 2012 14:46:31 +0200
 
+networkmanagement (0.9.0.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Add Build-Depends on libnm-glib-dev.
+
+ -- Michael Biebl <[e-mail]>  Mon, 09 Apr 2012 11:38:15 +0200
+
 networkmanagement (0.9.0.1-0ubuntu2) precise-proposed; urgency=low
 
   * Rebuild for .pot generation
@@ -637,4 +674,3 @@
   * Initial release. (Closes: #508438)
 
  -- Modestas Vainius <[e-mail]>  Wed, 28 Jan 2009 01:30:31 +0200
-

=== modified file 'debian/control'
--- debian/control	2013-06-17 22:19:06 +0000
+++ debian/control	2013-07-28 22:12:27 +0000
@@ -6,7 +6,7 @@
 Uploaders: Modestas Vainius <[e-mail]>, Michael Biebl <[e-mail]>
 Build-Depends: debhelper (>= 9), cmake (>= 2.6.2), pkg-kde-tools (>= 0.5),
  libqt4-dev (>= 4:4.6.0), kdelibs5-dev (>= 4:4.6.0), kde-workspace-dev (>= 4:4.6.0),
- network-manager-dev (>= 0.9.8), libnm-util-dev (>= 0.9.0), libnm-glib-dev (>= 0.9.0),
+ network-manager-dev (>= 0.9.8), libnm-util-dev (>= 0.9.8), libnm-glib-dev (>= 0.9.8),
  libopenconnect-dev (>= 4.04),
  mobile-broadband-provider-info
 Standards-Version: 3.9.4
@@ -15,10 +15,10 @@
 
 Package: plasma-widget-networkmanagement
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.9.0),
+Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.9.8),
  mobile-broadband-provider-info
-Suggests: kde-workspace-bin, network-manager-vpnc, network-manager-openvpn, 
- network-manager-pptp, network-manager-openconnect
+Suggests: kde-workspace-bin, network-manager-openconnect, network-manager-vpnc,
+ network-manager-openvpn, network-manager-pptp
 Recommends: kwalletmanager
 Replaces: knm-runtime, kde-workspace-data (<< 4:4.10.80)
 Breaks: knm-runtime, kde-workspace-data (<< 4:4.10.80)

=== added file 'debian/gbp.conf'
--- debian/gbp.conf	1970-01-01 00:00:00 +0000
+++ debian/gbp.conf	2013-07-28 22:12:27 +0000
@@ -0,0 +1,3 @@
+[DEFAULT]
+pristine-tar = True
+debian-branch = master

=== added directory 'debian/patches'
=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2013-07-28 22:12:27 +0000
@@ -0,0 +1,1 @@
+# patches for plasma-widget-networkmanagement

=== modified file 'debian/plasma-widget-networkmanagement.install'
--- debian/plasma-widget-networkmanagement.install	2013-06-17 22:19:06 +0000
+++ debian/plasma-widget-networkmanagement.install	2013-07-28 22:12:27 +0000
@@ -10,6 +10,7 @@
 usr/lib/kde4/networkmanagement_openconnectui.so
 usr/lib/kde4/plasma_applet_networkmanagement.so
 usr/lib/kde4/plasma_engine_networkmanagement.so
+usr/lib/kde4/solid_modemmanager05.so
 usr/lib/kde4/solid_networkmanager09.so
 usr/lib/libknm_nm.so
 usr/lib/libknmclient.so.*
@@ -34,54 +35,8 @@
 usr/share/kde4/services/networkmanagement_openconnectui.desktop
 usr/share/kde4/services/plasma-applet-networkmanagement.desktop
 usr/share/kde4/services/plasma-engine-networkmanagement.desktop
+usr/share/kde4/services/solidbackends/solid_modemmanager05.desktop
 usr/share/kde4/services/solidbackends/solid_networkmanager09.desktop
 usr/share/kde4/servicetypes/networkmanagement_vpnuiplugin.desktop
+usr/share/kde4/servicetypes/solidmodemmanagernm09.desktop
 usr/share/kde4/servicetypes/solidnetworkmanagernm09.desktop
-usr/share/kde4/services/solidbackends/solid_modemmanager05.desktop 
-usr/share/kde4/servicetypes/solidmodemmanagernm09.desktop 
-usr/include/solid/controlnm09/solid_control_export.h 
-usr/include/solid/controlnm09/modemgsmcardinterface.h 
-usr/include/solid/controlnm09/networkmodeminterface.h 
-usr/include/solid/controlnm09/networkbtinterface.h 
-usr/include/solid/controlnm09/networkserialinterface.h 
-usr/include/solid/controlnm09/singletondefs.h 
-usr/include/solid/controlnm09/networkipv4config.h 
-usr/include/solid/controlnm09/modemmanager.h 
-usr/include/solid/controlnm09/modemmanagerinterface.h 
-usr/include/solid/controlnm09/modemgsmussdinterface.h 
-usr/include/solid/controlnm09/modemgsmnetworkinterface.h 
-usr/include/solid/controlnm09/modeminterface.h 
-usr/include/solid/controlnm09/networking.h 
-usr/include/solid/controlnm09/networkgsminterface.h 
-usr/include/solid/controlnm09/networkipv4confignm09.h 
-usr/include/solid/controlnm09/wirelessaccesspoint.h 
-usr/include/solid/controlnm09/wirednetworkinterface.h 
-usr/include/solid/controlnm09/networkcdmainterface.h 
-usr/include/solid/controlnm09/networkmanager.h 
-usr/include/solid/controlnm09/modemcdmainterface.h 
-usr/include/solid/controlnm09/networkinterface.h 
-usr/include/solid/controlnm09/modemgsmsmsinterface.h 
-usr/include/solid/controlnm09/wirelessnetworkinterface.h 
-usr/include/solid/controlnm09/modemgsmcontactsinterface.h 
-usr/include/solid/controlnm09/modemgsmhsointerface.h 
-usr/include/solid/controlnm09/modemlocationinterface.h 
-usr/include/solid/controlnm09/ifaces/modemgsmcardinterface.h 
-usr/include/solid/controlnm09/ifaces/networkmodeminterface.h 
-usr/include/solid/controlnm09/ifaces/networkbtinterface.h 
-usr/include/solid/controlnm09/ifaces/modemmanager.h 
-usr/include/solid/controlnm09/ifaces/modemmanagerinterface.h 
-usr/include/solid/controlnm09/ifaces/modemgsmussdinterface.h 
-usr/include/solid/controlnm09/ifaces/modemgsmnetworkinterface.h 
-usr/include/solid/controlnm09/ifaces/modeminterface.h 
-usr/include/solid/controlnm09/ifaces/wirelessaccesspoint.h 
-usr/include/solid/controlnm09/ifaces/wirednetworkinterface.h 
-usr/include/solid/controlnm09/ifaces/networkmanager.h 
-usr/include/solid/controlnm09/ifaces/modemcdmainterface.h 
-usr/include/solid/controlnm09/ifaces/networkinterface.h 
-usr/include/solid/controlnm09/ifaces/modemgsmsmsinterface.h 
-usr/include/solid/controlnm09/ifaces/wirelessnetworkinterface.h 
-usr/include/solid/controlnm09/ifaces/modemgsmcontactsinterface.h 
-usr/include/solid/controlnm09/ifaces/modemgsmhsointerface.h 
-usr/include/solid/controlnm09/ifaces/authentication.h 
-usr/include/solid/controlnm09/ifaces/modemlocationinterface.h
-

=== modified file 'debian/plasma-widget-networkmanagement.preinst'
--- debian/plasma-widget-networkmanagement.preinst	2013-05-16 22:48:59 +0000
+++ debian/plasma-widget-networkmanagement.preinst	2013-07-28 22:12:27 +0000
@@ -29,7 +29,7 @@
     fi
 }
 
-if [ "$1" = upgrade ] && dpkg --compare-versions "$2" lt-nl "0.9.0.8-3ubuntu1"  ; then
+if [ "$1" = upgrade ] && dpkg --compare-versions "$2" lt-nl "0.9.0.8-2"  ; then
     # The conffile was moved from knm-runtime to p-n-m during
     # development of wheezy so we need some special handling of this case
     rm_conffile plasma-widget-networkmanagement "/etc/dbus-1/system.d/NetworkManager-kde4.conf"