[SCM] KDE Multimedia module packaging branch, kde4.8, updated. debian/4.7.4-3-15-gcdb41f7

[Pino Toscano]

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

The following commit has been merged in the kde4.8 branch:
commit c0da7d94b00d181ec8af6008311c5efd3ff79bfe
Merge: af60025bfe89feefa03a2e1a0a6bab6325f609ce d5bedd537296a7b7915b5f270623767bcb11e859
Author: Pino Toscano <pino at debian.org>
Date:   Thu May 24 23:46:03 2012 +0200

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

 debian/changelog                                   |   13 ++++++++
 debian/control                                     |    5 ---
 debian/copyright                                   |    9 +++--
 debian/libkcddb4.symbols                           |    3 +-
 debian/patches/series                              |    1 +
 debian/patches/upstream_Fix-build-with-clang.patch |   32 ++++++++++++++++++++
 6 files changed, 53 insertions(+), 10 deletions(-)

diff --cc debian/changelog
index f12c018,d1c2eaa..228f64b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,16 +1,29 @@@
 +kdemultimedia (4:4.8.3-0r0) UNRELEASED; urgency=low
 +
 +  * New upstream release.
 +
 +  [ Eshat Cakar ]
 +  * Remove kscd_dont_crash_if_device_is_emtpy.diff, applied upstream.
 +  * Update installed files.
 +  * Bump kdelibs5-dev build dependency to version 4:4.8.
 +  * Bump Standards-Version to 3.9.3, no changes needed.
 +  * Bump kde-sc-dev-latest build dependency to version 4:4.8.3.
 +
 + -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 09 Mar 2012 00:22:19 +0100
 +
+ kdemultimedia (4:4.7.4-3) unstable; urgency=low
+ 
+   * Team upload.
+   * Backport upstream commit 35e6e47c332e12b7f5e6963fee7b32fe6a25e6ba to fix
+     building with GCC 4.7; patch upstream_Fix-build-with-clang.patch.
+     (Closes: #672016)
+   * Bump Standards-Version to 3.9.3, no changes required.
+   * Update the symbols files.
+   * Slightly improve copyright.
+   * Remove duplicate Section headers in control.
+ 
+  -- Pino Toscano <pino at debian.org>  Thu, 24 May 2012 22:32:13 +0200
+ 
  kdemultimedia (4:4.7.4-2) unstable; urgency=low
  
    * Team upload. Upload to unstable.
diff --cc debian/patches/series
index b5e7d70,44da981..83ac8ca
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,5 +1,4 @@@
  kmix_showeverywhere.diff
  fix_target_link_libraries.diff
  libav_compat.diff
 -kscd_dont_crash_if_device_is_emtpy.diff
+ upstream_Fix-build-with-clang.patch

-- 
KDE Multimedia module packaging