[SCM] kcodecs packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-3-g8425c5d

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 8425c5d5093bbf26343b710882ca04f67ead907b
Merge: 403d08dcf2f26d288eaf4cce6d56f4d8326679a8 8e9d3ac86183ef7530376871a3b228c49fd152f4
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Jul 2 07:17:46 2015 +0200

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

 debian/changelog             |  8 ++++++++
 debian/control               |  2 +-
 debian/copyright             | 13 -------------
 debian/libkf5codecs5.symbols |  6 +++++-
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --cc debian/changelog
index 5d453ed,98186e5..2d66688
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,11 +1,21 @@@
+ kcodecs (5.11.0-1) unstable; urgency=medium
+ 
+   * New upstream release (5.10.0).
+   * New upstream release (5.11.0).
+   * Update symbols files.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 26 Jun 2015 18:27:44 +0200
+ 
 +kcodecs (5.10.0-0ubuntu1) wily; urgency=medium
 +
 +  [ Maximiliano Curia ]
 +  * New upstream release (5.10.0).
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 03 Jun 2015 20:59:32 +0200
 +
  kcodecs (5.9.0-1) experimental; urgency=medium
  
    * New upstream release (5.9.0).

-- 
kcodecs packaging