[SCM] modemmanager-qt packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-11-g6e3329e

[Rohan Garg]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/modemmanager-qt.git;a=commitdiff;h=6e3329e

The following commit has been merged in the kubuntu_unstable branch:
commit 6e3329ee4484058fd2c34fa80ef1f3104fac2361
Merge: 771203b8e7be8f81d5cb42165d03575fe281b601 4ee94511dec03d25bce59e065b73187cbad29ebd
Author: Rohan Garg <rohan at garg.io>
Date:   Tue Jun 30 17:21:09 2015 +0200

    Merge branch 'master' into kubuntu_unstable
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/changelog | 13 +++++++++----
 debian/control   |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --cc debian/changelog
index 078e307,bf4906d..6f319c1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,32 -1,11 +1,37 @@@
+ modemmanager-qt (5.11.0-1) unstable; urgency=medium
+ 
++  [ Maximiliano Curia ]
+   * New upstream release (5.10.0).
+   * Remove upstream applied patch: upstream_insert_missing_license_text
+   * New upstream release (5.11.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 26 Jun 2015 15:41:02 +0200
+ 
 +modemmanager-qt (5.10.0-0ubuntu4) wily; urgency=medium
 +
 +  * chmod 755 debian/tests/testsuite.xsession
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 23 Jun 2015 17:21:17 +0200
 +
 +modemmanager-qt (5.10.0-0ubuntu3) wily; urgency=medium
 +
 +  * Update tests to run in xsesson with dbus
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 23 Jun 2015 14:21:19 +0200
 +
 +modemmanager-qt (5.10.0-0ubuntu2) wily; urgency=medium
 +
 +  * No change rebuild to retry tests
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 22 Jun 2015 13:47:09 +0200
 +
 +modemmanager-qt (5.10.0-0ubuntu1) wily; urgency=medium
 +
-   [ Maximiliano Curia ]
-   * New upstream release (5.10.0).
-   * Remove upstream applied patch: upstream_insert_missing_license_text
- 
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 03 Jun 2015 21:00:32 +0200
 +
  modemmanager-qt (5.9.0-1) experimental; urgency=medium
  
    * Prepare Debian release. (5.9.0-1)

-- 
modemmanager-qt packaging