[SCM] KDE Utilities module packaging branch, master, updated. debian/4.6.5-4-15-gd2f6ba8

[José Manuel Santamaría Lema]

The following commit has been merged in the master branch:
commit d2f6ba866c47ed1a41cf9de1b1eec4573669922f
Merge: 232d026d7b644c007aa5edd14db52da5f0d75892 781d5e4298795a1201c07b27d276c0dc457467ea
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Sat Dec 3 14:20:19 2011 +0100

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

 debian/changelog                      |    8 ++++++++
 debian/patches/CVE-2011-2725_4.6.diff |   22 ++++++++++++++++++++++
 debian/patches/series                 |    1 +
 3 files changed, 31 insertions(+), 0 deletions(-)

diff --cc debian/changelog
index c69ee0b,807069f..4a58723
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,30 -1,11 +1,38 @@@
 +kdeutils (4:4.7.2-0r1) UNRELEASED; urgency=low
 +
 +  [ Eshat Cakar ]
 +  * New upstream release.
 +  * Add myself to uploaders.
 +  * Remove kcalc_key_bindings.diff (applied upstream).
 +  * Bump kde-sc-dev-latest build dependency to 4:4.7.2.
 +  * Bump kdelibs5-dev build dependency to 4:4.7.
 +  * Bump kdepimlibs5-dev build dependency to 4:4.7.
 +  * Bump libkonq5-dev build dependency to 4:4.7.
 +  * Remove kdebase-workspace-dev build dependency and
 +    add remove_workspace.patch to fix it in CMakeLists (thanks Pino).
 +  * Remove ${shlibs:Depends} from kdeutils-dbg and printer-applet.
 +
 +  [ Pino Toscano ]
 +  * printer-applet: recommend system-config-printer-kde instead of
 +    system-config-printer. (Closes: #646786)
 +  * Manage some packages renamings (Closes: #650008):
 +    - kdeutils-dbg depends on kde-runtime-dbg instead of kdebase-runtime-dbg.
 +    - plasma-scriptengine-superkaramba suggests kde-workspace-bin instead of
 +      kdebase-workspace-bin.
 +
 +  [ José Manuel Santamaría Lema ]
 +  * Add libxtst-dev build depend.
 +
 + -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 12 Oct 2011 14:54:23 +0200
 +
+ kdeutils (4:4.6.5-4) unstable; urgency=high
+ 
+   [ Pino Toscano ]
+   * Backport the upstream r1259334 from the 4.6 branch to fix the Ark
+     directory traversal, CVE-2011-2725. (Closes: #635541)
+ 
+  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 03 Dec 2011 12:32:27 +0100
+ 
  kdeutils (4:4.6.5-3) unstable; urgency=low
  
    [ Pino Toscano ]
diff --cc debian/patches/series
index 6ead876,bdaf1a7..46d744c
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,2 +1,2 @@@
 -kcalc_key_bindings.diff
 +remove_workspace.patch
+ CVE-2011-2725_4.6.diff

-- 
KDE Utilities module packaging