[SCM] plasma-scriptengine-superkaramba packaging branch, kde4.11, updated. debian/4.10.5-2-3-g988a382

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/superkaramba.git;a=commitdiff;h=988a382

The following commit has been merged in the kde4.11 branch:
commit 988a382af9eb204d46696bb999b0d2d4c8e527ff
Merge: 8be60b78dbc538c696be2669e9a075a4bf2bad4a 0e0a57fe79fb53132c8b41f0633907c1559aed98
Author: Maximiliano Curia <maxy at debian.org>
Date:   Thu Sep 26 15:45:59 2013 +0200

    Merge branch 'master' into kde4.11
    
    Conflicts:
    	debian/changelog

 debian/changelog                                          |   11 ++++++++---
 debian/plasma-scriptengine-superkaramba.lintian-overrides |    4 ++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --cc debian/changelog
index 7581d89,9271d5b..a196a8e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,12 +1,20 @@@
 -superkaramba (4:4.10.5-2) unstable; urgency=low
 +superkaramba (4:4.11.1-0r0) UNRELEASED; urgency=low
 +
 +  * New upstream release.
  
-   [ Pino Toscano ]
-   * Add the pkg-config build dependency.
- 
 +  [ Maximiliano Curia ]
 +  * Update install files.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 03 Sep 2013 20:20:35 +0200
 +
++superkaramba (4:4.10.5-2) unstable; urgency=low
+   * Team upload.
+   * Add the pkg-config build dependency.
+   * Improve the wildcard in plasma-scriptengine-superkaramba.install.
+   * Update lintian overrides.
+ 
+  -- Pino Toscano <pino at debian.org>  Wed, 04 Sep 2013 17:22:03 +0200
+ 
  superkaramba (4:4.10.5-1) unstable; urgency=low
  
    * New upstream release.

-- 
plasma-scriptengine-superkaramba packaging