7 files changed, 23 insertions, 344 deletions

diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile
index 091ca12dd099..1a832cfe8e56 100644
--- a/net/kdenetwork4/Makefile
+++ b/net/kdenetwork4/Makefile
@@ -6,7 +6,6 @@
 
 PORTNAME=	kdenetwork
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
 CATEGORIES=	net kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -15,8 +14,7 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE Network applications
 
-BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat \
-		${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml
+BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat
 LIB_DEPENDS=	slp.1:${PORTSDIR}/net/openslp \
 		idn.17:${PORTSDIR}/dns/libidn \
 		qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
@@ -27,12 +25,12 @@ LIB_DEPENDS=	slp.1:${PORTSDIR}/net/openslp \
 		gadu:${PORTSDIR}/polish/libgadu \
 		gmp.10:${PORTSDIR}/math/gmp \
 		ortp.5:${PORTSDIR}/net/ortp \
-		telepathy-qt4.0:${PORTSDIR}/net-im/telepathy-qt4 \
+		telepathy-qt4.1:${PORTSDIR}/net-im/telepathy-qt4 \
 		meanwhile.1:${PORTSDIR}/net-im/meanwhile \
 		speex.1:${PORTSDIR}/audio/speex \
 		v4l2.0:${PORTSDIR}/multimedia/libv4l \
 		kwebkit.1:${PORTSDIR}/www/kwebkitpart \
-		ktorrent.2:${PORTSDIR}/net-p2p/libktorrent
+		ktorrent.3:${PORTSDIR}/net-p2p/libktorrent
 RUN_DEPENDS=	qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl
 
 LATEST_LINK=	${PORTNAME}4
@@ -49,7 +47,7 @@ MAKE_JOBS_SAFE=	yes
 
 # Explicitly disable alsa, see for details:
 # http://mail.kde.org/pipermail/kde-freebsd/2010-March/008015.html
-CMAKE_ARGS+=	-DWITH_Alsa:BOOL=OFF
+#CMAKE_ARGS+=	-DWITH_Alsa:BOOL=OFF
 
 # Route mozilla plugin by standard path
 CMAKE_ARGS+=	-DMOZPLUGIN_INSTALL_DIR=${PREFIX}/lib/browser_plugins
diff --git a/net/kdenetwork4/distinfo b/net/kdenetwork4/distinfo
index 03c8c1e0c949..288e0891bdd1 100644
--- a/net/kdenetwork4/distinfo
+++ b/net/kdenetwork4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdenetwork-4.5.5.tar.bz2) = efe21eb70a917f80829c1bd9af227e72d3585bb90a89f2e2a77496f2cb5a27f1
-SIZE (KDE/kdenetwork-4.5.5.tar.bz2) = 8148708
+SHA256 (KDE/kdenetwork-4.6.1.tar.bz2) = 4723a6d71b787c99fba98855e33875916eaa57736a92497e78b2827f5f0cde02
+SIZE (KDE/kdenetwork-4.6.1.tar.bz2) = 8684709
diff --git a/net/kdenetwork4/files/patch-kopete__libkopete__avdevice__videodevice.cpp b/net/kdenetwork4/files/patch-kopete__libkopete__avdevice__videodevice.cpp
deleted file mode 100644
index 136a0f6e64fc..000000000000
--- a/net/kdenetwork4/files/patch-kopete__libkopete__avdevice__videodevice.cpp
+++ /dev/null
@@ -1,245 +0,0 @@
---- ./kopete/libkopete/avdevice/videodevice.cpp.orig	2010-10-01 01:22:38.000000000 +0400
-+++ ./kopete/libkopete/avdevice/videodevice.cpp	2010-10-31 23:13:07.584295519 +0300
-@@ -57,7 +57,7 @@
-  */
- void VideoDevice::setupControls()
- {
--#if defined(__linux__) && defined(ENABLE_AV)
-+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
- 	bool driver_vflip = false;
- 	bool driver_hflip = false;
- #endif
-@@ -68,7 +68,7 @@
- 
- 	switch(m_driver)
- 	{
--#if defined(__linux__) && defined(ENABLE_AV)
-+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
- #ifdef V4L2_CAP_VIDEO_CAPTURE
- 		case VIDEODEV_DRIVER_V4L2:
- 			struct v4l2_queryctrl qctrl;
-@@ -146,7 +146,7 @@
- 			break;
- 	}
- 	
--#if defined(__linux__) && defined(ENABLE_AV)
-+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
- 	// Software controls:
- 	BooleanVideoControl boolCtrl;
- 	boolCtrl.value_default = 0;
-@@ -171,7 +171,7 @@
- #endif
- }
- 
--#if defined(__linux__) && defined(ENABLE_AV)
-+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
- #ifdef V4L2_CAP_VIDEO_CAPTURE
- /*!
-     \fn bool VideoDevice::getMenuCtrlOptions(quint32 id, quint32 maxindex, QStringList * options)
-@@ -379,7 +379,7 @@
- 		m_videostream=false;
- 
- 		m_driver=VIDEODEV_DRIVER_NONE;
--#if defined(__linux__) && defined(ENABLE_AV)
-+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
- #ifdef V4L2_CAP_VIDEO_CAPTURE
- 
- 		CLEAR(V4L2_capabilities);
-@@ -649,7 +649,7 @@
- 	m_io_method = IO_METHOD_NONE;
- 	switch(m_driver)
- 	{
--#if defined(__linux__) && defined(ENABLE_AV)
-+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
- #ifdef V4L2_CAP_VIDEO_CAPTURE
- 		case VIDEODEV_DRIVER_V4L2:
- 			if(V4L2_capabilities.capabilities & V4L2_CAP_READWRITE)
-@@ -695,7 +695,7 @@
- 	}
- 
- // Select video input, video standard and tune here.
--#if defined(__linux__) && defined(ENABLE_AV)
-+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
- #ifdef V4L2_CAP_VIDEO_CAPTURE
- 	struct v4l2_cropcap cropcap;
- 	struct v4l2_crop crop;
-@@ -826,7 +826,7 @@
- // Change resolution for the video device
- 		switch(m_driver)
- 		{
--#if defined(__linux__) && defined(ENABLE_AV)
-+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
- #ifdef V4L2_CAP_VIDEO_CAPTURE
- 			case VIDEODEV_DRIVER_V4L2:
- //				CLEAR (fmt);
-@@ -932,7 +932,7 @@
- // Change the pixel format for the video device
- 	switch(m_driver)
- 	{
--#if defined(__linux__) && defined(ENABLE_AV)
-+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
- #ifdef V4L2_CAP_VIDEO_CAPTURE
- 		case VIDEODEV_DRIVER_V4L2:
- //			CLEAR (fmt);
-@@ -1025,7 +1025,7 @@
- 	{
- 		switch (m_driver)
- 		{
--#if defined(__linux__) && defined(ENABLE_AV)
-+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
- #ifdef V4L2_CAP_VIDEO_CAPTURE
- 			case VIDEODEV_DRIVER_V4L2:
- 				if (-1 == ioctl (descriptor, VIDIOC_S_INPUT, &newinput))
-@@ -1076,7 +1076,7 @@
- 			case IO_METHOD_READ: // Nothing to do
- 				break;
- 			case IO_METHOD_MMAP:
--#if defined(__linux__) && defined(ENABLE_AV)
-+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
- #ifdef V4L2_CAP_VIDEO_CAPTURE
- 				{
- 					unsigned int loop;
-@@ -1098,7 +1098,7 @@
- #endif
- 				break;
- 			case IO_METHOD_USERPTR:
--#if defined(__linux__) && defined(ENABLE_AV)
-+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
- #ifdef V4L2_CAP_VIDEO_CAPTURE
- 				{
- 					unsigned int loop;
-@@ -1136,7 +1136,7 @@
-     /// @todo implement me
- 	ssize_t bytesread;
- 
--#if defined(__linux__) && defined(ENABLE_AV)
-+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
- #ifdef V4L2_CAP_VIDEO_CAPTURE
- 	struct v4l2_buffer v4l2buffer;
- #endif
-@@ -1175,7 +1175,7 @@
- 				}
- 				break;
- 			case IO_METHOD_MMAP:
--#if defined(__linux__) && defined(ENABLE_AV)
-+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
- #ifdef V4L2_CAP_VIDEO_CAPTURE
- 				CLEAR (v4l2buffer);
- 				v4l2buffer.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-@@ -1211,7 +1211,7 @@
- #endif
- 				break;
- 			case IO_METHOD_USERPTR:
--#if defined(__linux__) && defined(ENABLE_AV)
-+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
- #ifdef V4L2_CAP_VIDEO_CAPTURE
- 				{
- 					unsigned int i;
-@@ -1724,7 +1724,7 @@
- 	if (!isOpen())
- 		return EXIT_FAILURE;
- 
--#if defined(__linux__) && defined(ENABLE_AV)
-+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
- 	if (ctrl_id == IMGCTRL_ID_SOFT_AUTOBRIGHTNESSCONTRASTCORR)
- 	{
- 		if (m_current_input < m_input.size() )
-@@ -1773,7 +1773,7 @@
- 
- 	switch(m_driver)
- 	{
--#if defined(__linux__) && defined(ENABLE_AV)
-+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
- #ifdef V4L2_CAP_VIDEO_CAPTURE
- 		case VIDEODEV_DRIVER_V4L2:
- 			{
-@@ -1864,7 +1864,7 @@
- 	if (!isOpen())
- 		return EXIT_FAILURE;
- 
--#if defined(__linux__) && defined(ENABLE_AV)
-+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
- 	if (ctrl_id == IMGCTRL_ID_SOFT_AUTOBRIGHTNESSCONTRASTCORR)
- 	{
- 		if (m_current_input < m_input.size() )
-@@ -1909,7 +1909,7 @@
- 
- 	switch(m_driver)
- 	{
--#if defined(__linux__) && defined(ENABLE_AV)
-+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
- #ifdef V4L2_CAP_VIDEO_CAPTURE
- 		case VIDEODEV_DRIVER_V4L2:
- 			{
-@@ -2012,7 +2012,7 @@
- {
- 	switch(m_driver)
- 	{
--#if defined(__linux__) && defined(ENABLE_AV)
-+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
- #ifdef V4L2_CAP_VIDEO_CAPTURE
- 		case VIDEODEV_DRIVER_V4L2:
- 			switch(palette)
-@@ -2092,7 +2092,7 @@
- {
- 	switch(m_driver)
- 	{
--#if defined(__linux__) && defined(ENABLE_AV)
-+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
- #ifdef V4L2_CAP_VIDEO_CAPTURE
- 		case VIDEODEV_DRIVER_V4L2:
- 			switch(pixelformat)
-@@ -2298,7 +2298,7 @@
- 	returnvalue = "None";
- 	switch(m_driver)
- 	{
--#if defined(__linux__) && defined(ENABLE_AV)
-+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
- #ifdef V4L2_CAP_VIDEO_CAPTURE
- 		case VIDEODEV_DRIVER_V4L2:
- 			switch(pixelformat)
-@@ -2378,7 +2378,7 @@
- 			int err = 0;
- 	switch(m_driver)
- 	{
--#if defined(__linux__) && defined(ENABLE_AV)
-+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
- #ifdef V4L2_CAP_VIDEO_CAPTURE
- 		case VIDEODEV_DRIVER_V4L2:
- 			struct v4l2_fmtdesc fmtdesc;
-@@ -2456,7 +2456,7 @@
- {
- 	switch(m_driver)
- 	{
--#if defined(__linux__) && defined(ENABLE_AV)
-+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
- #ifdef V4L2_CAP_VIDEO_CAPTURE
- 		case VIDEODEV_DRIVER_V4L2:
- 			switch(standard)
-@@ -2640,7 +2640,7 @@
- 	returnvalue = "None";
- 	switch(m_driver)
- 	{
--#if defined(__linux__) && defined(ENABLE_AV)
-+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
- #ifdef V4L2_CAP_VIDEO_CAPTURE
- 		case VIDEODEV_DRIVER_V4L2:
- 			switch(standard)
-@@ -2726,7 +2726,7 @@
- 	{
- 	switch(m_driver)
- 		{
--#if defined(__linux__) && defined(ENABLE_AV)
-+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
- #ifdef V4L2_CAP_VIDEO_CAPTURE
- 			case VIDEODEV_DRIVER_V4L2:
- 
-@@ -2998,7 +2998,7 @@
- }
- 
- 
--#if defined(__linux__) && defined(ENABLE_AV)  && defined(V4L2_CAP_VIDEO_CAPTURE)
-+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)  && defined(V4L2_CAP_VIDEO_CAPTURE)
- /*!
-     \fn const char * VideoDevice::getUnifiedV4L2StdCtrlName(quint32 std_ctrl_id)
-     \param std_ctrl_id ID of the V4L2 standard video control
diff --git a/net/kdenetwork4/files/patch-kopete__libkopete__avdevice__videodevice.h b/net/kdenetwork4/files/patch-kopete__libkopete__avdevice__videodevice.h
deleted file mode 100644
index 13840a71545f..000000000000
--- a/net/kdenetwork4/files/patch-kopete__libkopete__avdevice__videodevice.h
+++ /dev/null
@@ -1,71 +0,0 @@
---- ./kopete/libkopete/avdevice/videodevice.h.orig	2010-03-30 12:28:37.000000000 +0400
-+++ ./kopete/libkopete/avdevice/videodevice.h	2010-10-31 23:13:07.574296355 +0300
-@@ -32,9 +32,11 @@
- #include <unistd.h>
- #include <signal.h>
- 
--#if defined(__linux__) && defined(ENABLE_AV)
-+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
- 
-+#if defined(__linux__)
- #include <asm/types.h>
-+#endif
- #undef __STRICT_ANSI__
- #ifndef __u64 //required by videodev.h
- #define __u64 unsigned long long
-@@ -48,8 +50,10 @@
- #define pgoff_t unsigned long
- #endif
- 
-+#if defined(__linux__)
- #include <linux/fs.h>
- #include <linux/kernel.h>
-+#endif
- #include <linux/videodev.h>
- #define VIDEO_MODE_PAL_Nc  3
- #define VIDEO_MODE_PAL_M   4
-@@ -61,7 +65,7 @@
- #include <libv4l2.h>
- #endif // HAVE_V4L2
- 
--#endif // __linux__
-+#endif // __linux__ __FreeBSD__ ENABLE_AV
- 
- #include <qstring.h>
- #include <qfile.h>
-@@ -80,7 +84,7 @@
- typedef enum
- {
- 	VIDEODEV_DRIVER_NONE
--#if defined( __linux__) && defined(ENABLE_AV)
-+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
-         ,
- 	VIDEODEV_DRIVER_V4L
- #ifdef V4L2_CAP_VIDEO_CAPTURE
-@@ -327,7 +331,7 @@
- 	QVector<Kopete::AV::VideoInput> m_input;
- 
- protected:
--#if defined(__linux__) && defined(ENABLE_AV)
-+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
- 	/*!
- 	    \enum VideoDevice::imgctrl_id Control-IDs used for V4L1- and software-controls
- 	 */
-@@ -356,7 +360,7 @@
- 	int descriptor;
- 	videodev_driver m_driver;
- 	QString m_model;
--#if defined(__linux__) && defined(ENABLE_AV)
-+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
- #ifdef V4L2_CAP_VIDEO_CAPTURE
- 	struct v4l2_capability V4L2_capabilities;
- 	struct v4l2_format fmt;
-@@ -388,7 +392,7 @@
- 	virtual int initDevice();
- 
- 	void setupControls();
--#if defined(__linux__) && defined(ENABLE_AV) && defined(V4L2_CAP_VIDEO_CAPTURE)
-+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV) && defined(V4L2_CAP_VIDEO_CAPTURE)
- 	bool getMenuCtrlOptions(quint32 id, quint32 maxindex, QStringList * options);
- 	void saveV4L2ControlData(struct v4l2_queryctrl qctrl);
- 	const char *getUnifiedV4L2StdCtrlName(quint32 std_ctrl_id);
diff --git a/net/kdenetwork4/files/patch-kopete__libkopete__avdevice__videodevicepool.cpp b/net/kdenetwork4/files/patch-kopete__libkopete__avdevice__videodevicepool.cpp
deleted file mode 100644
index d7caaea9bc0b..000000000000
--- a/net/kdenetwork4/files/patch-kopete__libkopete__avdevice__videodevicepool.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./kopete/libkopete/avdevice/videodevicepool.cpp.orig	2010-10-01 01:22:38.000000000 +0400
-+++ ./kopete/libkopete/avdevice/videodevicepool.cpp	2010-10-31 23:13:07.588295799 +0300
-@@ -557,7 +557,7 @@
- 
- 	if (m_videodevice.isEmpty()) {
- 		kDebug() << "called";
--#if defined(__linux__) && defined(ENABLE_AV)
-+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
- 		foreach (Solid::Device device,
- 				Solid::Device::listFromType(Solid::DeviceInterface::Video, QString())) {
- 			registerDevice( device );
diff --git a/net/kdenetwork4/files/patch-krfb__krfb__CMakeLists.txt b/net/kdenetwork4/files/patch-krfb__krfb__CMakeLists.txt
new file mode 100644
index 000000000000..44d9826f9489
--- /dev/null
+++ b/net/kdenetwork4/files/patch-krfb__krfb__CMakeLists.txt
@@ -0,0 +1,10 @@
+--- ./krfb/krfb/CMakeLists.txt.orig	2010-12-03 08:48:16.671158120 +1000
++++ ./krfb/krfb/CMakeLists.txt	2010-12-03 08:48:21.971155466 +1000
+@@ -29,7 +29,6 @@
+ 
+ install (TARGETS krfbprivate
+          ${INSTALL_TARGETS_DEFAULT_ARGS}
+-         LIBRARY NAMELINK_SKIP
+ )
+ 
+ install (FILES
diff --git a/net/kdenetwork4/pkg-plist b/net/kdenetwork4/pkg-plist
index 0241f95b54a2..96ee12a59291 100644
--- a/net/kdenetwork4/pkg-plist
+++ b/net/kdenetwork4/pkg-plist
@@ -4,7 +4,6 @@ bin/kopete_latexconvert.sh
 %%KPPP%%bin/kppplogview
 %%KPPP%%bin/kppp
 bin/krdc
-bin/krdc_rfb_approver
 bin/krfb
 bin/winpopup-install
 bin/winpopup-send
@@ -213,6 +212,7 @@ share/applications/kde4/kopete.desktop
 %%KPPP%%share/applications/kde4/kppplogview.desktop
 share/applications/kde4/krdc.desktop
 share/applications/kde4/krfb.desktop
+share/apps/dolphinpart/kpartplugins/kget_plug_in.desktop
 share/apps/dolphinpart/kpartplugins/kget_plug_in.rc
 share/apps/kconf_update/kopete-account-0.10.pl
 share/apps/kconf_update/kopete-account-kconf_update.sh
@@ -255,6 +255,7 @@ share/apps/kget/www/preferences-system.png
 share/apps/kget/www/title-border-bottom-downloads.png
 share/apps/kget/www/title-border-bottom-settings.png
 share/apps/kget/www/view-refresh.png
+share/apps/khtml/kpartplugins/kget_plug_in.desktop
 share/apps/khtml/kpartplugins/kget_plug_in.rc
 share/apps/kopete/CompactContactListLayouts.xml
 share/apps/kopete/DefaultContactListLayouts.xml
@@ -1205,8 +1206,8 @@ share/apps/kopeterichtexteditpart/kopeterichtexteditpartfull.rc
 share/apps/krdc/krdcui.rc
 share/apps/krdc/pics/pointcursor.png
 share/apps/krdc/pics/pointcursormask.png
-share/apps/krdc_rfb_approver/krdc_rfb_approver.notifyrc
 share/apps/krfb/krfb.notifyrc
+share/apps/kwebkitpart/kpartplugins/kget_plug_in.desktop
 share/apps/kwebkitpart/kpartplugins/kget_plug_in.rc
 share/apps/remoteview/zeroconf.desktop
 share/config.kcfg/historyconfig.kcfg
@@ -1222,6 +1223,7 @@ share/config.kcfg/kopetestatussettings.kcfg
 share/config.kcfg/krdc.kcfg
 share/config.kcfg/latexconfig.kcfg
 share/config.kcfg/nowlisteningconfig.kcfg
+share/config.kcfg/translatorconfig.kcfg
 share/config.kcfg/urlpicpreview.kcfg
 share/config.kcfg/webpresenceconfig.kcfg
 share/config/kopeterc
@@ -1230,8 +1232,6 @@ share/dbus-1/interfaces/org.kde.kdnssd.xml
 share/dbus-1/interfaces/org.kde.kopete.Client.xml
 share/dbus-1/interfaces/org.kde.kopete.Statistics.xml
 %%KPPP%%share/dbus-1/interfaces/org.kde.kppp.xml
-share/dbus-1/services/org.freedesktop.Telepathy.Client.krdc_rfb_approver.service
-share/dbus-1/services/org.freedesktop.Telepathy.Client.krdc_rfb_handler.service
 share/dbus-1/services/org.kde.kget.service
 share/doc/HTML/en/kget/common
 share/doc/HTML/en/kget/file.png
@@ -1488,14 +1488,13 @@ share/kde4/servicetypes/kopeteprotocol.desktop
 share/kde4/servicetypes/kopeteui.desktop
 share/kde4/servicetypes/krdc_plugin.desktop
 share/kde4/servicetypes/krfb-framebuffer.desktop
+share/sounds/KDE-Im-Phone-Ring.wav
 share/sounds/Kopete_Event.ogg
 share/sounds/Kopete_Received.ogg
 share/sounds/Kopete_Sent.ogg
 share/sounds/Kopete_User_is_Online.ogg
-share/telepathy/clients/krdc_rfb_approver.client
-share/telepathy/clients/krdc_rfb_handler.client
-@dirrm share/telepathy/clients
-@dirrm share/telepathy
+@dirrmtry share/telepathy/clients
+@dirrmtry share/telepathy
 @dirrm share/kde4/services/kconfiguredialog
 @dirrm share/doc/HTML/en/krfb
 @dirrm share/doc/HTML/en/krdc
@@ -1505,7 +1504,6 @@ share/telepathy/clients/krdc_rfb_handler.client
 @dirrmtry share/apps/kwebkitpart/kpartplugins
 @dirrmtry share/apps/kwebkitpart
 @dirrm share/apps/krfb
-@dirrm share/apps/krdc_rfb_approver
 @dirrm share/apps/krdc/pics
 @dirrm share/apps/krdc
 %%KPPP%%@dirrm share/apps/kppp/pics