[SCM] kjsembed packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-3-ge1d16d9

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kjsembed.git;a=commitdiff;h=e1d16d9

The following commit has been merged in the kubuntu_unstable branch:
commit e1d16d9d1ce70a756542d6dedab23c75cb2a5a56
Merge: 520617bb985bbf13f42f11c86c9a471ad9b0bc0a 11a2bc128a0b713ddc9935062c694b4a9949cd9f
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Jul 2 07:57:09 2015 +0200

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

 debian/changelog |  8 ++++++++
 debian/control   | 12 ++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --cc debian/changelog
index 97a1415,6f09dbe..6a9b82c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,11 +1,22 @@@
+ kjsembed (5.11.0-1) unstable; urgency=medium
+ 
+   * New upstream release (5.10.0).
+   * Update symbols files from buildds logs (5.9.0-1).
+   * New upstream release (5.11.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sun, 28 Jun 2015 15:08:21 +0200
+ 
 +kjsembed (5.10.0-0ubuntu1) wily; urgency=medium
 +
 +  [ Maximiliano Curia ]
 +  * New upstream release (5.10.0).
 +  * Update symbols files from buildds logs (5.9.0-1).
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 03 Jun 2015 21:09:47 +0200
 +
  kjsembed (5.9.0-1) experimental; urgency=medium
  
    * New upstream release (5.9.0).

-- 
kjsembed packaging