[SCM] KDE Base Applications module packaging branch, kde4.12, updated. debian/4.12.2-1-4-g9bf2870

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde-baseapps.git;a=commitdiff;h=9bf2870

The following commit has been merged in the kde4.12 branch:
commit 9bf287034e6e771e2c8d6d643f83b8fed3eb841f
Merge: d01f50e5a0dea39351d3d21c41eb834299437cb9 aefb3a4a2d69e87f6a397dc654518ea09e027e39
Author: Pino Toscano <pino at debian.org>
Date:   Sat Feb 22 18:46:59 2014 +0100

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

 debian/changelog            | 7 +++++++
 debian/libkonq5abi1.symbols | 8 +-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --cc debian/changelog
index d40be5f,e270b34..6bec811
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,10 +1,17 @@@
 +kde-baseapps (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:32 +0100
 +
+ kde-baseapps (4:4.11.5-2) unstable; urgency=medium
+ 
+   * Team upload.
+   * Update symbols files.
+ 
+  -- Pino Toscano <pino at debian.org>  Sat, 22 Feb 2014 17:55:49 +0100
+ 
  kde-baseapps (4:4.11.5-1) unstable; urgency=low
  
    * New upstream release.

-- 
KDE Base Applications module packaging