[SCM] KDE Base Workspace module packaging branch, kde4.11, updated. debian/4.10.5-3-13-g777ae1c

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde-workspace.git;a=commitdiff;h=c4d6f08

The following commit has been merged in the kde4.11 branch:
commit c4d6f084fc6772bc1587e213fbd28631d643c200
Merge: 4c945e9c4dd33d0dcf1a8e1b61f5be7b129aaccb 4e873563fd0f926a3b4734bbe3a500f74571d0e8
Author: Maximiliano Curia <maxy at debian.org>
Date:   Sat Sep 28 16:29:21 2013 +0200

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

 debian/changelog |    8 +++++++-
 debian/control   |    2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 1881746,e4d971f..4aaf6c2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,10 +1,22 @@@
 -kde-workspace (4:4.10.5-4) UNRELEASED; urgency=low
 +kde-workspace (4:4.11.1-0r0) UNRELEASED; urgency=low
 +
 +  * New upstream release.
++
++  [ Maximiliano Curia ]
 +  * Refresh patches, remove patches already applied.
 +  * Update build-dependencies.
 +  * Remove libsolidcontrol4abi2 and libsolidcontrolifaces4abi2 packages,
 +    removed by upstream.
 +  * Update install files.
 +  * Bump abi versions for library packages.
 +  * Add new binary package libkwinglesutils1.
 +  * Update symbols files.
  
-  -- Maximiliano Curia <maxy at debian.org>  Tue, 03 Sep 2013 20:14:59 +0200
+   [ Pino Toscano ]
+   * Make kde-workspace-data depend on kde-base-artwork, as it contains the
+     base/default artwork used when desktop-base is not installed.
+ 
+  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 04 Sep 2013 15:51:17 +0200
  
  kde-workspace (4:4.10.5-3) unstable; urgency=low
  
diff --cc debian/control
index a67b80e,0e7666a..eee00b9
--- a/debian/control
+++ b/debian/control
@@@ -153,13 -149,13 +153,13 @@@ Description: transitional package for k
  
  Package: kde-workspace-data
  Architecture: all
- Depends: oxygencursors, ${misc:Depends}, ${perl:Depends}
+ Depends: oxygencursors, ${misc:Depends}, ${perl:Depends}, kde-base-artwork
  Replaces: ksmserver, ktip, ksplash, libplasma1,
   kdebase-runtime-data (<< 4:4.5), kde-icons-mono (<< 4:4.6.80),
 - kdebase-workspace-data (<< 4:4.7.2) 
 + kdebase-workspace-data (<< 4:4.7.2)
  Breaks: ksmserver, ktip, ksplash, libplasma1,
   kdebase-runtime-data (<< 4:4.5), kde-icons-mono (<< 4:4.6.80),
 - kdebase-workspace-data (<< 4:4.7.2) 
 + kdebase-workspace-data (<< 4:4.7.2)
  Recommends: kde-wallpapers
  Description: shared data files for the KDE Plasma Workspace
   This package contains architecture-independent shared data files needed for a

-- 
KDE Base Workspace module packaging