[SCM] libksane packaging branch, kde4.12, updated. debian/4.11.5-2-6-g36509a3

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/libksane.git;a=commitdiff;h=90e23d7

The following commit has been merged in the kde4.12 branch:
commit 90e23d71b29c383a13b8587aa65633849a52b993
Merge: 03e9a5f2b84dde1decc21e6633716a3b483d7a41 692495acd5f80a75edc6713dfc393e6322fa6a8a
Author: Pino Toscano <pino at debian.org>
Date:   Sat Feb 22 23:17:02 2014 +0100

    Merge remote-tracking branch 'origin/master' into kde4.12
    
    Conflicts:
    	debian/changelog

 debian/changelog         | 8 ++++++++
 debian/control           | 8 ++++++--
 debian/libksane0.symbols | 4 +---
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --cc debian/changelog
index 07b8b87,36ba5ba..0e0a5b4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,11 +1,18 @@@
 +libksane (4:4.12.2-1) experimental; urgency=medium
 +
 +  * New upstream release.
 +  * Bump kde-sc-dev-latest build dependency.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Mon, 10 Feb 2014 11:31:55 +0100
 +
+ libksane (4:4.11.5-2) unstable; urgency=medium
+ 
+   * Team upload.
+   * Update symbols file.
+   * Small touches to the descriptions.
+ 
+  -- Pino Toscano <pino at debian.org>  Sat, 22 Feb 2014 22:20:07 +0100
+ 
  libksane (4:4.11.5-1) unstable; urgency=low
  
    * New upstream release.

-- 
libksane packaging