13 files changed, 138 insertions, 313 deletions

diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 02f198187678..5e1f5ca92a55 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -6,7 +6,7 @@
 # $FreeBSD$
 #
 
-PORTNAME=	kdebase-workspace
+PORTNAME=	kde-workspace
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE_kde} \
@@ -21,15 +21,26 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Basic applications for the KDE system
 
-LIB_DEPENDS=	qimageblitz.4:${PORTSDIR}/x11/qimageblitz\
+LIB_DEPENDS=	qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
 		dbus-1.3:${PORTSDIR}/devel/dbus \
+		ck-connector.0:${PORTSDIR}/sysutils/consolekit \
 		pci.3:${PORTSDIR}/devel/libpci \
 		hal.1:${PORTSDIR}/sysutils/hal \
-		xklavier.12:${PORTSDIR}/x11/libxklavier \
-		gps.20:${PORTSDIR}/astro/gpsd \
 		qalculate.5:${PORTSDIR}/math/libqalculate \
-		dmtx.0:${PORTSDIR}/graphics/libdmtx
+		prison.0:${PORTSDIR}/graphics/prison \
+		searchclient.0:${PORTSDIR}/deskutils/strigi \
+		soprano.4:${PORTSDIR}/textproc/soprano \
+		boost_thread.4:${PORTSDIR}/devel/boost-libs \
+		dbusmenu-qt.2:${PORTSDIR}/devel/libdbusmenu-qt \
+		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
+		ttf.4:${PORTSDIR}/print/freetype \
+		png.6:${PORTSDIR}/graphics/png \
+		jpeg.11:${PORTSDIR}/graphics/jpeg
+
+BUILD_DEPENDS=	${LOCALBASE}/share/ontology/core/rdf.ontology:${PORTSDIR}/x11-toolkits/shared-desktop-ontologies
+
 RUN_DEPENDS=	${KDE4_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde4-xdg-env \
+		${LOCALBASE}/share/ontology/core/rdf.ontology:${PORTSDIR}/x11-toolkits/shared-desktop-ontologies \
 		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
 		xprop:${PORTSDIR}/x11/xprop \
 		xsetroot:${PORTSDIR}/x11/xsetroot \
@@ -40,40 +51,68 @@ RUN_DEPENDS=	${KDE4_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde4-xdg-env \
 		setxkbmap:${PORTSDIR}/x11/setxkbmap \
 		${KDE4_PREFIX}/bin/ksysguardd:${PORTSDIR}/sysutils/ksysguardd \
 		${KDE4_PREFIX}/lib/kde4/libexec/polkit-kde-authentication-agent-1:${PORTSDIR}/sysutils/polkit-kde \
-		${KDE4_PREFIX}/bin/nepomukcontroller:${PORTSDIR}/misc/nepomukcontroller
+		${LOCALBASE}/etc/pam.d/kde:${PORTSDIR}/security/pam_kde
+
+CONFLICTS=	kdeaccessibility-4.[0-6].* kdebase-workspace-4.[0-6].*
 
-SUB_FILES=	kdm layout.js pkg-message
+SUB_FILES=	kdm layout.js
 USE_RC_SUBR=	kdm4
-USE_KDE4=	kdelibs pimlibs kdeprefix kdehier automoc4 oxygen
-KDE4_BUILDENV=	yes
-USE_GMAKE=	yes
 USE_BZIP2=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	assistant corelib dbus designer gui network opengl  \
-		script svg sql qt3support qtestlib xml webkit \
-		qmake_build moc_build rcc_build uic_build \
-		porting_build uic3_build phonon
-USE_XORG=	xtst xscrnsaver
 USE_GETTEXT=	yes
+USE_GNOME=	glib20
 USE_ICONV=	yes
+USE_KDE4=	akonadi automoc4 kdehier kdelibs kdeprefix oxygen pimlibs
+KDE4_BUILDENV=	yes
+USE_QT_VER=	4
+QT_COMPONENTS=	dbus declarative gui network opengl phonon \
+		qt3support qtestlib script sql webkit xml \
+		moc_build qmake_build rcc_build uic_build
+USE_XORG=	kbproto x11 xau xcomposite xcursor xdamage xdmcp xfixes \
+		xft xi xinerama xkbfile xrandr xrender xres xscrnsaver xtst
+USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 
+USERS=		kdm
+GROUPS=		kdm
+
 MAN1=		plasmaengineexplorer.1 plasmapkg.1 plasmoidviewer.1
 
+# PyKDE4, Xmms and Googlegadgets could be enabled.
 CMAKE_ARGS+=	-DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" \
+		-DBUILD_python:BOOL=OFF \
+		-DBUILD_ruby:BOOL=OFF \
 		-DWITH_BlueZ:BOOL=OFF \
 		-DWITH_Sensors:BOOL=OFF \
 		-DWITH_NetworkManager:BOOL=OFF \
 		-DWITH_Xmms:BOOL=OFF \
 		-DWITH_Googlegadgets:BOOL=OFF \
 		-DWITH_PyKDE4:BOOL=OFF
-#PyKDE4, Xmms and Googlegadgets could be enabled,
 
-OPTIONS=	PLASMA_PYTHON "Support for plasmoids written in Python" off \
+OPTIONS=	GPS "Support for GPS geolocation dataengine" on \
+		PHONON_GSTREAMER "GStreamer backend for Phonon (recommended)" on \
+		PHONON_VLC "VLC backend for Phonon" off \
+		PLASMA_PYTHON "Support for plasmoids written in Python" off \
 		PLASMA_RUBY "Support for plasmoids written in Ruby" off
 
 .include <bsd.port.options.mk>
 
+.if !defined(WITHOUT_GPS)
+LIB_DEPENDS+=	gps.20:${PORTSDIR}/astro/gpsd
+CMAKE_ARGS+=	-DWITH_libgps:BOOL=ON
+PLIST_SUB+=	GPS=""
+.else
+CMAKE_ARGS+=	-DWITH_libgps:BOOL=OFF
+PLIST_SUB+=	GPS="@comment "
+.endif
+
+.if !defined(WITHOUT_PHONON_GSTREAMER)
+RUN_DEPENDS+=	${KDE4_PREFIX}/lib/kde4/plugins/phonon_backend/phonon_gstreamer.so:${PORTSDIR}/multimedia/phonon-gstreamer
+.endif
+
+.if defined(WITH_PHONON_VLC)
+RUN_DEPENDS+=	${KDE4_PREFIX}/lib/kde4/plugins/phonon_backend/phonon_vlc.so:${PORTSDIR}/multimedia/phonon-vlc
+.endif
+
 .if defined(WITH_PLASMA_PYTHON)
 RUN_DEPENDS+=	${KDE4_PREFIX}/share/apps/plasma_scriptengine_python/plasma_importer.py:${PORTSDIR}/x11/plasma-scriptengine-python
 .endif
@@ -82,6 +121,8 @@ RUN_DEPENDS+=	${KDE4_PREFIX}/share/apps/plasma_scriptengine_python/plasma_import
 RUN_DEPENDS+=	${KDE4_PREFIX}/share/apps/plasma_scriptengine_ruby/applet.rb:${PORTSDIR}/x11/plasma-scriptengine-ruby
 .endif
 
+.include <bsd.port.pre.mk>
+
 .if ${OSVERSION} < 800069
 LIB_DEPENDS+=	usb-0.1.8:${PORTSDIR}/devel/libusb
 .endif
@@ -106,6 +147,8 @@ pre-configure:
 		${PATCH_WRKSRC}/ksysguard/example/CMakeLists.txt
 	${REINPLACE_CMD} -e 's|<qhash.h>|<QHash>|' \
 		${PATCH_WRKSRC}/kwin/effects/thumbnailaside/thumbnailaside.h
+	${REINPLACE_CMD} -e '/PolicyKit/ d' \
+		${PATCH_WRKSRC}/doc/CMakeLists.txt
 
 post-install:
 	${LN} -sf ${PREFIX}/bin/startkde ${PREFIX}/bin/startkde4
@@ -120,4 +163,4 @@ post-install:
 		${COPYTREE_SHARE} . ${PREFIX}/share/wallpapers
 	${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo
index fd9076c09b1c..e8cdcba0568d 100644
--- a/x11/kde4-workspace/distinfo
+++ b/x11/kde4-workspace/distinfo
@@ -1,4 +1,4 @@
-SHA256 (KDE/kdebase-workspace-4.6.5.tar.bz2) = 4df66edf88df327d10d131536e6daebdeae449fb75eebc6bfae67cf3128093c0
-SIZE (KDE/kdebase-workspace-4.6.5.tar.bz2) = 69241659
+SHA256 (KDE/kde-workspace-4.7.2.tar.bz2) = 6a174d6780ad04700ec9eddfe2ed3d916aea018ad7fb93b04debc81f2d3f9eb0
+SIZE (KDE/kde-workspace-4.7.2.tar.bz2) = 20556305
 SHA256 (KDE/stripes-freebsd-1.0.tar.bz2) = 6ac543c0be09df2ef89061740f4e6f8d5b807462d030dbbc3bcfd58056431127
 SIZE (KDE/stripes-freebsd-1.0.tar.bz2) = 4258348
diff --git a/x11/kde4-workspace/files/kdm4.in b/x11/kde4-workspace/files/kdm4.in
index 493263007b9a..5ef3706a987e 100644
--- a/x11/kde4-workspace/files/kdm4.in
+++ b/x11/kde4-workspace/files/kdm4.in
@@ -1,5 +1,7 @@
 #!/bin/sh
 #
+# $FreeBSD$
+#
 # PROVIDE: kdm4
 # REQUIRE: LOGIN cleanvar moused syscons dbus hald
 #
diff --git a/x11/kde4-workspace/files/patch-CMakeLists.txt b/x11/kde4-workspace/files/patch-CMakeLists.txt
index 6fea1f815c21..24b0b4d2b235 100644
--- a/x11/kde4-workspace/files/patch-CMakeLists.txt
+++ b/x11/kde4-workspace/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- ./CMakeLists.txt.orig	2010-07-29 01:04:56.000000000 +0400
-+++ ./CMakeLists.txt	2010-08-03 14:45:37.785806201 +0400
-@@ -84,7 +84,7 @@
+--- ./CMakeLists.txt.orig	2011-07-19 23:37:36.000000000 +0200
++++ ./CMakeLists.txt	2011-08-09 20:45:40.975563521 +0200
+@@ -90,7 +90,7 @@
    configure_file(config-unix.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-unix.h )
    configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h )
    if(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr")
@@ -9,19 +9,3 @@
    endif(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr")
    configure_file(startkde.cmake ${CMAKE_CURRENT_BINARY_DIR}/startkde  @ONLY)
  endif(NOT WIN32)
-@@ -223,13 +223,13 @@
- macro_write_basic_cmake_version_file(${CMAKE_CURRENT_BINARY_DIR}/KDE4WorkspaceConfigVersion.cmake 
-                                      ${KDE4WORKSPACE_VERSION_MAJOR} ${KDE4WORKSPACE_VERSION_MINOR} ${KDE4WORKSPACE_VERSION_PATCH})
- 
--set(_KDE4WorkspaceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/KDE4Workspace-${KDE4WORKSPACE_VERSION}/cmake)
-+set(_KDE4WorkspaceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/KDE4Workspace/cmake)
- # places where find_package() looks for FooConfig.cmake files:
- # CMake >= 2.6.0 looks in lib/Foo*/cmake/, CMake >= 2.6.3 also looks in
- # lib/cmake/Foo*/, which packagers prefer. So they can set the KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR
- # option to have kdepimlibs install its Config file there. Alex
- if(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
--   set(_KDE4WorkspaceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/KDE4Workspace-${KDE4WORKSPACE_VERSION} )
-+   set(_KDE4WorkspaceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/KDE4Workspace )
- endif(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
- 
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/KDE4WorkspaceConfig.cmake
diff --git a/x11/kde4-workspace/files/patch-kinfocenter__Modules__base__CMakeLists.txt b/x11/kde4-workspace/files/patch-kinfocenter__Modules__base__CMakeLists.txt
index c119c41f92ee..b8c999de736a 100644
--- a/x11/kde4-workspace/files/patch-kinfocenter__Modules__base__CMakeLists.txt
+++ b/x11/kde4-workspace/files/patch-kinfocenter__Modules__base__CMakeLists.txt
@@ -1,11 +1,10 @@
---- ./kinfocenter/Modules/base/CMakeLists.txt.orig	2008-04-18 11:21:39.000000000 +0400
-+++ ./kinfocenter/Modules/base/CMakeLists.txt	2009-09-04 00:32:17.000000000 +0400
-@@ -2,7 +2,7 @@
+--- ./kinfocenter/Modules/base/CMakeLists.txt.orig	2011-05-20 22:32:07.000000000 +0200
++++ ./kinfocenter/Modules/base/CMakeLists.txt	2011-08-09 20:48:13.345451554 +0200
+@@ -1,6 +1,6 @@
  # TODO: HAVE_LIBDEVINFO_H (for Solaris 7 and later)
  #   to be set if both -ldevinfo and libdevinfo.h exist
  
 -check_include_files(devinfo.h HAVE_DEVINFO_H)       # info_fbsd.cpp
 +check_include_files("sys/types.h;devinfo.h" HAVE_DEVINFO_H)       # info_fbsd.cpp
- check_include_files(fstab.h HAVE_FSTAB_H)           # info_linux.cpp
- check_include_files(linux/raw.h HAVE_LINUX_RAW_H)   # info_linux.cpp
- check_include_files(mntent.h HAVE_MNTENT_H)         # info_linux.cpp
+ 
+ configure_file (../base/config-infocenter.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-infocenter.h )
diff --git a/x11/kde4-workspace/files/patch-kwin-kcmkwin-kwinrules_ruleswidget.cpp b/x11/kde4-workspace/files/patch-kwin-kcmkwin-kwinrules_ruleswidget.cpp
index 946eb9395aae..0bf69a12c2cb 100644
--- a/x11/kde4-workspace/files/patch-kwin-kcmkwin-kwinrules_ruleswidget.cpp
+++ b/x11/kde4-workspace/files/patch-kwin-kcmkwin-kwinrules_ruleswidget.cpp
@@ -1,4 +1,4 @@
---- ./kwin/kcmkwin/kwinrules/ruleswidget.cpp.orgi	2008-01-30 00:38:06.000000000 +0100
+--- ./kwin/kcmkwin/kwinrules/ruleswidget.cpp.orig	2008-01-30 00:38:06.000000000 +0100
 +++ ./kwin/kcmkwin/kwinrules/ruleswidget.cpp	2008-01-30 00:38:38.000000000 +0100
 @@ -30,6 +30,7 @@
  
diff --git a/x11/kde4-workspace/files/patch-plasma-generic-dataengines-geolocation-location_gps.cpp b/x11/kde4-workspace/files/patch-plasma-generic-dataengines-geolocation-location_gps.cpp
deleted file mode 100644
index 7bdf60248966..000000000000
--- a/x11/kde4-workspace/files/patch-plasma-generic-dataengines-geolocation-location_gps.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
---- plasma/generic/dataengines/geolocation/location_gps.cpp.orig	2011-03-23 00:33:55.000000000 +0300
-+++ plasma/generic/dataengines/geolocation/location_gps.cpp	2011-03-23 00:48:57.000000000 +0300
-@@ -17,7 +17,7 @@
- 
- #include "location_gps.h"
- 
--Gpsd::Gpsd(gps_data_t* gpsdata)
-+Gpsd::Gpsd(gps_data_t gpsdata)
-     : m_gpsdata(gpsdata)
-     , m_abort(false)
- {
-@@ -41,24 +41,20 @@
- 
- void Gpsd::run()
- {
--#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 ) && defined( WATCH_ENABLE )
--    gps_stream(m_gpsdata, WATCH_ENABLE, NULL);
--#else
--    gps_query(m_gpsdata, "w+x\n");
--#endif
-+    gps_stream(&m_gpsdata, WATCH_ENABLE, NULL);
- 
-     while (!m_abort) {
-         Plasma::DataEngine::Data d;
- 
--        if (gps_poll(m_gpsdata) != -1) {
-+        if (gps_read(&m_gpsdata) > 0) {
-             //kDebug() << "poll ok";
--            if (m_gpsdata->online) {
-+            if (m_gpsdata.online) {
-                 //kDebug() << "online";
--                if (m_gpsdata->status != STATUS_NO_FIX) {
-+                if (m_gpsdata.status != STATUS_NO_FIX) {
-                     //kDebug() << "fix";
-                     d["accuracy"] = 30;
--                    d["latitude"] = QString::number(m_gpsdata->fix.latitude);
--                    d["longitude"] = QString::number(m_gpsdata->fix.longitude);
-+                    d["latitude"] = QString::number(m_gpsdata.fix.latitude);
-+                    d["longitude"] = QString::number(m_gpsdata.fix.longitude);
-                 }
-             }
-         }
-@@ -73,8 +69,9 @@
-     : GeolocationProvider(parent, args),
-       m_gpsd(0)
- {
--    gps_data_t* gpsdata = gps_open("localhost", DEFAULT_GPSD_PORT);
--    if (gpsdata) {
-+    gps_data_t gpsdata;
-+
-+    if (gps_open("localhost", DEFAULT_GPSD_PORT, &gpsdata) == 0) {
-         kDebug() << "gpsd found.";
-         m_gpsd = new Gpsd(gpsdata);
-         connect(m_gpsd, SIGNAL(dataReady(const Plasma::DataEngine::Data&)),
diff --git a/x11/kde4-workspace/files/patch-plasma-generic-dataengines-geolocation-location_gps.h b/x11/kde4-workspace/files/patch-plasma-generic-dataengines-geolocation-location_gps.h
deleted file mode 100644
index f160691c8840..000000000000
--- a/x11/kde4-workspace/files/patch-plasma-generic-dataengines-geolocation-location_gps.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- plasma/generic/dataengines/geolocation/location_gps.h.orig	2011-03-23 00:37:50.000000000 +0300
-+++ plasma/generic/dataengines/geolocation/location_gps.h	2011-03-23 00:41:05.000000000 +0300
-@@ -29,7 +29,7 @@
- {
-     Q_OBJECT
- public:
--    Gpsd(gps_data_t* gpsdata);
-+    Gpsd(gps_data_t gpsdata);
-     virtual ~Gpsd();
- 
-     void update();
-@@ -41,7 +41,7 @@
-     virtual void run();
- 
- private:
--    gps_data_t* m_gpsdata;
-+    gps_data_t m_gpsdata;
-     QMutex m_mutex;
-     QWaitCondition m_condition;
-     bool m_abort;
diff --git a/x11/kde4-workspace/files/patch-plasma__generic__scriptengines__CMakeLists.txt b/x11/kde4-workspace/files/patch-plasma__generic__scriptengines__CMakeLists.txt
deleted file mode 100644
index 70cbed35b559..000000000000
--- a/x11/kde4-workspace/files/patch-plasma__generic__scriptengines__CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./plasma/generic/scriptengines/CMakeLists.txt.orig	2009-09-16 15:41:05.000000000 +0400
-+++ ./plasma/generic/scriptengines/CMakeLists.txt	2010-06-26 19:18:34.136233668 +0400
-@@ -1,11 +1,9 @@
--macro_optional_add_subdirectory(ruby)
- 
- if(QT_QTWEBKIT_FOUND)
-     macro_optional_add_subdirectory(webkit)
- endif(QT_QTWEBKIT_FOUND)
- 
- if (PythonSupport_FOUND AND NOT WIN32)
--    macro_optional_add_subdirectory(python)
- endif (PythonSupport_FOUND AND NOT WIN32)
- 
- if(GOOGLEGADGETS_FOUND)
diff --git a/x11/kde4-workspace/files/pkg-message.in b/x11/kde4-workspace/files/pkg-message.in
deleted file mode 100644
index d48b4affeea0..000000000000
--- a/x11/kde4-workspace/files/pkg-message.in
+++ /dev/null
@@ -1,10 +0,0 @@
-=====================================================================
-
-To enable KDE Display Manager (KDM), add the following lines
-to /etc/rc.conf:
-local_startup="${local_startup} %%PREFIX%%/etc/rc.d"
-kdm4_enable="YES"
-
-You also need procfs to be mounted. See man procfs for details.
-
-=====================================================================
diff --git a/x11/kde4-workspace/pkg-descr b/x11/kde4-workspace/pkg-descr
index d2a70cd666b3..a618af7d124b 100644
--- a/x11/kde4-workspace/pkg-descr
+++ b/x11/kde4-workspace/pkg-descr
@@ -2,4 +2,4 @@ This package provides the basic applications for the KDE system. Installing
 this package (and its dependencies) will provide you with everything required
 for a minimal, functional KDE desktop.
 
-WWW: http://www.kde.org/
+WWW: http://www.kde.org
diff --git a/x11/kde4-workspace/pkg-message b/x11/kde4-workspace/pkg-message
new file mode 100644
index 000000000000..60aa3f601545
--- /dev/null
+++ b/x11/kde4-workspace/pkg-message
@@ -0,0 +1,7 @@
+======================================================================
+
+To enable KDE Display Manager (KDM), add kdm4_enable="YES" to
+/etc/rc.conf. To get full functionality you also need procfs(5)
+mounted.
+
+======================================================================
diff --git a/x11/kde4-workspace/pkg-plist b/x11/kde4-workspace/pkg-plist
index 2a2aaf5bad76..c3af068d34d9 100644
--- a/x11/kde4-workspace/pkg-plist
+++ b/x11/kde4-workspace/pkg-plist
@@ -29,6 +29,7 @@ bin/ksystraycmd
 bin/kwin
 bin/oxygen-demo
 bin/oxygen-settings
+bin/oxygen-shadow-demo
 bin/plasma-desktop
 bin/plasma-netbook
 bin/plasma-overlay
@@ -36,6 +37,7 @@ bin/plasma-windowed
 bin/plasmaengineexplorer
 bin/plasmawallpaperviewer
 bin/plasmoidviewer
+bin/remote-widgets-browser
 bin/solid-action-desktop-gen
 bin/startkde
 bin/startkde4
@@ -69,9 +71,9 @@ include/ksysguard/processes.h
 include/kwinconfig.h
 include/kwineffects.h
 include/kwinglobals.h
+include/kwinglplatform.h
 include/kwinglutils.h
 include/kwinglutils_funcs.h
-include/kwinshadereffect.h
 include/kwinxrenderutils.h
 include/kworkspace/kactivityconsumer.h
 include/kworkspace/kactivitycontroller.h
@@ -97,13 +99,12 @@ include/solid/control/ifaces/modemgsmussdinterface.h
 include/solid/control/ifaces/modeminterface.h
 include/solid/control/ifaces/modemlocationinterface.h
 include/solid/control/ifaces/modemmanager.h
+include/solid/control/ifaces/networkbtinterface.h
 include/solid/control/ifaces/networkcdmainterface.h
 include/solid/control/ifaces/networkgsminterface.h
 include/solid/control/ifaces/networkinterface.h
 include/solid/control/ifaces/networkmanager.h
 include/solid/control/ifaces/networkserialinterface.h
-include/solid/control/ifaces/remotecontrol.h
-include/solid/control/ifaces/remotecontrolmanager.h
 include/solid/control/ifaces/wirednetworkinterface.h
 include/solid/control/ifaces/wirelessaccesspoint.h
 include/solid/control/ifaces/wirelessnetworkinterface.h
@@ -118,6 +119,7 @@ include/solid/control/modeminterface.h
 include/solid/control/modemlocationinterface.h
 include/solid/control/modemmanager.h
 include/solid/control/modemmanagerinterface.h
+include/solid/control/networkbtinterface.h
 include/solid/control/networkcdmainterface.h
 include/solid/control/networkgsminterface.h
 include/solid/control/networking.h
@@ -125,9 +127,6 @@ include/solid/control/networkinterface.h
 include/solid/control/networkipv4config.h
 include/solid/control/networkmanager.h
 include/solid/control/networkserialinterface.h
-include/solid/control/remotecontrol.h
-include/solid/control/remotecontrolbutton.h
-include/solid/control/remotecontrolmanager.h
 include/solid/control/singletondefs.h
 include/solid/control/solid_control_export.h
 include/solid/control/wirednetworkinterface.h
@@ -167,6 +166,7 @@ lib/kde4/devinfo.so
 lib/kde4/fontthumbnail.so
 lib/kde4/icon_mode.so
 lib/kde4/ion_bbcukmet.so
+lib/kde4/ion_debianweather.so
 lib/kde4/ion_envcan.so
 lib/kde4/ion_noaa.so
 lib/kde4/ion_wettercom.so
@@ -230,6 +230,7 @@ lib/kde4/kgreet_classic.so
 lib/kde4/kgreet_generic.so
 lib/kde4/kgreet_winbind.so
 lib/kde4/kio_fonts.so
+lib/kde4/krunner_activities.so
 lib/kde4/krunner_bookmarksrunner.so
 lib/kde4/krunner_calculatorrunner.so
 lib/kde4/krunner_kill.so
@@ -275,7 +276,7 @@ lib/kde4/libexec/kwin_killer_helper
 lib/kde4/libexec/kwin_opengl_test
 lib/kde4/libexec/kwin_rules_dialog
 lib/kde4/libexec/test_kcm_xinerama
-lib/kde4/plasma-geolocation-gps.so
+%%GPS%%lib/kde4/plasma-geolocation-gps.so
 lib/kde4/plasma-geolocation-ip.so
 lib/kde4/plasma_animator_default.so
 lib/kde4/plasma_applet_activitybar.so
@@ -294,6 +295,7 @@ lib/kde4/plasma_applet_pager.so
 lib/kde4/plasma_applet_panelspacer_internal.so
 lib/kde4/plasma_applet_quicklaunch.so
 lib/kde4/plasma_applet_searchbox.so
+lib/kde4/plasma_applet_showActivityManager.so
 lib/kde4/plasma_applet_simplelauncher.so
 lib/kde4/plasma_applet_sm_cpu.so
 lib/kde4/plasma_applet_sm_hdd.so
@@ -372,7 +374,6 @@ lib/kde4/powerdevilhandlebuttoneventsaction_config.so
 lib/kde4/powerdevilrunscriptaction_config.so
 lib/kde4/powerdevilsuspendsessionaction_config.so
 lib/kde4/solid_fakenet.so
-lib/kde4/solid_lirc.so
 lib/kde4/solid_wicd.so
 lib/libkdecorations.so
 lib/libkdecorations.so.5
@@ -475,6 +476,7 @@ share/apps/cmake/modules/FindDBus.cmake
 share/apps/cmake/modules/FindGooglegadgets.cmake
 share/apps/cmake/modules/FindKephal.cmake
 share/apps/cmake/modules/FindLibXKlavier.cmake
+share/apps/cmake/modules/FindOpenGLES.cmake
 share/apps/cmake/modules/FindPAM.cmake
 share/apps/cmake/modules/FindSensors.cmake
 share/apps/cmake/modules/PkgConfigGetVar.cmake
@@ -486,12 +488,15 @@ share/apps/color-schemes/Oxygen.colors
 share/apps/color-schemes/OxygenCold.colors
 share/apps/color-schemes/Steel.colors
 share/apps/color-schemes/WontonSoup.colors
+share/apps/color-schemes/Zion.colors
+share/apps/color-schemes/ZionReversed.colors
 share/apps/desktoptheme/air-netbook/colors
 share/apps/desktoptheme/air-netbook/metadata.desktop
 share/apps/desktoptheme/air-netbook/widgets/background.svgz
 share/apps/desktoptheme/air-netbook/widgets/panel-background.svgz
 share/apps/desktoptheme/default/calendar/mini-calendar.svgz
 share/apps/desktoptheme/default/system-monitor/hdd_panel.svgz
+share/apps/desktoptheme/default/widgets/activities.svgz
 share/apps/desktoptheme/default/widgets/battery-oxygen.svgz
 share/apps/doc/kdm/README
 share/apps/doc/kdm/greeter.dtd
@@ -503,6 +508,7 @@ share/apps/kcminput/cursor_large_white.pcf.gz
 share/apps/kcminput/cursor_small_white.pcf.gz
 share/apps/kcminput/pics/mouse_lh.png
 share/apps/kcminput/pics/mouse_rh.png
+share/apps/kcmkeyboard/pics/epo.png
 share/apps/kcmkeys/kde3.kksrc
 share/apps/kcmkeys/kde4.kksrc
 share/apps/kcmkeys/mac4.kksrc
@@ -528,6 +534,7 @@ share/apps/kconf_update/kwin_focus2.sh
 share/apps/kconf_update/kwin_focus2.upd
 share/apps/kconf_update/kwin_fsp_workarounds_1.upd
 share/apps/kconf_update/kwin_on_off.upd
+share/apps/kconf_update/kwin_remove_effects.upd
 share/apps/kconf_update/kwin_update_tabbox_settings.upd
 share/apps/kconf_update/kwin_window_shortcuts.sh
 share/apps/kconf_update/kwin_window_shortcuts.upd
@@ -775,8 +782,12 @@ share/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.xml
 share/apps/kwin/DefaultTabBoxLayouts.xml
 share/apps/kwin/aurorae.desktop
 share/apps/kwin/b2.desktop
+share/apps/kwin/blinking-startup-fragment.glsl
 share/apps/kwin/circle-edgy.png
 share/apps/kwin/circle.png
+share/apps/kwin/coverswitch-reflection.glsl
+share/apps/kwin/cube-cap.glsl
+share/apps/kwin/cube-reflection.glsl
 share/apps/kwin/cubecap.png
 share/apps/kwin/cylinder.frag
 share/apps/kwin/cylinder.vert
@@ -785,27 +796,19 @@ share/apps/kwin/default_rules/plasma_desktop_containment.kwinrules
 share/apps/kwin/explosion-end.png
 share/apps/kwin/explosion-start.png
 share/apps/kwin/explosion.frag
-share/apps/kwin/explosion.vert
 share/apps/kwin/invert.frag
-share/apps/kwin/invert.vert
 share/apps/kwin/kwin.notifyrc
 share/apps/kwin/laptop.desktop
 share/apps/kwin/lookingglass.frag
-share/apps/kwin/lookingglass.vert
 share/apps/kwin/oxygenclient.desktop
 share/apps/kwin/plastik.desktop
-share/apps/kwin/shadow-texture.png
-share/apps/kwin/sharpen.frag
-share/apps/kwin/sharpen.vert
-share/apps/kwin/snow.frag
-share/apps/kwin/snow.vert
-share/apps/kwin/snowflake.png
 share/apps/kwin/sphere.vert
 share/apps/kwin/tabstrip.desktop
 share/apps/kwin/trackmouse.png
 share/apps/kwrited/kwrited.notifyrc
 share/apps/plasma-desktop/init/00-defaultLayout.js
 share/apps/plasma-desktop/plasma-desktop.notifyrc
+share/apps/plasma-desktop/updates/addShowActivitiesManagerPlasmoid.js
 share/apps/plasma-desktop/updates/systray-to-notifications-widget.js
 share/apps/plasma-netbook/init/00-defaultLayout.js
 share/apps/plasma/dashboard/AppleClasses/AppleAnimator.js
@@ -817,8 +820,12 @@ share/apps/plasma/dashboard/AppleClasses/AppleSlider.js
 share/apps/plasma/dashboard/button/genericButton.js
 share/apps/plasma/layout-templates/org.kde.freebsd.defaultWallpaper/contents/layout.js
 share/apps/plasma/layout-templates/org.kde.freebsd.defaultWallpaper/metadata.desktop
+share/apps/plasma/layout-templates/org.kde.plasma-desktop.SaL/contents/layout.js
+share/apps/plasma/layout-templates/org.kde.plasma-desktop.SaL/metadata.desktop
 share/apps/plasma/layout-templates/org.kde.plasma-desktop.defaultPanel/contents/layout.js
 share/apps/plasma/layout-templates/org.kde.plasma-desktop.defaultPanel/metadata.desktop
+share/apps/plasma/layout-templates/org.kde.plasma-desktop.desktopIcons/contents/layout.js
+share/apps/plasma/layout-templates/org.kde.plasma-desktop.desktopIcons/metadata.desktop
 share/apps/plasma/layout-templates/org.kde.plasma-desktop.findWidgets/contents/layout.js
 share/apps/plasma/layout-templates/org.kde.plasma-desktop.findWidgets/metadata.desktop
 share/apps/plasma/layout-templates/org.kde.plasma-desktop.photoActivity/contents/layout.js
@@ -840,8 +847,12 @@ share/apps/plasma/services/searchlaunch.operations
 share/apps/plasma/services/share.operations
 share/apps/plasma/services/statusnotifieritem.operations
 share/apps/plasma/services/tasks.operations
+share/apps/plasma/shareprovider/imgsusepasteorg/contents/code/main.js
+share/apps/plasma/shareprovider/imgsusepasteorg/metadata.desktop
 share/apps/plasma/shareprovider/imgur/contents/code/main.js
 share/apps/plasma/shareprovider/imgur/metadata.desktop
+share/apps/plasma/shareprovider/kde/contents/code/main.js
+share/apps/plasma/shareprovider/kde/metadata.desktop
 share/apps/plasma/shareprovider/pastebincom/contents/code/main.js
 share/apps/plasma/shareprovider/pastebincom/metadata.desktop
 share/apps/plasma/shareprovider/pasteopensuseorg/contents/code/main.js
@@ -900,6 +911,7 @@ share/config/ksysguard.knsrc
 share/config/plasma-overlayrc
 share/config/plasma-themes.knsrc
 share/config/wallpaper.knsrc
+share/config/xcursor.knsrc
 share/dbus-1/interfaces/org.freedesktop.ScreenSaver.xml
 share/dbus-1/interfaces/org.kde.KSMServerInterface.xml
 share/dbus-1/interfaces/org.kde.KWin.xml
@@ -1050,8 +1062,12 @@ share/doc/HTML/en/ksysguard/index.cache.bz2
 share/doc/HTML/en/ksysguard/index.docbook
 share/doc/HTML/en/plasma-desktop/add-widgets.png
 share/doc/HTML/en/plasma-desktop/common
+share/doc/HTML/en/plasma-desktop/desktop-settings.png
 share/doc/HTML/en/plasma-desktop/index.cache.bz2
 share/doc/HTML/en/plasma-desktop/index.docbook
+share/doc/HTML/en/plasma-desktop/panel-settings.png
+share/doc/HTML/en/plasma-desktop/system-tray-settings.png
+share/doc/HTML/en/plasma-desktop/system-tray-up-arrow.png
 share/doc/HTML/en/plasma-desktop/taskbar-settings.png
 share/doc/HTML/en/systemsettings/common
 share/doc/HTML/en/systemsettings/index.cache.bz2
@@ -1872,6 +1888,7 @@ share/kde4/services/fontthumbnail.desktop
 share/kde4/services/graphicalinfocategory.desktop
 share/kde4/services/interrupts.desktop
 share/kde4/services/ion-bbcukmet.desktop
+share/kde4/services/ion-debianweather.desktop
 share/kde4/services/ion-envcan.desktop
 share/kde4/services/ion-noaa.desktop
 share/kde4/services/ion-wettercom.desktop
@@ -1939,16 +1956,13 @@ share/kde4/services/kwin/magnifier_config.desktop
 share/kde4/services/kwin/minimizeanimation.desktop
 share/kde4/services/kwin/mousemark.desktop
 share/kde4/services/kwin/mousemark_config.desktop
+share/kde4/services/kwin/outline.desktop
 share/kde4/services/kwin/presentwindows.desktop
 share/kde4/services/kwin/presentwindows_config.desktop
 share/kde4/services/kwin/resize.desktop
 share/kde4/services/kwin/resize_config.desktop
 share/kde4/services/kwin/scalein.desktop
 share/kde4/services/kwin/screenshot.desktop
-share/kde4/services/kwin/shadow.desktop
-share/kde4/services/kwin/shadow_config.desktop
-share/kde4/services/kwin/sharpen.desktop
-share/kde4/services/kwin/sharpen_config.desktop
 share/kde4/services/kwin/sheet.desktop
 share/kde4/services/kwin/showfps.desktop
 share/kde4/services/kwin/showfps_config.desktop
@@ -1957,8 +1971,6 @@ share/kde4/services/kwin/slide.desktop
 share/kde4/services/kwin/slideback.desktop
 share/kde4/services/kwin/slidingpopups.desktop
 share/kde4/services/kwin/snaphelper.desktop
-share/kde4/services/kwin/snow.desktop
-share/kde4/services/kwin/snow_config.desktop
 share/kde4/services/kwin/startupfeedback.desktop
 share/kde4/services/kwin/taskbarthumbnail.desktop
 share/kde4/services/kwin/thumbnailaside.desktop
@@ -1999,6 +2011,7 @@ share/kde4/services/plasma-applet-icon.desktop
 share/kde4/services/plasma-applet-launcher.desktop
 share/kde4/services/plasma-applet-lockout.desktop
 share/kde4/services/plasma-applet-notifications.desktop
+share/kde4/services/plasma-applet-org.kde.showActivityManager.desktop
 share/kde4/services/plasma-applet-panelspacer-internal.desktop
 share/kde4/services/plasma-applet-quicklaunch.desktop
 share/kde4/services/plasma-applet-searchbox.desktop
@@ -2046,7 +2059,9 @@ share/kde4/services/plasma-dataengine-nowplaying.desktop
 share/kde4/services/plasma-dataengine-places.desktop
 share/kde4/services/plasma-dataengine-powermanagement.desktop
 share/kde4/services/plasma-dataengine-rss.desktop
+share/kde4/services/plasma-dataengine-share-addon-imgsusepasteorg.desktop
 share/kde4/services/plasma-dataengine-share-addon-imgur.desktop
+share/kde4/services/plasma-dataengine-share-addon-kde.desktop
 share/kde4/services/plasma-dataengine-share-addon-pastebincom.desktop
 share/kde4/services/plasma-dataengine-share-addon-pasteopensuseorg.desktop
 share/kde4/services/plasma-dataengine-share-addon-pasteubuntucom.desktop
@@ -2064,9 +2079,11 @@ share/kde4/services/plasma-engine-activities.desktop
 share/kde4/services/plasma-engine-akonadi.desktop
 share/kde4/services/plasma-engine-metadata.desktop
 share/kde4/services/plasma-engine-searchlaunch.desktop
-share/kde4/services/plasma-geolocation-gps.desktop
+%%GPS%%share/kde4/services/plasma-geolocation-gps.desktop
 share/kde4/services/plasma-geolocation-ip.desktop
+share/kde4/services/plasma-layout-org.kde.plasma-desktop.SaL.desktop
 share/kde4/services/plasma-layout-org.kde.plasma-desktop.defaultPanel.desktop
+share/kde4/services/plasma-layout-org.kde.plasma-desktop.desktopIcons.desktop
 share/kde4/services/plasma-layout-org.kde.plasma-desktop.findWidgets.desktop
 share/kde4/services/plasma-layout-org.kde.plasma-desktop.photoActivity.desktop
 share/kde4/services/plasma-layout-org.kde.plasma-netbook.defaultPage.desktop
@@ -2076,6 +2093,7 @@ share/kde4/services/plasma-packagestructure-dashboard.desktop
 share/kde4/services/plasma-packagestructure-share.desktop
 share/kde4/services/plasma-packagestructure-web.desktop
 share/kde4/services/plasma-pager-default.desktop
+share/kde4/services/plasma-runner-activityrunner.desktop
 share/kde4/services/plasma-runner-bookmarks.desktop
 share/kde4/services/plasma-runner-calculator.desktop
 share/kde4/services/plasma-runner-kill.desktop
@@ -2157,7 +2175,6 @@ share/kde4/services/settings-workspace-behavior.desktop
 share/kde4/services/smbstatus.desktop
 share/kde4/services/solid-actions.desktop
 share/kde4/services/solidbackends/solid_fakenet.desktop
-share/kde4/services/solidbackends/solid_lirc.desktop
 share/kde4/services/solidbackends/solid_wicd.desktop
 share/kde4/services/standard_actions.desktop
 share/kde4/services/style.desktop
@@ -2175,7 +2192,6 @@ share/kde4/servicetypes/screensaver.desktop
 share/kde4/servicetypes/solid-device-type.desktop
 share/kde4/servicetypes/solidmodemmanager.desktop
 share/kde4/servicetypes/solidnetworkmanager.desktop
-share/kde4/servicetypes/solidremotecontrolmanager.desktop
 share/kde4/servicetypes/systemsettingscategory.desktop
 share/kde4/servicetypes/systemsettingsexternalapp.desktop
 share/kde4/servicetypes/systemsettingsview.desktop
@@ -2185,102 +2201,6 @@ share/polkit-1/actions/org.kde.kcontrol.kcmkdm.policy
 share/polkit-1/actions/org.kde.ksysguard.processlisthelper.policy
 share/polkit-1/actions/org.kde.powerdevil.backlighthelper.policy
 share/sounds/pop.wav
-share/wallpapers/Aghi/contents/images/1024x768.jpg
-share/wallpapers/Aghi/contents/images/1280x1024.jpg
-share/wallpapers/Aghi/contents/images/1280x800.jpg
-share/wallpapers/Aghi/contents/images/1440x900.jpg
-share/wallpapers/Aghi/contents/images/1600x1200.jpg
-share/wallpapers/Aghi/contents/images/1920x1080.jpg
-share/wallpapers/Aghi/contents/images/1920x1200.jpg
-share/wallpapers/Aghi/contents/images/800x600.jpg
-share/wallpapers/Aghi/contents/screenshot.jpg
-share/wallpapers/Aghi/metadata.desktop
-share/wallpapers/Air/contents/images/1280x1024.jpg
-share/wallpapers/Air/contents/images/1600x1200.jpg
-share/wallpapers/Air/contents/images/1920x1080.jpg
-share/wallpapers/Air/contents/images/1920x1200.jpg
-share/wallpapers/Air/contents/screenshot.png
-share/wallpapers/Air/metadata.desktop
-share/wallpapers/Autumn/contents/images/1280x1024.jpg
-share/wallpapers/Autumn/contents/images/1600x1200.jpg
-share/wallpapers/Autumn/contents/images/1920x1080.jpg
-share/wallpapers/Autumn/contents/images/1920x1200.jpg
-share/wallpapers/Autumn/contents/screenshot.png
-share/wallpapers/Autumn/metadata.desktop
-share/wallpapers/Blue_Wood/contents/images/1280x1024.jpg
-share/wallpapers/Blue_Wood/contents/images/1600x1200.jpg
-share/wallpapers/Blue_Wood/contents/images/1920x1080.jpg
-share/wallpapers/Blue_Wood/contents/images/1920x1200.jpg
-share/wallpapers/Blue_Wood/contents/screenshot.png
-share/wallpapers/Blue_Wood/metadata.desktop
-share/wallpapers/Evening/contents/images/1280x1024.jpg
-share/wallpapers/Evening/contents/images/1600x1200.jpg
-share/wallpapers/Evening/contents/images/1920x1080.jpg
-share/wallpapers/Evening/contents/images/1920x1200.jpg
-share/wallpapers/Evening/contents/screnshot.jpg
-share/wallpapers/Evening/metadata.desktop
-share/wallpapers/Fields_of_Peace/contents/images/1280x1024.JPG
-share/wallpapers/Fields_of_Peace/contents/images/1600x1200.JPG
-share/wallpapers/Fields_of_Peace/contents/images/1920x1200.JPG
-share/wallpapers/Fields_of_Peace/contents/screenshot.png
-share/wallpapers/Fields_of_Peace/metadata.desktop
-share/wallpapers/Finally_Summer_in_Germany/contents/images/1280x1024.jpg
-share/wallpapers/Finally_Summer_in_Germany/contents/images/1600x1200.jpg
-share/wallpapers/Finally_Summer_in_Germany/contents/images/1920x1200.jpg
-share/wallpapers/Finally_Summer_in_Germany/contents/screenshot.png
-share/wallpapers/Finally_Summer_in_Germany/metadata.desktop
-share/wallpapers/Fresh_Morning/contents/images/1280x1024.jpg
-share/wallpapers/Fresh_Morning/contents/images/1600x1200.jpg
-share/wallpapers/Fresh_Morning/contents/images/1920x1200.jpg
-share/wallpapers/Fresh_Morning/contents/screenshot.png
-share/wallpapers/Fresh_Morning/metadata.desktop
-share/wallpapers/Grass/contents/images/1280x1024.jpg
-share/wallpapers/Grass/contents/images/1600x1200.jpg
-share/wallpapers/Grass/contents/images/1920x1080.jpg
-share/wallpapers/Grass/contents/images/1920x1200.jpg
-share/wallpapers/Grass/contents/screenshot.png
-share/wallpapers/Grass/metadata.desktop
-share/wallpapers/Hanami/contents/images/1280x1024.jpg
-share/wallpapers/Hanami/contents/images/1600x1200.jpg
-share/wallpapers/Hanami/contents/images/1920x1080.jpg
-share/wallpapers/Hanami/contents/images/1920x1200.jpg
-share/wallpapers/Hanami/contents/screenshot.png
-share/wallpapers/Hanami/metadata.desktop
-share/wallpapers/Horos/contents/images/1280x1024.png
-share/wallpapers/Horos/contents/images/1600x1200.png
-share/wallpapers/Horos/contents/images/1920x1080.png
-share/wallpapers/Horos/contents/images/1920x1200.png
-share/wallpapers/Horos/contents/screenshot.png
-share/wallpapers/Horos/metadata.desktop
-share/wallpapers/Media_Life/contents/images/1280x1024.jpg
-share/wallpapers/Media_Life/contents/images/1280x800.jpg
-share/wallpapers/Media_Life/contents/images/1440x900.jpg
-share/wallpapers/Media_Life/contents/images/1480x925.jpg
-share/wallpapers/Media_Life/contents/images/1600x1200.jpg
-share/wallpapers/Media_Life/contents/images/1680x1050.jpg
-share/wallpapers/Media_Life/contents/images/1920x1200.jpg
-share/wallpapers/Media_Life/contents/screenshot.png
-share/wallpapers/Media_Life/metadata.desktop
-share/wallpapers/Plasmalicious/contents/images/1280x1024.jpg
-share/wallpapers/Plasmalicious/contents/images/1600x1200.jpg
-share/wallpapers/Plasmalicious/contents/images/1920x1200.jpg
-share/wallpapers/Plasmalicious/contents/screenshot.png
-share/wallpapers/Plasmalicious/metadata.desktop
-share/wallpapers/Quadros/contents/images/1024x768.jpg
-share/wallpapers/Quadros/contents/images/1280x1024.jpg
-share/wallpapers/Quadros/contents/images/1280x800.jpg
-share/wallpapers/Quadros/contents/images/1440x900.jpg
-share/wallpapers/Quadros/contents/images/1600x1200.jpg
-share/wallpapers/Quadros/contents/images/1920x1080.jpg
-share/wallpapers/Quadros/contents/images/1920x1200.jpg
-share/wallpapers/Quadros/contents/images/800x600.jpg
-share/wallpapers/Quadros/contents/screenshot.png
-share/wallpapers/Quadros/metadata.desktop
-share/wallpapers/Red_Leaf/contents/images/1280x1024.jpg
-share/wallpapers/Red_Leaf/contents/images/1600x1200.jpg
-share/wallpapers/Red_Leaf/contents/images/1920x1200.jpg
-share/wallpapers/Red_Leaf/contents/screenshot.png
-share/wallpapers/Red_Leaf/metadata.desktop
 share/wallpapers/stripes-freebsd-blue/contents/images/1024x768.jpg
 share/wallpapers/stripes-freebsd-blue/contents/images/1280x1024.jpg
 share/wallpapers/stripes-freebsd-blue/contents/images/1280x800.jpg
@@ -2309,51 +2229,6 @@ share/wallpapers/stripes.png.desktop
 @dirrm share/wallpapers/stripes-freebsd-blue/contents/images
 @dirrm share/wallpapers/stripes-freebsd-blue/contents
 @dirrm share/wallpapers/stripes-freebsd-blue
-@dirrm share/wallpapers/Red_Leaf/contents/images
-@dirrm share/wallpapers/Red_Leaf/contents
-@dirrm share/wallpapers/Red_Leaf
-@dirrm share/wallpapers/Quadros/contents/images
-@dirrm share/wallpapers/Quadros/contents
-@dirrm share/wallpapers/Quadros
-@dirrm share/wallpapers/Plasmalicious/contents/images
-@dirrm share/wallpapers/Plasmalicious/contents
-@dirrm share/wallpapers/Plasmalicious
-@dirrmtry share/wallpapers/Media_Life/contents/images
-@dirrmtry share/wallpapers/Media_Life/contents
-@dirrmtry share/wallpapers/Media_Life
-@dirrmtry share/wallpapers/Horos/contents/images
-@dirrmtry share/wallpapers/Horos/contents
-@dirrmtry share/wallpapers/Horos
-@dirrmtry share/wallpapers/Hanami/contents/images
-@dirrmtry share/wallpapers/Hanami/contents
-@dirrmtry share/wallpapers/Hanami
-@dirrmtry share/wallpapers/Grass/contents/images
-@dirrmtry share/wallpapers/Grass/contents
-@dirrmtry share/wallpapers/Grass
-@dirrm share/wallpapers/Fresh_Morning/contents/images
-@dirrm share/wallpapers/Fresh_Morning/contents
-@dirrm share/wallpapers/Fresh_Morning
-@dirrm share/wallpapers/Finally_Summer_in_Germany/contents/images
-@dirrm share/wallpapers/Finally_Summer_in_Germany/contents
-@dirrm share/wallpapers/Finally_Summer_in_Germany
-@dirrm share/wallpapers/Fields_of_Peace/contents/images
-@dirrm share/wallpapers/Fields_of_Peace/contents
-@dirrm share/wallpapers/Fields_of_Peace
-@dirrm share/wallpapers/Evening/contents/images
-@dirrm share/wallpapers/Evening/contents
-@dirrm share/wallpapers/Evening
-@dirrmtry share/wallpapers/Blue_Wood/contents/images
-@dirrmtry share/wallpapers/Blue_Wood/contents
-@dirrmtry share/wallpapers/Blue_Wood
-@dirrmtry share/wallpapers/Autumn/contents/images
-@dirrmtry share/wallpapers/Autumn/contents
-@dirrmtry share/wallpapers/Autumn
-@dirrm share/wallpapers/Air/contents/images
-@dirrm share/wallpapers/Air/contents
-@dirrm share/wallpapers/Air
-@dirrm share/wallpapers/Aghi/contents/images
-@dirrm share/wallpapers/Aghi/contents
-@dirrm share/wallpapers/Aghi
 @dirrm share/kde4/services/solidbackends
 @dirrm share/kde4/services/kwin
 @dirrm share/icons/Oxygen_Zion_Big/cursors
@@ -2439,9 +2314,15 @@ share/wallpapers/stripes.png.desktop
 @dirrm share/apps/plasma/shareprovider/pastebincom/contents/code
 @dirrm share/apps/plasma/shareprovider/pastebincom/contents
 @dirrm share/apps/plasma/shareprovider/pastebincom
+@dirrm share/apps/plasma/shareprovider/kde/contents/code
+@dirrm share/apps/plasma/shareprovider/kde/contents
+@dirrm share/apps/plasma/shareprovider/kde
 @dirrm share/apps/plasma/shareprovider/imgur/contents/code
 @dirrm share/apps/plasma/shareprovider/imgur/contents
 @dirrm share/apps/plasma/shareprovider/imgur
+@dirrm share/apps/plasma/shareprovider/imgsusepasteorg/contents/code
+@dirrm share/apps/plasma/shareprovider/imgsusepasteorg/contents
+@dirrm share/apps/plasma/shareprovider/imgsusepasteorg
 @dirrmtry share/apps/plasma/shareprovider
 @dirrm share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultSal/contents
 @dirrm share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultSal
@@ -2453,8 +2334,12 @@ share/wallpapers/stripes.png.desktop
 @dirrm share/apps/plasma/layout-templates/org.kde.plasma-desktop.photoActivity
 @dirrm share/apps/plasma/layout-templates/org.kde.plasma-desktop.findWidgets/contents
 @dirrm share/apps/plasma/layout-templates/org.kde.plasma-desktop.findWidgets
+@dirrm share/apps/plasma/layout-templates/org.kde.plasma-desktop.desktopIcons/contents
+@dirrm share/apps/plasma/layout-templates/org.kde.plasma-desktop.desktopIcons
 @dirrm share/apps/plasma/layout-templates/org.kde.plasma-desktop.defaultPanel/contents
 @dirrm share/apps/plasma/layout-templates/org.kde.plasma-desktop.defaultPanel
+@dirrm share/apps/plasma/layout-templates/org.kde.plasma-desktop.SaL/contents
+@dirrm share/apps/plasma/layout-templates/org.kde.plasma-desktop.SaL
 @dirrm share/apps/plasma/layout-templates/org.kde.freebsd.defaultWallpaper/contents
 @dirrm share/apps/plasma/layout-templates/org.kde.freebsd.defaultWallpaper
 @dirrm share/apps/plasma/layout-templates
@@ -2531,6 +2416,8 @@ share/wallpapers/stripes.png.desktop
 @dirrm share/apps/kcmusb
 @dirrm share/apps/kcmsolidactions
 @dirrm share/apps/kcmkeys
+@dirrm share/apps/kcmkeyboard/pics
+@dirrm share/apps/kcmkeyboard
 @dirrm share/apps/kcminput/pics
 @dirrm share/apps/kcminput
 @dirrm share/apps/kaccess
@@ -2543,6 +2430,7 @@ share/wallpapers/stripes.png.desktop
 @dirrm share/apps/desktoptheme/air-netbook
 @dirrm lib/kde4/plugins/gui_platform
 @dirrm lib/cmake/KDE4Workspace
+@dirrmtry lib/cmake
 @dirrm include/taskmanager
 @dirrm include/systemsettingsview
 @dirrm include/solid/control/ifaces