[SCM] KDE Network module packaging branch, master, updated. debian/4.6.3-0exp1-5-g16a24a1

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 16a24a1393ed8c28b2701a262b281068eda32245
Merge: a350347448d69106f0c93cb41f075a0c72c56164 ec6a26b7c0908c7d3cab8d9a3e1e7ed320e674a7
Author: Modestas Vainius <modax at debian.org>
Date:   Tue May 17 02:22:38 2011 +0300

    Merge commit 'debian/4.4.5-2+squeeze1'
    
    Drop cve_2010_1000_directory_traversal.diff patch, applied upstream.
    
    Conflicts:
    	debian/changelog

 debian/changelog |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --cc debian/changelog
index 7d6c1f1,0976306..7f9dedc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,77 -1,12 +1,90 @@@
 +kdenetwork (4:4.6.3-0r0) UNRELEASED; urgency=low
 +
 +  [ José Manuel Santamaría Lema ]
 +  * Bump kde-sc-dev-latest build dependency to 4:4.6.3.
 +
++  [ Modestas Vainius ]
++  * Merge 4:4.4.5-2+squeeze1 upload to squeeze:
++    - drop cve_2010_1000_directory_traversal.diff patch, applied upstream.
++
 + -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 07 May 2011 17:11:42 +0300
 +
 +kdenetwork (4:4.6.3-0exp1) experimental; urgency=low
 +
 +  * New upstream release.
 +
 +  [ Pino Toscano ]
 +  * Add patch no_home_set.diff to not fail the cmake step in kopete if no $HOME
 +    environment variable is set.
 +
 +  [ José Manuel Santamaría Lema ]
 +  * Bump Standards-Version to 3.9.2; no changes needed.
 +
 + -- Modestas Vainius <modax at debian.org>  Sat, 07 May 2011 16:18:19 +0300
 +
 +kdenetwork (4:4.6.2-1) experimental; urgency=low
 +
 +  * New upstream release:
 +    - fixes shift modifier key not working in krfb when pressed on remote
 +      keyboard (Closes: #595283)
 +    - removes KWallet timeout in kopete (Closes: #606949)
 +    - kopete does not disconnect anymore after several XMPP ping messages from
 +      Jabber server (Closes: #585007)
 +    - kopete uses the right category for ICQ disconnect messages
 +      (Closes: #588043)
 +  * Update installed files.
 +  * Update libkopete symbols file.
 +
 +  [ George Kiagiadakis ]
 +  * Add myself to uploaders.
 +  * Remove all patches; applied upstream.
 +  * Bump build dependencies on kdelibs5-dev and
 +    kdepimlibs5-dev to version 4:4.6.
 +  * Drop libtelepathy-qt4-dev build-dependency, since it
 +    will cause trouble when libtelepathy-qt4 0.5 is uploaded
 +    in the archive and krdc/krfb telepathy support is not
 +    usable anyway without the rest of the telepathy components.
 +
 +  [ José Manuel Santamaría Lema ]
 +  * Removed patch 03_kopete_icq_login_fix.diff, applied upstream.
 +  * Bump kde-sc-dev-latest build dependency to 4:4.6.2.
 +  * Bump build dependency on libkonq5-dev to 4:4.6.
 +  * Bump S-V to 3.9.1; add Breaks next to Replaces where needed.
 +  * Add build dependencies:
 +    - libjasper-dev
 +  * Update lintian overrides.
 +  * Add myself to Uploaders.
 +
 +  [ Pino Toscano ]
 +  * Add build dependencies:
 +    - libkonq5-dev
 +    - kdebase-workspace-dev
 +  * Remove unused build dependencies:
 +    - libgmp3-dev
 +    - libkwebkit-dev
 +  * Use wildcard architectures:
 +    - !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 -> linux-any
 +    - list of linux architectures -> linux-any
 +  * Remove libjasper-runtime recommend from kopete, as now it uses the jasper
 +    library directly.
 +  * Clean up Replaces/Breaks from the pre-squeeze era whenever possible.
 +
 +  [ Modestas Vainius ]
 +  * Switch debian/rules engine to dhmk based qt-kde-team/2/*.
 +  * Require libktorrent-dev 1.1.
 +  * Move KDE SC Build-Depends to the beginning of the line.
 +
 + -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 27 Apr 2011 12:23:42 +0300
 +
+ kdenetwork (4:4.4.5-2+squeeze1) stable; urgency=low
+ 
+   [ José Manuel Santamaría Lema ]
+   * Add cve_2010_1000_directory_traversal.diff, note that CVE-2010-1000 was
+     already fixed, but this patch performs a better protection against that
+     vulnerability.
+ 
+  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 17 May 2011 00:33:31 +0300
+ 
  kdenetwork (4:4.4.5-2) unstable; urgency=low
  
    * Point debian/control Vcs fields to the new Git repository.

-- 
KDE Network module packaging