[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.8.4-1-7-gf5805fe

[Sune Vuorela]

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

The following commit has been merged in the master branch:
commit f5805fe4ca9d59c6951aa994a1cd991adb5ecd8e
Merge: 6de89ccfa9619190eec5746e0c437ac186faa818 071a473a651ae7b53092d87cf15fde6cabfa6c3e
Author: Sune Vuorela <sune at vuorela.dk>
Date:   Tue Jun 26 20:32:17 2012 +0200

    Merge branch 'master' of git.debian.org:/git/pkg-kde/kde-sc/kde4libs
    
    Conflicts:
    	debian/changelog

 debian/changelog                                   |    8 +
 ...x_05f1a19291af5c16745b76c3e0944c5b80ef5870.diff |  164 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 173 insertions(+), 0 deletions(-)

diff --cc debian/changelog
index b3c8ae8,a5f5c29..5703877
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,16 +1,20 @@@
 -kde4libs (4:4.8.4-2) UNRELEASED; urgency=low
 -
 -  * Team upload.
 -
 -  [ Modestas Vainius ]
 -  * Confirm symbol files on more Debian arches.
++kde4libs (4:4.8.4-3) UNRELEASED; urgency=low
+ 
+   [ Matthias Klumpp ]
+   * Backport upstream commit 05f1a19291af5c16745b76c3e0944c5b80ef5870
+     to fix power management. (Make sure powermanager values are valid)
+ 
+  -- Modestas Vainius <modax at debian.org>  Sat, 23 Jun 2012 15:19:30 +0300
+ 
 +kde4libs (4:4.8.4-2) unstable; urgency=low
 +
 +  * Team upload.
 +
 +  [ Modestas Vainius ]
 +  * Confirm symbol files on more Debian arches.
 +
 + -- Sune Vuorela <sune at debian.org>  Sun, 24 Jun 2012 18:23:08 +0200
 +
  kde4libs (4:4.8.4-1) experimental; urgency=low
  
    * New upstream release.

-- 
KDE Development Platform Libraries module packaging