[SCM] KDE Plasma Addons module packaging branch, kde4.8, updated. debian/4.7.4-2-12-gac924db

[José Manuel Santamaría Lema]

The following commit has been merged in the kde4.8 branch:
commit f387cd746e52a119470af0480c80a526ea6bd41c
Merge: 4070ee3a2196845325bfe3d4021ee25f784ff7e9 837d6e96e38cebb88d2fc0bf9e6e8d0452b4ccc1
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Wed Mar 21 13:47:52 2012 +0100

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

 debian/changelog |    7 +++++++
 debian/control   |    2 +-
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --cc debian/changelog
index 6895d48,41080dc..de0468e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,10 +1,26 @@@
 +kdeplasma-addons (4:4.8.0-0r0) UNRELEASED; urgency=low
 +
 +  * New upstream release.
 +
 +  [ Eshat Cakar ]
 +  * Bump various kde build dependecies to 4:4.8.
 +  * Update not-installed files.
 +  * Update installed files.
 +  * Add libdbusmenu-qt-dev to build dependecies to support icontasks widget.
 +
 +  [ Pino Toscano ]
 +  * Add marble-4.7-compat.diff to make the marble plasma wallpaper compile
 +    also with marble 4.7.
 +  
 + -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 25 Jan 2012 11:39:58 +0100
 +
+ kdeplasma-addons (4:4.7.4-2) unstable; urgency=low
+ 
+   * Team upload. Upload to unstable.
+   * Update uploaders, remove Armin.
+ 
+  -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Wed, 07 Mar 2012 11:25:47 +0100
+ 
  kdeplasma-addons (4:4.7.4-1) experimental; urgency=low
  
    * New upstream release.

-- 
KDE Plasma Addons module packaging