[SCM] KDE Development Platform Libraries module packaging branch, kde4.5, updated. debian/4.4.5-1-34-gcdcc53e

[Modestas Vainius]

The following commit has been merged in the kde4.5 branch:
commit cdcc53e444a075b4ebc031f6024c64dcbac4da02
Merge: 866859cd261f3dd38647f704ab7ca4d6cf954e32 6e413860744b49624dbc4009e49b34286ef8dbb9
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sat Aug 7 09:56:14 2010 +0300

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

 debian/changelog |    3 ++
 debian/control   |   56 ++++++++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 47 insertions(+), 12 deletions(-)

diff --cc debian/changelog
index d4d64f8,7885c4e..4bfd994
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,43 -1,11 +1,46 @@@
 -kde4libs (4:4.4.5-2) UNRELEASED; urgency=low
 +kde4libs (4:4.5.0-0r2) UNRELEASED; urgency=low
  
 +  * New upstream release.
 +
 +  [ Modestas Vainius ]
    * Point debian/control Vcs fields to the new Git repository.
+   * Bump Standards-Version to 3.9.1: add Breaks next to Replaces where needed.
+   * kdelibs5-data should break/replace kdelibs-data 4:3.5.10.dfsg.1-4 as well.
+     That version still has the same files as kdelibs5-data.
  
 - -- Modestas Vainius <modax at debian.org>  Mon, 26 Jul 2010 23:24:32 +0300
 +  [ George Kiagiadakis ]
 +  * Change my email address in uploaders.
 +  * Adjust build dependencies:
 +    - Bump required cmake version to 2.6.4.
 +    - Bump required soprano version to 2.4.63.
 +    - Add build dependencies on:
 +      - libdbusmenu-qt-dev
 +      - docbook-xml
 +      - docbook-xsl
 +      - libxrender-dev
 +      - libkrb5-dev
 +    - Remove unused build dependencies:
 +      - libcups2-dev
 +      - libdbus-1-dev
 +      - libasound2-dev
 +      - libkeyutils-dev
 +      - xsltproc
 +      - libxcursor-dev
 +      - libxtst-dev
 +  * Update installed files.
 +  * Add packages for the new libararies: libkatepartinterfaces4,
 +    libkcmutils4, libkidletime4, libkemoticons4, libkprintutils4.
 +  * Update symbol files.
 +  * Add symbol files for the new libraries.
 +  * Remove libkutils4.symbols as kutils is now a dummy
 +    transitional library with no symbols.
 +  * Refresh patches.
 +  * Add patch 01_link_to_pthreads_typo.diff to fix a typo
 +    in kdecore/CMakeLists.txt.
 +  * Add docbook-xml dependency on the kdoctools package,
 +    as it is required for building all of kde's documentation.
 +
 + -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 27 Jul 2010 20:01:26 +0300
  
  kde4libs (4:4.4.5-1) unstable; urgency=low
  
diff --cc debian/control
index 9fa0178,7c32e9d..c9241cb
--- a/debian/control
+++ b/debian/control
@@@ -2,21 -2,21 +2,21 @@@ Source: kde4lib
  Section: libs
  Priority: optional
  Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 -Uploaders: Sune Vuorela <sune at debian.org>, Fathi Boudra <fabo at debian.org>, Armin Berres <armin+debian at space-based.de>, Modestas Vainius <modax at debian.org>, George Kiagiadakis <gkiagiad at csd.uoc.gr>
 -Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7.2.3), cmake (>= 2.6.3), pkg-kde-tools (>= 0.9), po-debconf,
 +Uploaders: Sune Vuorela <sune at debian.org>, Fathi Boudra <fabo at debian.org>, Armin Berres <armin+debian at space-based.de>,
 + Modestas Vainius <modax at debian.org>, George Kiagiadakis <kiagiadakis.george at gmail.com>
 +Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7.2.3), cmake (>= 2.6.4), pkg-kde-tools (>= 0.9), po-debconf,
   shared-mime-info (>= 0.30), dpkg-dev (>= 1.15.5), libphonon-dev (>= 4:4.6.0really4.3.80),
 - libcups2-dev, libdbus-1-dev, libqt4-dev (>= 4:4.6.0), libqt4-opengl-dev (>= 4:4.6.0),
 - libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
 - libkeyutils-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
 + libqt4-dev (>= 4:4.6.0), libqt4-opengl-dev (>= 4:4.6.0),
   libpng-dev, libssl-dev, libsm-dev, flex, bison,
 - libsoprano-dev (>= 2.4.0.1-2~), libstreamanalyzer-dev (>= 0.6.3),
 - libxml2-dev, libxml2-utils, libxslt1-dev, libxtst-dev, libgif-dev,
 + libsoprano-dev (>= 2.4.63), libstreamanalyzer-dev (>= 0.6.3),
 + libxml2-dev, libxml2-utils, libxslt1-dev, libgif-dev,
   libavahi-common-dev, libaspell-dev, libbz2-dev, libenchant-dev, libfam-dev,
 - libjasper-dev, libopenexr-dev, libpcre3-dev, zlib1g-dev, libjpeg-dev, hspell, xsltproc,
 + libjasper-dev, libopenexr-dev, libpcre3-dev, zlib1g-dev, libjpeg-dev, hspell,
   libglu1-mesa-dev, libenchant-dev, libacl1-dev, automoc (>= 1.0~version-0.9.88),
 - libxcursor-dev, libutempter-dev, liblzma-dev, libattica-dev, shared-desktop-ontologies,
 - libpolkit-qt-1-dev, libxss-dev, libqca2-dev
 + libutempter-dev, liblzma-dev, libattica-dev, shared-desktop-ontologies,
 + libpolkit-qt-1-dev, libxss-dev, libqca2-dev, libdbusmenu-qt-dev, docbook-xml, docbook-xsl,
 + libxrender-dev, libkrb5-dev
- Standards-Version: 3.8.4
+ Standards-Version: 3.9.1
  Homepage: http://www.kde.org/
  Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/kde4libs.git
  Vcs-Git: git://git.debian.org/pkg-kde/kde-sc/kde4libs.git
@@@ -196,11 -208,10 +208,12 @@@ Package: libkutils
  Architecture: any
  Depends: ${shlibs:Depends}, ${misc:Depends}
  Replaces: kdelibs5 (<< 4:4.4.0)
+ Breaks: kdelibs5 (<< 4:4.4.0)
 -Description: various utility classes for the KDE Platform
 - This library provides some utility classes for KSettings, KCModule and
 - KPlugin.
 +Description: dummy transitional library
 + This library has been split into libkcmutils4, libkprintutils4,
 + libkidletime4 and libkemoticons4. This binary is provided to keep
 + binary compatibility with software that was compiled against it.
 + New software should not link against this library.
   .
   This package is part of the KDE Development Platform libraries module.
  
@@@ -499,8 -474,9 +525,9 @@@ Description: core shared data for all K
  
  Package: kdoctools
  Architecture: any
 -Depends: ${shlibs:Depends}, ${misc:Depends}
 +Depends: ${shlibs:Depends}, ${misc:Depends}, docbook-xml
  Replaces: kdelibs5 (<< 4:4.4.0), kdelibs5-data (<< 4:4.4.0), kdelibs-bin (<< 4:4.4.0)
+ Breaks: kdelibs5 (<< 4:4.4.0), kdelibs5-data (<< 4:4.4.0), kdelibs-bin (<< 4:4.4.0)
  Description: various tools for accessing application documentation
   This package provides KDE documentation tools (including the "help" KIO slave)
   for accessing documentation of KDE and GNOME applications.

-- 
KDE Development Platform Libraries module packaging