[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.8.3-2-16-g9f32dac

[Modestas Vainius]

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

The following commit has been merged in the master branch:
commit 9f32dac0ce8f6b2a14fc5aebd507b178a25649e9
Merge: 71c6a6a6964ad2f29e75c8b719f6932d9bc28b60 5af3b20d75a660629c29898699e90d9001277c57
Author: Modestas Vainius <modax at debian.org>
Date:   Thu Jun 21 22:29:38 2012 +0300

    Merge branch 'kde4.8'
    
    Conflicts:
    	debian/changelog
    	debian/libkdecore5.symbols
    	debian/libkdeui5.symbols
    	debian/libkfile4.symbols
    	debian/libkhtml5.symbols
    	debian/libkio5.symbols
    	debian/libkjsapi4.symbols
    	debian/libkjsembed4.symbols
    	debian/libknewstuff2-4.symbols
    	debian/libkparts4.symbols
    	debian/libplasma3.symbols

 debian/changelog                                   |   17 +++++++++++++++++
 debian/control                                     |    9 ++++++---
 debian/libkdecore5.symbols                         |    4 +++-
 debian/libkdeui5.symbols                           |    3 ++-
 debian/libkio5.symbols                             |    4 +++-
 debian/libkjsapi4.symbols                          |    8 ++++----
 debian/libplasma3.symbols                          |    5 ++++-
 debian/patches/add_debian_build_type.diff          |    2 +-
 debian/patches/add_dlrestrictions_support.diff     |    2 +-
 .../patches/hack_in_etc_kde4_in_kstandarddirs.diff |    2 +-
 debian/patches/hurd_support.diff                   |    2 +-
 debian/patches/kfreebsd_support.diff               |    2 +-
 debian/patches/ktar_header_checksum_fix.diff       |    4 ++--
 debian/patches/ktar_longlink_length_in_bytes.diff  |    6 +++---
 debian/patches/make_libkdeinit4_private.diff       |    2 +-
 debian/patches/python3-support-bytecode.patch      |   16 ++++++++--------
 debian/patches/use_dejavu_as_default_font.diff     |    4 ++--
 debian/source/lintian-overrides                    |    1 -
 debian/watch                                       |    2 ++
 19 files changed, 62 insertions(+), 33 deletions(-)

diff --cc debian/changelog
index 2a44c7a,15d39f0..d5eca86
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,20 +1,27 @@@
+ kde4libs (4:4.8.4-0r1) UNRELEASED; urgency=low
+ 
+   * New upstream release.
+ 
+   [ Modestas Vainius ]
+   * Update symbol files.
+ 
+   [ José Manuel Santamaría Lema ]
+   * Add watch file.
+   * Update patches:
+     - refresh python3-support-bytecode.patch
+     - refresh various patches to make them apply without any offset.
+   * Update symbols files.
+   * Drop unused lintian override "dbg-package-missing-depends kdelibs5-dbg".
+ 
+  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 27 May 2012 12:10:37 +0200
+ 
 +kde4libs (4:4.8.3-2) unstable; urgency=low
 +
 +  * Team upload.
 +  * Update symbol files.
 +
 + -- Modestas Vainius <modax at debian.org>  Sat, 09 Jun 2012 15:38:38 +0300
 +
  kde4libs (4:4.8.3-1) experimental; urgency=low
  
    * New upstream release.

-- 
KDE Development Platform Libraries module packaging