[SCM] KDE Network module packaging branch, master, updated. debian/4.6.5-2-20-g919596a

[José Manuel Santamaría Lema]

The following commit has been merged in the master branch:
commit 19c371c5d3094b24feb92cc394d34f8638c1d0c8
Merge: 3ff12763bc38e1313007a299f79e3e5051d41ef7 495e25932f369d4b8dd1f7e457bdf1892cac77a9
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Thu Oct 20 22:36:02 2011 +0200

    Merge branch 'kde4.6'
    
    Conflicts:
    	debian/changelog

 debian/changelog                          |   15 +-
 debian/control                            |    2 +-
 debian/patches/libgadu_pthread_check.diff |   77 ++++
 debian/patches/protocols_namespaces.diff  |  606 +++++++++++++++++++++++++++++
 debian/patches/series                     |    2 +
 5 files changed, 700 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index e2d615b,ec5624f..223eb02
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,15 +1,29 @@@
 +kdenetwork (4:4.7.2-0r0) UNRELEASED; urgency=low
 +
 +  * New upstream release.
 +
 +  [ José Manuel Santamaría Lema ]
 +  * Bump kde-sc-dev-latest build dependency to 4:4.7.2.
 +  * Bump build dependencies on other KDE SC packages to 4:4.7.
 +  * Add libmms-dev to Build-Depends.
 +  * Add ${perl:Depends} to kopete Depends.
 +  * Update installed files.
 +  * Update symbols files.
 +
-  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 29 Sep 2011 22:25:51 +0200
++ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 20 Oct 2011 12:55:24 -0300
++
+ kdenetwork (4:4.6.5-3) unstable; urgency=low
+ 
+   [ José Manuel Santamaría Lema ]
+   * Add libgadu_pthread_check.diff, fixes an FTBFS when building with
+     libvncserver-dev supporting libgnutls.
+   * Bump libvncserver-dev B-D to 0.9.8.1, this solves two problems:
+     - libvncserver-dev now depends on libgnutls-dev, preventing an FTBFS.
+     - fixes a binary compatibility issue. (see bug #644455)
+   * Add protocols_namespaces.diff. Thanks to Ralf Jung for tracking down the
+     issue and writing a significant part of the patch. (Closes: #644197)
+ 
+  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 20 Oct 2011 12:55:24 -0300
  
  kdenetwork (4:4.6.5-2) unstable; urgency=low
  
diff --cc debian/control
index b541619,49696df..93d3341
--- a/debian/control
+++ b/debian/control
@@@ -5,13 -5,13 +5,13 @@@ Maintainer: Debian Qt/KDE Maintainers <
  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>,
   José Manuel Santamaría Lema <panfaust at gmail.com>
 -Build-Depends: kde-sc-dev-latest (>= 4:4.6.5),
 +Build-Depends: kde-sc-dev-latest (>= 4:4.7.2),
   cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12),
 - kdelibs5-dev (>= 4:4.6), kdepimlibs5-dev (>= 4:4.6), libkonq5-dev (>= 4:4.6),
 - kdebase-workspace-dev,
 + kdelibs5-dev (>= 4:4.7), kdepimlibs5-dev (>= 4:4.7), libkonq5-dev (>= 4:4.7),
 + kdebase-workspace-dev (>= 4:4.7),
   zlib1g-dev, libjpeg-dev, libxml2-dev, libxslt1-dev, libssl-dev,
   libxdamage-dev, libxss-dev, libslp-dev, libidn11-dev, libxtst-dev,
-  libvncserver-dev (>= 0.9.3), libqca2-dev (>= 2.0.0),
+  libvncserver-dev (>= 0.9.8.1), libqca2-dev (>= 2.0.0),
   libsqlite3-dev, libqimageblitz-dev (>= 1:0.0.4),
   libotr2-dev, libboost-dev,
   libavahi-compat-libdnssd-dev, libmeanwhile-dev, libmsn-dev (>= 4.1),

-- 
KDE Network module packaging