[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.6.5-3-5-g096d7e7

José Manuel Santamaría Lema santa-guest at alioth.debian.org
Wed Sep 21 17:53:46 UTC 2011


The following commit has been merged in the master branch:
commit 096d7e7c3e9bd05a6cb60719f544e0419ef4db6c
Merge: b5b2cdcd55c0298c771785b057c738a98733f8a8 6023ae68307f34c33b0ed1925180c0722f820a82
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Wed Sep 21 19:19:41 2011 +0200

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

 debian/changelog                                  |   13 +++
 debian/control                                    |    4 +-
 debian/kdebase-workspace-bin.install.linux        |    2 -
 debian/kdebase-workspace-data.install.linux       |    3 -
 debian/patches/kwin_avoid_deep_vector_copies.diff |   98 +++++++++++++++++++++
 debian/patches/series                             |    1 +
 6 files changed, 114 insertions(+), 7 deletions(-)

diff --cc debian/changelog
index 839c3dd,29172ac..5305944
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,16 +1,31 @@@
 +kdebase-workspace (4:4.7.0-0r0) UNRELEASED; urgency=low
 +
 +  * New upstream release.
 +
 +  [ José Manuel Santamaría Lema ]
 +  * Bump kde-sc-dev-latest build dependency to 4:4.7.0.
 +  * Bump kdelibs5-dev build dependency to 4:4.7.
 +  * Bump kdepimlibs5-dev build dependency to 4:4.7.
 +  * Update patches:
 +    - Remove backport_kwin_multihead_improvements.diff, applied usptream.
 +    - Remove ksmserver_fadeeffect_use_sse2_free.diff, applied upstream.
 +    - Refreshed various patches to make them apply without offsets.
 +
 + -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 11 Aug 2011 19:17:29 +0200
 +
+ kdebase-workspace (4:4.6.5-3) unstable; urgency=low
+ 
+   [ Pino Toscano ]
+   * Disable the NetworkManager-related files, as they are not compiled with
+     NM >= 0.9. (Closes: #640393)
+   * Bump the libnm-util-dev and network-manager-dev build dependencies to 0.9,
+     to be sure to not use an older NM version.
+ 
+   [ José Manuel Santamaría Lema ]
+   * Add kwin_avoid_deep_vector_copies.diff to improve kwin performance.
+ 
+  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 15 Sep 2011 23:02:00 +0200
+ 
  kdebase-workspace (4:4.6.5-2) unstable; urgency=low
  
    [ Pino Toscano ]

-- 
KDE Base Workspace module packaging



More information about the pkg-kde-commits mailing list