diff -pruN 0.9.0.9-1/debian/changelog 0.9.0.9-1ubuntu1/debian/changelog
--- 0.9.0.9-1/debian/changelog	2013-06-28 20:45:28.000000000 +0000
+++ 0.9.0.9-1ubuntu1/debian/changelog	2013-07-30 14:08:00.000000000 +0000
@@ -1,3 +1,20 @@
+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 <ari-tczew@tlen.pl>  Sat, 27 Jul 2013 01:19:42 +0200
+
 networkmanagement (0.9.0.9-1) unstable; urgency=low
 
   [ Felix Geyer ]
@@ -11,6 +28,25 @@ networkmanagement (0.9.0.9-1) unstable;
 
  -- Michael Biebl <biebl@debian.org>  Fri, 28 Jun 2013 22:44:59 +0200
 
+networkmanagement (0.9.0.9-0ubuntu1) saucy; urgency=low
+
+  * New upstream release. 
+  * Upgraded build-dep to network-manager-dev >= 0.9.8 per 
+    upstream instructions. 
+  * Breaks/replaces old kde-workspace-data for moved icon
+
+ -- Howard Chan <smartboyhw@gmail.com>  Mon, 17 Jun 2013 22:19:06 +0800
+
+networkmanagement (0.9.0.8-3ubuntu1) saucy; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - Replace kdebase-workspace with kde-workspace in package dependencies.
+    - Suggest instead of recommend network-manager plugins.
+    - Adjust package version check in plasma-widget-networkmanagement.preinst.
+  * Switch to debhelper compat level v9 so build flags are exported.
+
+ -- Felix Geyer <debfx@ubuntu.com>  Thu, 16 May 2013 22:48:59 +0200
+
 networkmanagement (0.9.0.8-3) unstable; urgency=low
 
   * Upload to unstable.
@@ -31,12 +67,28 @@ networkmanagement (0.9.0.8-1) experiment
 
  -- Michael Biebl <biebl@debian.org>  Mon, 18 Mar 2013 23:08:54 +0100
 
+networkmanagement (0.9.0.8-0ubuntu1) raring; urgency=low
+
+  * New upstream bugfix release
+    - Drop use_ibss_rsn_instead_of_wpa-none.patch, now included upstream
+
+ -- Scott Kitterman <scott@kitterman.com>  Sat, 16 Mar 2013 18:08:57 -0400
+
 networkmanagement (0.9.0.7-1) experimental; urgency=low
 
   * New upstream release.
 
  -- Michael Biebl <biebl@debian.org>  Sun, 27 Jan 2013 21:36:56 +0100
 
