[SCM] KDE Development Platform Libraries module packaging branch, kde4.8, updated. debian/4.7.4-5-20-gc02e7d2

[Modestas Vainius]

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

The following commit has been merged in the kde4.8 branch:
commit 2bcea7a9f2e700b669e6fb099ed4669500a46ac9
Merge: ac057d1c850d0e7b1c0780682c886dd112059d1d 7407fad2aaf78f9df7df2fb802415623e4f12065
Author: Modestas Vainius <modax at debian.org>
Date:   Sun May 13 01:33:38 2012 +0300

    Merge branch 'master' into kde4.8
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/libnepomuk4.symbols
    	debian/libplasma3.symbols
    	debian/patches/series

 debian/changelog                                  |   17 ++++++++
 debian/control                                    |    3 +-
 debian/libkde3support4.symbols                    |    2 +-
 debian/libkdecore5.symbols                        |    3 +-
 debian/libkdeui5.symbols                          |    5 +--
 debian/libkfile4.symbols                          |    4 +-
 debian/libkhtml5.symbols                          |   42 +++++++++++---------
 debian/libkio5.symbols                            |   28 ++++++++------
 debian/libkjsapi4.symbols                         |    3 +-
 debian/libknewstuff2-4.symbols                    |    4 +-
 debian/libnepomuk4.symbols                        |    6 +-
 debian/libplasma3.symbols                         |    8 ++--
 debian/patches/series                             |    1 +
 debian/patches/upstream_Add-missing-include.patch |   28 ++++++++++++++
 14 files changed, 103 insertions(+), 51 deletions(-)

diff --cc debian/changelog
index c616795,222ce0e..1228180
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,25 -1,20 +1,42 @@@
 +kde4libs (4:4.8.3-0r0) UNRELEASED; urgency=low
 +
 +  * New upstream release.
 +
 +  [ Eshat Cakar ]
 +  * Add myself to uploaders.
 +  * Update installed files.
 +  * Update not-installed files.
 +  * Remove upstream_better-check-for-return-values-of-m_protocols.value.patch
 +    (applied upstream).
 +
 +  [ José Manuel Santamaría Lema ]
 +  * Update symbols files.
 +  * Bump Standards-Version to 3.9.3, no changes needed.
 +  * Remove -DBUILD_libkactivities=OFF from the cmake parameters, no longer
 +    needed.
 +
 +  [ Pino Toscano ]
 +  * libsolid4: suggest media-player-info on Linux archs.
 +
 + -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 08 Mar 2012 17:23:21 +0100
 +
+ kde4libs (4:4.7.4-5) unstable; urgency=low
+ 
+   * Team upload.
+ 
+   [ Pino Toscano ]
+   * Make kdelibs5-dbg strictly depend on libkdecore5, to avoid a mismatch
+     between the kdelibs debug symbols and at least one of the libraries.
+   * Backport the upstream commit 01b0c1a8051f372e400d213ac125311c398e4b17 to fix
+     the build with GCC 4.7; patch upstream_Add-missing-include.patch.
+   * Bump Standards-Version to 3.9.3, no changes required.
+ 
+   [ Modestas Vainius ]
+   * Add temporary Build-Conflicts against libqtwebkit-dev << 2.2.1.
+   * Update symbol files for gcc 4.7.
+ 
+  -- Modestas Vainius <modax at debian.org>  Sun, 13 May 2012 00:20:58 +0300
+ 
  kde4libs (4:4.7.4-4) unstable; urgency=low
  
    * Team upload.
diff --cc debian/patches/series
index 0395be1,8bbb0aa..3ab1f1d
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -21,3 -21,5 +21,4 @@@ findpythonlibrary_layout_deb_on_debian.
  ktar_header_checksum_fix.diff
  ktar_longlink_length_in_bytes.diff
  glibc_filesystem.diff
 -upstream_better-check-for-return-values-of-m_protocols.value.patch
+ upstream_Add-missing-include.patch

-- 
KDE Development Platform Libraries module packaging