+networkmanagement (0.9.0.7-0ubuntu1) raring; urgency=low
+
+  * New upstream bugfix release (LP: #1112227)
+  * Drop now included upstream patches:
+    - add_gtc_md5.diff
+    - git_fix_doAskUser_for_vpn_secrets_64988f7.patch
+
+ -- Philip Muškovac <yofel@kubuntu.org>  Mon, 11 Feb 2013 02:34:09 +0100
+
 networkmanagement (0.9.0.6-1) experimental; urgency=low
 
   * New upstream release.
@@ -46,12 +98,70 @@ networkmanagement (0.9.0.6-1) experiment
 
  -- Michael Biebl <biebl@debian.org>  Mon, 07 Jan 2013 00:45:21 +0100
 
+networkmanagement (0.9.0.5-0ubuntu3) raring; urgency=low
+
+  * debian/patches/git_fix_doAskUser_for_vpn_secrets_64988f7.patch: fix asking
+    the user for secrets when establishing a VPN connection.
+
+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Thu, 06 Dec 2012 16:28:58 -0500
+
+networkmanagement (0.9.0.5-0ubuntu2) raring; urgency=low
+
+  * Add debian/patches/add_gtc_md5.diff to fix inability to configure WPA2
+    connections for TTLS/EAP-GTC networks (LP: #1085442)
+
+ -- Scott Kitterman <scott@kitterman.com>  Sat, 01 Dec 2012 12:09:46 -0500
+
+networkmanagement (0.9.0.5-0ubuntu1) quantal; urgency=low
+
+  * New upstream bugfix release, LP: #1063422
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 07 Oct 2012 22:08:30 +0100
+
+networkmanagement (0.9.0.4-0ubuntu2) quantal; urgency=low
+
+  * debian/patches/use_ibss_rsn_instead_of_wpa-none.patch: Use IBSS-RSN rather
+    than WPA-None when creating ad-hoc networks; WPA-None is broken in the
+    kernel anyway. (LP: #1046918)
+
+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Fri, 07 Sep 2012 16:10:28 -0400
+
+networkmanagement (0.9.0.4-0ubuntu1) quantal; urgency=low
+
+  * New upstream release (LP: #1029550)
+
+ -- Achim Bohnet <allee@kubuntu.org>  Fri, 10 Aug 2012 16:09:49 +0000
+
 networkmanagement (0.9.0.3-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Michael Biebl <biebl@debian.org>  Tue, 19 Jun 2012 00:51:58 +0200
 
+networkmanagement (0.9.0.3-0ubuntu2) quantal; urgency=low
+
+  * Add libopenconnect-dev to build-dependencies (LP: #923587)
+
+ -- Jonathan Kolberg <bulldog98@kubuntu.org>  Tue, 24 Jul 2012 12:30:08 +0200
+
+networkmanagement (0.9.0.3-0ubuntu1) quantal; urgency=low
+
+  * New upstream release (LP: #1014753)
+
+ -- Philip Muškovac <yofel@kubuntu.org>  Mon, 18 Jun 2012 19:43:43 +0200
+
+networkmanagement (0.9.0.2-1ubuntu1) quantal; urgency=low
+
+  * Merge with Debian unstable, remaining changes:
+    - Build-depend on kde-workspace-dev instead of kdebase-workspace-dev 
+    - plasma-widget-networkmanagement suggests kde-workspace-bin instead of
+      kdebase-workspace-bin
+    - plasma-widget-networkmanagement suggests instead of recommends
+    - plasma-widget-networkmanagement-dbg suggests kde-workspace-dbg
+      instead of kdebase-workspace-dbg
+
+ -- Jonathan Thomas <echidnaman@kubuntu.org>  Mon, 04 Jun 2012 23:08:14 -0400
+
 networkmanagement (0.9.0.2-1) unstable; urgency=low
 
   * New upstream release.
@@ -65,6 +175,41 @@ networkmanagement (0.9.0.1-1) unstable;
 
  -- Michael Biebl <biebl@debian.org>  Mon, 09 Apr 2012 11:38:15 +0200
 
+networkmanagement (0.9.0.1-0ubuntu2) precise-proposed; urgency=low
+
+  * Rebuild for .pot generation
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 12 Apr 2012 16:32:09 +0100
+
+networkmanagement (0.9.0.1-0ubuntu1) precise; urgency=low
+
+  * New upstream release
+  * Add build-dep on libnm-glib-dev
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 09 Apr 2012 14:24:01 +0100
+
+networkmanagement (0.9.0.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Add Build-Depends on libnm-glib-dev.
+
+ -- Michael Biebl <biebl@debian.org>  Mon, 09 Apr 2012 11:38:15 +0200
+
+networkmanagement (0.9.0-1ubuntu1) precise; urgency=low
+
+  * Merge from debian unstable (LP: #922168)
+    remaining changes:
+    - Build-depend on kde-workspace-dev instead of kdebase-workspace-dev 
+    - plasma-widget-networkmanagement suggests kde-workspace-bin instead of
+      kdebase-workspace-bin
+    - plasma-widget-networkmanagement suggests instead of recommends
+      network-manager-vpnc, network-manager-openvpn, network-manager-pptp
+    - keep Breaks/Replaces for plasma-widget-networkmanagement
+    - plasma-widget-networkmanagement-dbg suggests kde-workspace-dbg
+      instead of kdebase-workspace-dbg
+
+ -- Philip Muškovac <yofel@kubuntu.org>  Thu, 01 Mar 2012 18:51:11 +0100
+
 networkmanagement (0.9.0-1) unstable; urgency=low
 
   * New upstream release.
@@ -80,6 +225,93 @@ networkmanagement (0.9.0-1) unstable; ur
 
  -- Michael Biebl <biebl@debian.org>  Tue, 28 Feb 2012 02:41:55 +0100
 
+networkmanagement (0.9.0~rc4-0ubuntu2) precise; urgency=low
+
+  * Cherry pick upstream commit 6a5e30e94ee539b7765eb5ad054bf9e1a6785703
+    as fix-and-workaround-graphical-artifacts.diff
+    to fix graphical artifacts in buttons with the default plasma theme.
+
+ -- Philip Muškovac <yofel@kubuntu.org>  Sat, 11 Feb 2012 20:44:55 +0100
+
+networkmanagement (0.9.0~rc4-0ubuntu1) precise; urgency=low
+
+  * New upstream release candidate.
+
+ -- Felix Geyer <debfx@ubuntu.com>  Sun, 22 Jan 2012 13:52:50 +0100
+
+networkmanagement (0.9.0~rc3-0ubuntu2) precise; urgency=low
+
+  * Fix network-manager-kde version number in debian/rules
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 09 Jan 2012 17:07:32 +0000
+
+networkmanagement (0.9.0~rc3-0ubuntu1) precise; urgency=low
+
+  * New upstream release (0.8.98 aka 0.9.0 rc3).
+  * Drop kubuntu_add_subdirectory_po.diff - merged upstream.
+  * Update debian/compat: bump to 8.
+  * Update debian/control:
+    - bump debhelper build dependency to 8.0.0.
+    - fix transitional-package-should-be-oldlibs-extra lintian warning.
+
+ -- Fathi Boudra <fabo@debian.org>  Sun, 01 Jan 2012 09:27:59 +0200
+
+networkmanagement (0.9~svngit.nm09.20111023.ff842e-0ubuntu1) precise; urgency=low
+
+  * New upstream snapshot.
+  * Drop all patches, merged upstream.
+  * Add kubuntu_add_subdirectory_po.diff to build the translations.
+
+ -- Felix Geyer <debfx-pkg@fobos.de>  Sun, 23 Oct 2011 14:00:13 +0200
+
+networkmanagement (0.9~svngit.nm09.20110610.0c83d8-0ubuntu5) oneiric; urgency=low
+
+  * Cherry pick from upstream:
+    o fix vpnc connetions
+      patches/010_git-5e19d5bbd46ce19f32b8a038fa5121932e905732.patch
+      patches/020_git-8894d0de848c4bad7ae689eba62e3f34089b6510.patch
+
+    o Makes kded module starts to emit notifications only after the plasmoid
+      has been created
+      patches/015_git-785023bf778b7cabbb482cac74b20896a07cb82f.patch
+
+ -- Achim Bohnet <allee@kubuntu.org>  Thu, 29 Sep 2011 19:14:52 +0200
+
+networkmanagement (0.9~svngit.nm09.20110610.0c83d8-0ubuntu4) oneiric; urgency=low
+
+  * No-change rebuild to stop desktop file stripping (LP: #851953)
+
+ -- Harald Sitter <apachelogger@ubuntu.com>  Fri, 16 Sep 2011 17:47:02 +0200
+
+networkmanagement (0.9~svngit.nm09.20110610.0c83d8-0ubuntu3) oneiric; urgency=low
+
+  * debian/patches/nm_versions_comparison.patch: workaround version checking
+    issues in UI (and in build...) by specifying a slightly higher minimum
+    version number for NM libraries. (LP: #838099)
+
+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Thu, 01 Sep 2011 18:50:44 +0200
+
+networkmanagement (0.9~svngit.nm09.20110610.0c83d8-0ubuntu2) oneiric; urgency=low
+
+  * Build-dep on kde-workspace-dev instead of kdebase-workspace-dev
+  * Rebuild for libsolidcontrol transition
+
+ -- Scott Kitterman <scott@kitterman.com>  Fri, 22 Jul 2011 11:17:29 -0400
+
+networkmanagement (0.9~svngit.nm09.20110610.0c83d8-0ubuntu1) oneiric; urgency=low
+
+  * plasma-widget-networkmanagement replaces/breaks
+    network-manager-openvpn-kde, network-manager-pptp-kde,
+    network-manager-strongswan-kde, network-manager-vpnc-kde
+  * Demote network-manager-vpnc, network-manager-openvpn,
+    network-manager-pptp to suggests.
+  * New upstream snapshot from nm09 branch.
+  * Set minimal network-manager version to 0.8.9997.
+  * Install solid nm09 lib.
+  * Add libxrandr-dev to build-deps.
+
+ -- Felix Geyer <debfx-pkg@fobos.de>  Fri, 10 Jun 2011 17:50:50 +0200
+
 networkmanagement (0.9~git20120122.edc9568-1) unstable; urgency=low
 
   * New upstream Git snapshot edc9568628f799e7b1faa9d0ddfa10e3b43b4af9 from
diff -pruN 0.9.0.9-1/debian/control 0.9.0.9-1ubuntu1/debian/control
--- 0.9.0.9-1/debian/control	2013-06-28 20:45:28.000000000 +0000
+++ 0.9.0.9-1ubuntu1/debian/control	2013-07-30 14:08:00.000000000 +0000
@@ -1,7 +1,8 @@
 Source: networkmanagement
 Section: kde
 Priority: optional
-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
+Maintainer: Kubuntu Developers <kubuntu-devel@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Modestas Vainius <modax@debian.org>, Michael Biebl <biebl@debian.org>
 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),
@@ -16,10 +17,11 @@ Package: plasma-widget-networkmanagement
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.9.8),
  mobile-broadband-provider-info
-Suggests: kde-workspace-bin, network-manager-openconnect
-Recommends: kwalletmanager, network-manager-vpnc, network-manager-openvpn, network-manager-pptp
-Replaces: knm-runtime
-Breaks: knm-runtime
+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)
 Description: Network Management widget for KDE Plasma workspaces
  This package contains the Network Management plasma widget which aims to
  provide a fully featured GUI for managing networks. Currently, the only
diff -pruN 0.9.0.9-1/debian/plasma-widget-networkmanagement.install 0.9.0.9-1ubuntu1/debian/plasma-widget-networkmanagement.install
--- 0.9.0.9-1/debian/plasma-widget-networkmanagement.install	2013-06-28 20:45:28.000000000 +0000
+++ 0.9.0.9-1ubuntu1/debian/plasma-widget-networkmanagement.install	2013-07-30 14:08:00.000000000 +0000
@@ -10,6 +10,7 @@ usr/lib/kde4/networkmanagement_vpncui.so
 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,6 +35,8 @@ usr/share/kde4/services/networkmanagemen
 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
