8 files changed, 139 insertions, 328 deletions

diff --git a/polish/kadu/Makefile b/polish/kadu/Makefile
index 9030b0ddbaa7..b7a0f7ab7b1c 100644
--- a/polish/kadu/Makefile
+++ b/polish/kadu/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=		kadu
-PORTVERSION=		0.6.0.2
+PORTVERSION=		0.6.5.1
 PORTEPOCH=		1
 CATEGORIES=		polish net-im
 MASTER_SITES=		http://www.kadu.net/download/stable/:kadu \
 			http://www.kadu.net/download/additions/:additions \
 			http://www.kadu.net/download/modules_extra/spellchecker/:aspell \
 			http://www.kadu.net/download/modules_mirror/:modules \
-			http://kadu.net/~arvenil/tabs/download/${PORTVERSION}/:modtab
+			http://kadu.net/~arvenil/tabs/download/${PORTVERSION:C/(([0-9]+\.){2}[0-9]+)(.*)/\1/}/:modtab
 DISTFILES=		${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:kadu
 DIST_SUBDIR=		kadu
 EXTRACT_ONLY=		${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
@@ -21,42 +21,49 @@ EXTRACT_ONLY=		${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 MAINTAINER=		mwisnicki+freebsd@gmail.com
 COMMENT=		QT Gadu-Gadu client
 
+BUILD_DEPENDS=		bash:${PORTSDIR}/shells/bash
 LIB_DEPENDS=		gadu.3:${PORTSDIR}/polish/libgadu\
 			sndfile.1:${PORTSDIR}/audio/libsndfile
+# TODO enable devel/libexecinfo
 
-TABS_MOD_DISTFILE=	kadu-tabs-1.1.6.tar.bz2
-ASPELL_MOD_DISTFILE=	spellchecker-20071230.tar.bz2
+TABS_MOD_DISTFILE=	kadu-tabs-1.2.3.tar.bz2
+ASPELL_MOD_DISTFILE=	spellchecker-20080821.tar.bz2
 
 GG6_EMOTS_DISTFILE=	kompatybilne_z_GG6.tar.gz
 GG7_EMOTS_DISTFILE=	dodatkowe_emoty_GG7.tar.gz
 
 USE_BZIP2=		yes
-USE_GMAKE=		yes
+USE_CMAKE=		yes
+# remove option with typo when they fix it
+CMAKE_ARGS=		-DENABLE_AUTDOWNLOAD:BOOL=OFF \
+			-DENABLE_AUTODOWNLOAD:BOOL=OFF
+CMAKE_USE_PTHREAD=	yes
 USE_OPENSSL=		yes
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-existing-libgadu="${LOCALBASE}" \
-			--with-includes="${LOCALBASE}/include" \
-			--with-libs="${LOCALBASE}/lib" \
-			--program-transform-name='' \
-			--disable-autodownload
-CONFIGURE_ENV=		QTDIR="${QT_PREFIX}"
-
-USE_QT_VER=		3
-QT_NONSTANDARD=		yes
+
+USE_QT_VER=		4
+QT_COMPONENTS=		gui dbus linguist network qt3support webkit xml \
+			qmake_build moc_build rcc_build uic_build
 WANT_GNOME=		yes
 INSTALLS_ICONS=		yes
 
 WRKSRC=			${WRKDIR}/${PORTNAME}
 
-OPTIONS=	ASPELL	"Build spell checking module"	off \
+OPTIONS=	AO	"Build AO sound module"		off \
+		ASPELL	"Build spell checking module"	off \
 		ARTS	"Build aRts sound module"	off \
-		ESOUND	"Build Esound module"		off \
 		GG_EMOTS	"Install GG-compatible emoticons"	off \
-		PHEADERS	"Use precompiled headers to speed up build"	on \
 		TABS	"Build tabs module"		off
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_AO)
+LIB_DEPENDS+=	ao.3:${PORTSDIR}/audio/libao
+PLIST_SUB+=	AO_SOUND_MOD=""
+KADU_SHARED_MODULES+=	ao_sound
+.else
+PLIST_SUB+=	AO_SOUND_MOD="@comment "
+.endif
+
 .if defined(WITH_ASPELL)
 LIB_DEPENDS+=	aspell.16:${PORTSDIR}/textproc/aspell
 PLIST_SUB+=	ASPELL_MOD=""
@@ -74,14 +81,6 @@ KADU_SHARED_MODULES+=	arts_sound
 PLIST_SUB+=	ARTS_MOD="@comment "
 .endif
 
-.if defined(WITH_ESOUND)
-USE_GNOME+=	esound
-PLIST_SUB+=	ESOUND_MOD=""
-KADU_SHARED_MODULES+=	esd_sound
-.else
-PLIST_SUB+=	ESOUND_MOD="@comment "
-.endif
-
 .if defined(WITH_GG_EMOTS)
 PLIST_SUB+=	GG_EMOTS=""
 DISTFILES+=	${GG6_EMOTS_DISTFILE}:additions \
@@ -90,10 +89,6 @@ DISTFILES+=	${GG6_EMOTS_DISTFILE}:additions \
 PLIST_SUB+=	GG_EMOTS="@comment "
 .endif
 
-.if !defined(WITHOUT_PHEADERS)
-CONFIGURE_ARGS+=	--enable-pheaders
-.endif
-
 .if defined(WITH_TABS)
 PLIST_SUB+=	TABS_MOD=""
 DISTFILES+=	${TABS_MOD_DISTFILE}:modtab
@@ -105,23 +100,20 @@ PLIST_SUB+=	TABS_MOD="@comment "
 KADU_DISABLED_MODULES=	alsa_sound
 
 post-patch:
-
+	@${FIND} ${WRKSRC} -exec ${GREP} -q "#!/bin/bash" {} \; \
+		-exec ${REINPLACE_CMD} -e 's|#!/bin/bash|#!/usr/bin/env bash|g' {} \;
 .for module in ${KADU_DISABLED_MODULES}
 	@${REINPLACE_CMD} -e 's|module_${module}=.|module_${module}=n|g' ${WRKSRC}/.config
 .endfor
-
 .for module in ${KADU_SHARED_MODULES}
 	@${REINPLACE_CMD} -e 's|module_${module}=.|module_${module}=m|g' ${WRKSRC}/.config
 .endfor
-
 .for module in ${KADU_STATIC_MODULES}
 	@${REINPLACE_CMD} -e 's|module_${module}=.|module_${module}=y|g' ${WRKSRC}/.config
 .endfor
-
 .if defined(WITH_ASPELL)
 	@cd ${WRKSRC}/modules && ${TAR} -zxf ${_DISTDIR}/${ASPELL_MOD_DISTFILE}
 .endif
-
 .if defined(WITH_GG_EMOTS)
 	@${REINPLACE_CMD} -e 's|emoticons_gg6_compatible=n|emoticons_gg6_compatible=y|g' ${WRKSRC}/.config
 	@cd ${WRKSRC}/varia/themes/emoticons && \
@@ -129,13 +121,8 @@ post-patch:
 	${MV} kompatybilne_z_GG6 gg6_compatible && \
 	cd gg6_compatible && ${TAR} -zxf ${_DISTDIR}/${GG7_EMOTS_DISTFILE}
 .endif
-
 .if defined(WITH_TABS)
 	@cd ${WRKSRC}/modules && ${TAR} -zxf ${_DISTDIR}/${TABS_MOD_DISTFILE}
 .endif
 
-post-install:
-	${MKDIR} ${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKSRC}/kadu-core/kadu.desktop ${PREFIX}/share/applications
-
 .include <bsd.port.post.mk>
diff --git a/polish/kadu/distinfo b/polish/kadu/distinfo
index 99be168b0c6e..df3693ea5941 100644
--- a/polish/kadu/distinfo
+++ b/polish/kadu/distinfo
@@ -1,15 +1,15 @@
-MD5 (kadu/kadu-0.6.0.2.tar.bz2) = 4dc9b51de59f2089cf4526804bffc4fb
-SHA256 (kadu/kadu-0.6.0.2.tar.bz2) = 8e06b554761e39890e48ba723145d4e1e0919cc84fcd978f215a6e2a30f87bfa
-SIZE (kadu/kadu-0.6.0.2.tar.bz2) = 1568547
-MD5 (kadu/spellchecker-20071230.tar.bz2) = a46eab2f3d9c31cee13ccf3a441bceec
-SHA256 (kadu/spellchecker-20071230.tar.bz2) = ecde5f7ad2b60f53dbd7715df52459531cac8cce06670d016014da82589483d0
-SIZE (kadu/spellchecker-20071230.tar.bz2) = 9504
+MD5 (kadu/kadu-0.6.5.1.tar.bz2) = 7101626c23a58d15bd35d23fdc4faac2
+SHA256 (kadu/kadu-0.6.5.1.tar.bz2) = e2df2e1d7c1fa9a5d931a35efeb936088c42ef4b5d42fef8dddadc40f87397e2
+SIZE (kadu/kadu-0.6.5.1.tar.bz2) = 1341099
+MD5 (kadu/spellchecker-20080821.tar.bz2) = 61c3b8e64758b44dae1996f972f9312e
+SHA256 (kadu/spellchecker-20080821.tar.bz2) = bb9f0e2d8b673355aac0e037826ff314e1f4a9600958f4239dc6b80460911cb7
+SIZE (kadu/spellchecker-20080821.tar.bz2) = 6268
 MD5 (kadu/kompatybilne_z_GG6.tar.gz) = 16cbc9e657549b35ee8d8a32f4b6a47d
 SHA256 (kadu/kompatybilne_z_GG6.tar.gz) = f8a84acd8512fd8fc38e394aa564e6b6d7ec2e9fe9864bdf0c5b8f2edb23da6f
 SIZE (kadu/kompatybilne_z_GG6.tar.gz) = 254637
 MD5 (kadu/dodatkowe_emoty_GG7.tar.gz) = f9b0404cc1e1599ddf5eda4c15f1abce
 SHA256 (kadu/dodatkowe_emoty_GG7.tar.gz) = aebeb45b6ac9139620032436f7b565aa5729a0165d1c361a473c1195b8807450
 SIZE (kadu/dodatkowe_emoty_GG7.tar.gz) = 113257
-MD5 (kadu/kadu-tabs-1.1.6.tar.bz2) = fa780b90db6f7e41b16008291dde3dac
-SHA256 (kadu/kadu-tabs-1.1.6.tar.bz2) = 99ec1e2c44a72a8a91651fe9f0b1166a70a62460baedc08d6f700ab05b24f1c1
-SIZE (kadu/kadu-tabs-1.1.6.tar.bz2) = 16887
+MD5 (kadu/kadu-tabs-1.2.3.tar.bz2) = b0dc5d909d9b7094bafd24a18b9b3b80
+SHA256 (kadu/kadu-tabs-1.2.3.tar.bz2) = 4ad76613e9ac19cdf1e7ad5f179ab7374bf9505eff78f3ec0202d1f6f92babef
+SIZE (kadu/kadu-tabs-1.2.3.tar.bz2) = 17771
diff --git a/polish/kadu/files/patch-kadu-core_CMakeLists.txt b/polish/kadu/files/patch-kadu-core_CMakeLists.txt
new file mode 100644
index 000000000000..b226dde931ca
--- /dev/null
+++ b/polish/kadu/files/patch-kadu-core_CMakeLists.txt
@@ -0,0 +1,34 @@
+--- kadu-core/CMakeLists.txt.orig	2008-09-23 18:19:43.000000000 +0200
++++ kadu-core/CMakeLists.txt	2009-03-08 02:46:30.000000000 +0100
+@@ -162,6 +162,7 @@
+ 	target_link_libraries (kadu_c kadu_core)
+ else (WIN32)
+ 	add_executable (kadu main.cpp main_unix.cpp ${kadu_SRCS} ${MOC_FILES})
++	set_target_properties (kadu PROPERTIES ENABLE_EXPORTS ON)
+ 	target_link_libraries (kadu ${STATIC_MODULES} ${QT_LIBRARIES} ${LIBGADU_LIBRARIES})
+ endif (WIN32)
+ 
+@@ -175,14 +176,15 @@
+ 
+ 
+ # install icons
+-install (FILES hi16-app-kadu.png DESTINATION "share/pixmaps" RENAME kadu-16.png)
+-install (FILES hi22-app-kadu.png DESTINATION "share/pixmaps" RENAME kadu-22.png)
+-install (FILES hi24-app-kadu.png DESTINATION "share/pixmaps" RENAME kadu-24.png)
+-install (FILES hi32-app-kadu.png DESTINATION "share/pixmaps" RENAME kadu.png)
+-install (FILES hi48-app-kadu.png DESTINATION "share/pixmaps" RENAME kadu-48.png)
+-install (FILES hi64-app-kadu.png DESTINATION "share/pixmaps" RENAME kadu-64.png)
+-install (FILES hi128-app-kadu.png DESTINATION "share/pixmaps" RENAME kadu-128.png)
+-install (FILES hi256-app-kadu.png DESTINATION "share/pixmaps" RENAME kadu-256.png)
++install (FILES hi16-app-kadu.png DESTINATION "share/icons/hicolor/16x16/apps" RENAME kadu.png)
++install (FILES hi22-app-kadu.png DESTINATION "share/icons/hicolor/22x22/apps" RENAME kadu.png)
++install (FILES hi24-app-kadu.png DESTINATION "share/icons/hicolor/24x24/apps" RENAME kadu.png)
++install (FILES hi32-app-kadu.png DESTINATION "share/icons/hicolor/32x32/apps" RENAME kadu.png)
++install (FILES hi48-app-kadu.png DESTINATION "share/icons/hicolor/48x48/apps" RENAME kadu.png)
++install (FILES hi64-app-kadu.png DESTINATION "share/icons/hicolor/64x64/apps" RENAME kadu.png)
++install (FILES hi128-app-kadu.png DESTINATION "share/icons/hicolor/128x128/apps" RENAME kadu.png)
++# As of icon-theme-0.5 maximum supported pixmap size is 192, for anything larger one should use SVG.
++#install (FILES hi256-app-kadu.png DESTINATION "share/icons/hicolor/256x256/apps" RENAME kadu.png)
+ 
+ if (APPLE)
+ 	pkg_search_module (SNDFILE REQUIRED sndfile>=1.0)
diff --git a/polish/kadu/files/patch-kadu-core_main.cpp b/polish/kadu/files/patch-kadu-core_main.cpp
index 82dd84e32212..86dde998efe5 100644
--- a/polish/kadu/files/patch-kadu-core_main.cpp
+++ b/polish/kadu/files/patch-kadu-core_main.cpp
@@ -1,14 +1,11 @@
-Index: kadu-core/main.cpp
-===================================================================
---- kadu-core/main.cpp	2008-02-26 01:07:33.000000000 +0100
-+++ kadu-core/main.cpp	2008-03-12 10:55:42.000000000 +0100
-@@ -50,6 +50,9 @@
- #ifdef HAVE_EXECINFO
- #include <execinfo.h>
+--- kadu-core/main.cpp.orig	2009-01-04 14:18:33.000000000 +0100
++++ kadu-core/main.cpp	2009-03-07 18:12:29.000000000 +0100
+@@ -19,7 +19,7 @@
+ #else
+ #include <winsock2.h>
+ #endif
+-#ifdef Q_WS_MAC
++#ifdef Q_OS_BSD4
+ #include <sys/types.h>
+ #include <sys/stat.h>
  #endif
-+#ifdef __FreeBSD__
-+typedef union sigval sigval_t;
-+#endif /* __FreeBSD__ */
- #define OPEN_CHAT_SIGNAL (SIGRTMIN + 7)
- 
- static int sigsegvCount = 0;
diff --git a/polish/kadu/files/patch-kadu_Makefile.in b/polish/kadu/files/patch-kadu_Makefile.in
deleted file mode 100644
index ee5cb8d0d122..000000000000
--- a/polish/kadu/files/patch-kadu_Makefile.in
+++ /dev/null
@@ -1,44 +0,0 @@
---- kadu-core/Makefile.in.orig	Fri Nov 10 20:16:44 2006
-+++ kadu-core/Makefile.in	Fri Feb  9 19:59:29 2007
-@@ -880,7 +880,8 @@
- install-data-local:
- #	$(mkinstalldirs) "$(DESTDIR)/$(includedir)/kadu/"
- #	$(INSTALL_DATA) *.h "$(DESTDIR)/$(includedir)/kadu/"
--	@if test -w "$(DESTDIR)$(datadir)"; then \
-+	@if false; then \
-+	if test -w "$(DESTDIR)$(datadir)"; then \
- 		$(mkinstalldirs) "$(DESTDIR)$(datadir)/applnk/Internet/"; \
- 		echo "[Desktop Entry]" > "$(DESTDIR)$(datadir)/applnk/Internet/kadu.desktop"; \
- 		echo "Type=Application" >> "$(DESTDIR)$(datadir)/applnk/Internet/kadu.desktop"; \
-@@ -911,7 +912,31 @@
- 		echo "         *                                                                 *"; \
- 		echo "         *******************************************************************"; \
- 		echo $(DESTDIR)"";\
-+	fi; \
- 	fi;
-+	echo "[Desktop Entry]" > "$(srcdir)/kadu.desktop"
-+	echo "Encoding=UTF-8" >> "$(srcdir)/kadu.desktop"
-+	echo "Categories=Application;Network;" >> "$(srcdir)/kadu.desktop"
-+	echo "Type=Application" >> "$(srcdir)/kadu.desktop"
-+	echo "Exec=kadu" >> "$(srcdir)/kadu.desktop"
-+	echo "Icon=kadu.png" >> "$(srcdir)/kadu.desktop"
-+	echo "Terminal=false" >> "$(srcdir)/kadu.desktop"
-+	echo "Name=Kadu" >> "$(srcdir)/kadu.desktop"
-+	$(mkinstalldirs) $(DESTDIR)$(datadir)/icons/hicolor/128x128/apps
-+	$(INSTALL_DATA) hi128-app-kadu.png "$(DESTDIR)$(datadir)/icons/hicolor/128x128/apps/kadu.png"
-+	$(mkinstalldirs) $(DESTDIR)$(datadir)/icons/hicolor/64x64/apps
-+	$(INSTALL_DATA) hi64-app-kadu.png "$(DESTDIR)$(datadir)/icons/hicolor/64x64/apps/kadu.png"
-+	$(mkinstalldirs) $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps
-+	$(INSTALL_DATA) hi48-app-kadu.png "$(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/kadu.png"
-+	$(mkinstalldirs) $(DESTDIR)$(datadir)/icons/hicolor/32x32/apps
-+	$(INSTALL_DATA) hi32-app-kadu.png "$(DESTDIR)$(datadir)/icons/hicolor/32x32/apps/kadu.png"
-+	$(mkinstalldirs) $(DESTDIR)$(datadir)/icons/hicolor/24x24/apps
-+	$(INSTALL_DATA) hi24-app-kadu.png "$(DESTDIR)$(datadir)/icons/hicolor/24x24/apps/kadu.png"
-+	$(mkinstalldirs) $(DESTDIR)$(datadir)/icons/hicolor/22x22/apps
-+	$(INSTALL_DATA) hi22-app-kadu.png "$(DESTDIR)$(datadir)/icons/hicolor/22x22/apps/kadu.png"
-+	$(mkinstalldirs) $(DESTDIR)$(datadir)/icons/hicolor/16x16/apps
-+	$(INSTALL_DATA) hi16-app-kadu.png "$(DESTDIR)$(datadir)/icons/hicolor/16x16/apps/kadu.png"
-+
- 
- uninstall-local:
- 	rm -f "$(DESTDIR)$(includedir)/kadu"/*.h
diff --git a/polish/kadu/files/patch-modules-encryption_CMakeLists.txt b/polish/kadu/files/patch-modules-encryption_CMakeLists.txt
new file mode 100644
index 000000000000..ae4b35b7d179
--- /dev/null
+++ b/polish/kadu/files/patch-modules-encryption_CMakeLists.txt
@@ -0,0 +1,14 @@
+--- ./modules/encryption/CMakeLists.txt.orig	2008-10-25 13:29:59.000000000 +0400
++++ ./modules/encryption/CMakeLists.txt	2009-03-14 01:17:21.000000000 +0300
+@@ -38,9 +38,8 @@
+ 	cmake_policy(SET CMP0003 NEW)
+ endif (COMMAND cmake_policy)
+ 
+-pkg_search_module (OPENSSL REQUIRED openssl)
+-include_directories (${OPENSSL_INCLUDE_DIRS})
+-link_directories (${OPENSSL_INCLUDE_DIRS})
++find_package (OpenSSL)
++include_directories (${OPENSSL_INCLUDE_DIR})
+ 
+ add_library (encryption ${encryption} ${SOURCES} ${MOC_FILES})
+ target_link_libraries(encryption ${OPENSSL_LIBRARIES})
diff --git a/polish/kadu/files/patch-varia_themes_emoticons_get-all.sh b/polish/kadu/files/patch-varia_themes_emoticons_get-all.sh
new file mode 100644
index 000000000000..fac64924616f
--- /dev/null
+++ b/polish/kadu/files/patch-varia_themes_emoticons_get-all.sh
@@ -0,0 +1,11 @@
+--- varia/themes/emoticons/get-all.sh.orig	2008-12-01 00:15:08.000000000 +0100
++++ varia/themes/emoticons/get-all.sh	2009-03-12 23:56:25.000000000 +0100
+@@ -2,7 +2,7 @@
+ 
+ available_emots_themes=""
+ for dir in *; do
+-	if [ -f "$dir/emots.txt" ]; then
++	if [ "`find $dir -name emots.txt`" ]; then
+ 		available_emots_themes="$available_emots_themes $dir"
+ 	fi
+ done
diff --git a/polish/kadu/pkg-plist b/polish/kadu/pkg-plist
index 9728e08d603c..a47e3a0209a5 100644
--- a/polish/kadu/pkg-plist
+++ b/polish/kadu/pkg-plist
@@ -1,131 +1,20 @@
 bin/kadu
-bin/kadu-config
-bin/kadu-mozilla
-include/kadu/about.h
-include/kadu/action.h
-include/kadu/activate.h
-include/kadu/chat_manager.h
-include/kadu/chat_message.h
-include/kadu/chat_messages_view.h
-include/kadu/chat_widget.h
-include/kadu/chat_window.h
-include/kadu/color_button.h
-include/kadu/color_selector.h
-include/kadu/config_file.h
-include/kadu/configuration_aware_object.h
-include/kadu/configuration_window.h
-include/kadu/configuration_window_widgets.h
-include/kadu/custom_input.h
-include/kadu/debug.h
-include/kadu/dnshandler.h
-include/kadu/dockarea.h
-include/kadu/drag_simple.h
-include/kadu/emoticons.h
-include/kadu/expimp.h
-include/kadu/gadu-private.h
-include/kadu/gadu.h
-include/kadu/gadu_images_manager.h
-include/kadu/groups_manager.h
-include/kadu/hot_key.h
-include/kadu/html_document.h
-include/kadu/http_client.h
-include/kadu/icons_manager.h
-include/kadu/ignore.h
-include/kadu/kadu-config.h
-include/kadu/kadu.h
-include/kadu/kadu_parser.h
-include/kadu/kadu_splitter.h
-include/kadu/kadu_text_browser.h
-include/kadu/main_configuration_window.h
-include/kadu/message_box.h
-include/kadu/misc.h
-include/kadu/modules.h
-include/kadu/modules/account_management.h
-include/kadu/modules/advanced_userlist.h
-include/kadu/modules/autoaway.h
-include/kadu/modules/autoresponder.h
-include/kadu/modules/change_password.h
-include/kadu/modules/connection_error_notification.h
-include/kadu/modules/dcc.h
-include/kadu/modules/dcc_handler.h
-include/kadu/modules/dcc_socket.h
-include/kadu/modules/default_sms.h
-include/kadu/modules/docking.h
-include/kadu/modules/dsp_sound.h
-include/kadu/modules/encryption.h
-include/kadu/modules/exec_notify.h
-include/kadu/modules/file_transfer.h
-include/kadu/modules/file_transfer_manager.h
-include/kadu/modules/file_transfer_notifications.h
-include/kadu/modules/file_transfer_window.h
-include/kadu/modules/hint.h
-include/kadu/modules/hint_manager.h
-include/kadu/modules/hints_configuration_widget.h
-include/kadu/modules/history.h
-include/kadu/modules/history_dialog.h
-include/kadu/modules/history_module.h
-include/kadu/modules/history_search_dialog.h
-include/kadu/modules/keys_manager.h
-include/kadu/modules/migration.h
-include/kadu/modules/new_message_notification.h
-include/kadu/modules/notification.h
-include/kadu/modules/notify.h
-include/kadu/modules/player_external.h
-include/kadu/modules/protocol_notification.h
-include/kadu/modules/register.h
-include/kadu/modules/remind_password.h
-include/kadu/modules/simlite.h
-include/kadu/modules/sms.h
-include/kadu/modules/sound.h
-include/kadu/modules/sound_file.h
-include/kadu/modules/sound_slots.h
-include/kadu/modules/status_changed_notification.h
-include/kadu/modules/unregister.h
-include/kadu/modules/voice.h
-include/kadu/modules/window_notify.h
-include/kadu/modules/wizard.h
-include/kadu/modules/x11_docking.h
-include/kadu/path_list_edit.h
-include/kadu/pending_msgs.h
-include/kadu/personal_info.h
-include/kadu/preview.h
-include/kadu/protocol.h
-include/kadu/protocols_manager.h
-include/kadu/search.h
-include/kadu/select_file.h
-include/kadu/select_font.h
-include/kadu/status.h
-include/kadu/status_changer.h
-include/kadu/syntax_editor.h
-include/kadu/tabbar.h
-include/kadu/themes.h
-include/kadu/toolbar.h
-include/kadu/toolbutton.h
-include/kadu/updates.h
-include/kadu/userbox.h
-include/kadu/usergroup.h
-include/kadu/userinfo.h
-include/kadu/userlist-private.h
-include/kadu/userlist.h
-include/kadu/userlistelement.h
-lib/kadu/modules/account_management.so
-lib/kadu/modules/advanced_userlist.so
-lib/kadu/modules/autoaway.so
-lib/kadu/modules/autoresponder.so
-lib/kadu/modules/config_wizard.so
-lib/kadu/modules/dcc.so
-lib/kadu/modules/default_sms.so
-lib/kadu/modules/dsp_sound.so
-lib/kadu/modules/encryption.so
-lib/kadu/modules/exec_notify.so
-lib/kadu/modules/ext_sound.so
-lib/kadu/modules/hints.so
-lib/kadu/modules/history.so
-lib/kadu/modules/migration.so
-lib/kadu/modules/sms.so
-lib/kadu/modules/voice.so
-lib/kadu/modules/window_notify.so
-lib/kadu/modules/x11_docking.so
+lib/kadu/modules/libaccount_management.so
+lib/kadu/modules/libadvanced_userlist.so
+lib/kadu/modules/libautoaway.so
+lib/kadu/modules/libautoresponder.so
+lib/kadu/modules/libconfig_wizard.so
+lib/kadu/modules/libdcc.so
+lib/kadu/modules/libdefault_sms.so
+lib/kadu/modules/libdsp_sound.so
+lib/kadu/modules/libencryption.so
+lib/kadu/modules/libhints.so
+lib/kadu/modules/libhistory.so
+lib/kadu/modules/libnotify.so
+lib/kadu/modules/libsms.so
+lib/kadu/modules/libsound.so
+lib/kadu/modules/libvoice.so
+lib/kadu/modules/libwindow_notify.so
 %%DATADIR%%/AUTHORS
 %%DATADIR%%/COPYING
 %%DATADIR%%/ChangeLog
@@ -147,7 +36,6 @@ lib/kadu/modules/x11_docking.so
 %%DATADIR%%/modules/configuration/docking.ui
 %%DATADIR%%/modules/configuration/dsp_sound.ui
 %%DATADIR%%/modules/configuration/encryption.ui
-%%DATADIR%%/modules/configuration/ext_sound.ui
 %%DATADIR%%/modules/configuration/hints.ui
 %%DATADIR%%/modules/configuration/history.ui
 %%DATADIR%%/modules/configuration/notify.ui
@@ -156,31 +44,15 @@ lib/kadu/modules/x11_docking.so
 %%ASPELL_MOD%%%%DATADIR%%/modules/configuration/spellchecker.ui
 %%TABS_MOD%%%%DATADIR%%/modules/configuration/tabs.ui
 %%DATADIR%%/modules/configuration/voice.ui
-%%DATADIR%%/modules/data/config_wizard/joi/brak.jpg
-%%DATADIR%%/modules/data/config_wizard/ronk2/Blocking.png
-%%DATADIR%%/modules/data/config_wizard/ronk2/Busy (d.).png
-%%DATADIR%%/modules/data/config_wizard/ronk2/Busy.png
-%%DATADIR%%/modules/data/config_wizard/ronk2/Invisible (d.).png
-%%DATADIR%%/modules/data/config_wizard/ronk2/Invisible.png
-%%DATADIR%%/modules/data/config_wizard/ronk2/Offline (d.).png
-%%DATADIR%%/modules/data/config_wizard/ronk2/Offline.png
-%%DATADIR%%/modules/data/config_wizard/ronk2/Online (d.).png
-%%DATADIR%%/modules/data/config_wizard/ronk2/Online.png
-%%DATADIR%%/modules/data/config_wizard/ronk2/message.png
-%%DATADIR%%/modules/data/config_wizard/ronk2/mobile.png
-%%DATADIR%%/modules/data/config_wizard/ronk2/tlo.jpg
-%%DATADIR%%/modules/data/config_wizard/ronk2/tux.png
 %%DATADIR%%/modules/dcc.desc
 %%DATADIR%%/modules/default_sms.desc
 %%DATADIR%%/modules/docking.desc
 %%DATADIR%%/modules/dsp_sound.desc
 %%DATADIR%%/modules/encryption.desc
-%%DATADIR%%/modules/exec_notify.desc
-%%DATADIR%%/modules/ext_sound.desc
 %%DATADIR%%/modules/hints.desc
 %%DATADIR%%/modules/history.desc
-%%DATADIR%%/modules/migration.desc
 %%DATADIR%%/modules/notify.desc
+%%DATADIR%%/modules/qt4_docking.desc
 %%DATADIR%%/modules/sms.desc
 %%DATADIR%%/modules/sound.desc
 %%DATADIR%%/modules/translations/account_management_de.qm
@@ -223,14 +95,6 @@ lib/kadu/modules/x11_docking.so
 %%DATADIR%%/modules/translations/encryption_fr.qm
 %%DATADIR%%/modules/translations/encryption_it.qm
 %%DATADIR%%/modules/translations/encryption_pl.qm
-%%DATADIR%%/modules/translations/exec_notify_de.qm
-%%DATADIR%%/modules/translations/exec_notify_fr.qm
-%%DATADIR%%/modules/translations/exec_notify_it.qm
-%%DATADIR%%/modules/translations/exec_notify_pl.qm
-%%DATADIR%%/modules/translations/ext_sound_de.qm
-%%DATADIR%%/modules/translations/ext_sound_fr.qm
-%%DATADIR%%/modules/translations/ext_sound_it.qm
-%%DATADIR%%/modules/translations/ext_sound_pl.qm
 %%DATADIR%%/modules/translations/hints_de.qm
 %%DATADIR%%/modules/translations/hints_fr.qm
 %%DATADIR%%/modules/translations/hints_it.qm
@@ -239,10 +103,6 @@ lib/kadu/modules/x11_docking.so
 %%DATADIR%%/modules/translations/history_fr.qm
 %%DATADIR%%/modules/translations/history_it.qm
 %%DATADIR%%/modules/translations/history_pl.qm
-%%DATADIR%%/modules/translations/migration_de.qm
-%%DATADIR%%/modules/translations/migration_fr.qm
-%%DATADIR%%/modules/translations/migration_it.qm
-%%DATADIR%%/modules/translations/migration_pl.qm
 %%DATADIR%%/modules/translations/notify_de.qm
 %%DATADIR%%/modules/translations/notify_fr.qm
 %%DATADIR%%/modules/translations/notify_it.qm
@@ -263,13 +123,8 @@ lib/kadu/modules/x11_docking.so
 %%DATADIR%%/modules/translations/window_notify_fr.qm
 %%DATADIR%%/modules/translations/window_notify_it.qm
 %%DATADIR%%/modules/translations/window_notify_pl.qm
-%%DATADIR%%/modules/translations/x11_docking_de.qm
-%%DATADIR%%/modules/translations/x11_docking_fr.qm
-%%DATADIR%%/modules/translations/x11_docking_it.qm
-%%DATADIR%%/modules/translations/x11_docking_pl.qm
 %%DATADIR%%/modules/voice.desc
 %%DATADIR%%/modules/window_notify.desc
-%%DATADIR%%/modules/x11_docking.desc
 %%DATADIR%%/syntax/chat/cheester.syntax
 %%DATADIR%%/syntax/chat/filozof.syntax
 %%DATADIR%%/syntax/chat/fuku.syntax
@@ -277,28 +132,33 @@ lib/kadu/modules/x11_docking.so
 %%DATADIR%%/syntax/chat/irc.syntax
 %%DATADIR%%/syntax/chat/kadu.syntax
 %%DATADIR%%/syntax/infopanel/Arvenil.syntax
-%%DATADIR%%/syntax/infopanel/abaddon.syntax
 %%DATADIR%%/syntax/infopanel/ciuciu.syntax
 %%DATADIR%%/syntax/infopanel/default.syntax
 %%DATADIR%%/syntax/infopanel/dorr.syntax
-%%DATADIR%%/syntax/infopanel/maz.syntax
 %%DATADIR%%/syntax/infopanel/ronk.syntax
-%%DATADIR%%/themes/icons/default/HOWTO
-%%DATADIR%%/themes/icons/default/README
+%%DATADIR%%/themes/icons/default/HOWTO.txt
+%%DATADIR%%/themes/icons/default/README.txt
+%%DATADIR%%/themes/icons/default/kadu/big_busy.png
+%%DATADIR%%/themes/icons/default/kadu/big_busy_d.png
+%%DATADIR%%/themes/icons/default/kadu/big_invisible.png
+%%DATADIR%%/themes/icons/default/kadu/big_invisible_d.png
+%%DATADIR%%/themes/icons/default/kadu/big_message.png
+%%DATADIR%%/themes/icons/default/kadu/big_offline.png
+%%DATADIR%%/themes/icons/default/kadu/big_offline_d.png
+%%DATADIR%%/themes/icons/default/kadu/big_online.png
+%%DATADIR%%/themes/icons/default/kadu/big_online_d.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-userlist-remove.png
 %%DATADIR%%/themes/icons/default/external_modules/module_agent.png
 %%DATADIR%%/themes/icons/default/external_modules/module_mail.png
 %%DATADIR%%/themes/icons/default/external_modules/module_mediaplayer-button.png
-%%DATADIR%%/themes/icons/default/external_modules/module_mediaplayer-button_dis.png
 %%DATADIR%%/themes/icons/default/external_modules/module_mediaplayer.png
 %%DATADIR%%/themes/icons/default/external_modules/module_profiles-configure.png
 %%DATADIR%%/themes/icons/default/external_modules/module_profiles-user.png
 %%DATADIR%%/themes/icons/default/external_modules/module_profiles.png
 %%DATADIR%%/themes/icons/default/external_modules/module_screenshot-shot.png
-%%DATADIR%%/themes/icons/default/external_modules/module_screenshot-shot_dis.png
 %%DATADIR%%/themes/icons/default/external_modules/module_screenshot.png
 %%DATADIR%%/themes/icons/default/external_modules/module_tabs-close.png
 %%DATADIR%%/themes/icons/default/external_modules/module_tabs-detach.png
-%%DATADIR%%/themes/icons/default/external_modules/module_tabs-detach_dis.png
 %%DATADIR%%/themes/icons/default/external_modules/module_tabs-remove.png
 %%DATADIR%%/themes/icons/default/external_modules/module_weather-show.png
 %%DATADIR%%/themes/icons/default/external_modules/module_weather.png
@@ -312,10 +172,8 @@ lib/kadu/modules/x11_docking.so
 %%DATADIR%%/themes/icons/default/kadu/configure_big.png
 %%DATADIR%%/themes/icons/default/kadu/contact-new.png
 %%DATADIR%%/themes/icons/default/kadu/contact-new_big.png
-%%DATADIR%%/themes/icons/default/kadu/contact-new_dis.png
 %%DATADIR%%/themes/icons/default/kadu/dialog-apply.png
 %%DATADIR%%/themes/icons/default/kadu/dialog-cancel.png
-%%DATADIR%%/themes/icons/default/kadu/dialog-cancel_dis.png
 %%DATADIR%%/themes/icons/default/kadu/dialog-error.png
 %%DATADIR%%/themes/icons/default/kadu/dialog-error_big.png
 %%DATADIR%%/themes/icons/default/kadu/dialog-information.png
@@ -324,79 +182,54 @@ lib/kadu/modules/x11_docking.so
 %%DATADIR%%/themes/icons/default/kadu/dialog-password_big.png
 %%DATADIR%%/themes/icons/default/kadu/dialog-warning.png
 %%DATADIR%%/themes/icons/default/kadu/document-open.png
-%%DATADIR%%/themes/icons/default/kadu/document-open_dis.png
 %%DATADIR%%/themes/icons/default/kadu/document-save.png
-%%DATADIR%%/themes/icons/default/kadu/document-save_dis.png
 %%DATADIR%%/themes/icons/default/kadu/edit-clear.png
-%%DATADIR%%/themes/icons/default/kadu/edit-clear_dis.png
 %%DATADIR%%/themes/icons/default/kadu/edit-copy.png
 %%DATADIR%%/themes/icons/default/kadu/edit-delete.png
 %%DATADIR%%/themes/icons/default/kadu/edit-find.png
-%%DATADIR%%/themes/icons/default/kadu/edit-find_dis.png
 %%DATADIR%%/themes/icons/default/kadu/edit.png
 %%DATADIR%%/themes/icons/default/kadu/edit_big.png
-%%DATADIR%%/themes/icons/default/kadu/edit_dis.png
 %%DATADIR%%/themes/icons/default/kadu/face-smile.png
-%%DATADIR%%/themes/icons/default/kadu/face-smile_dis.png
 %%DATADIR%%/themes/icons/default/kadu/format-text-bold.png
-%%DATADIR%%/themes/icons/default/kadu/format-text-bold_dis.png
 %%DATADIR%%/themes/icons/default/kadu/format-text-italic.png
-%%DATADIR%%/themes/icons/default/kadu/format-text-italic_dis.png
 %%DATADIR%%/themes/icons/default/kadu/format-text-underline.png
-%%DATADIR%%/themes/icons/default/kadu/format-text-underline_dis.png
 %%DATADIR%%/themes/icons/default/kadu/go-bottom.png
 %%DATADIR%%/themes/icons/default/kadu/go-jump.png
 %%DATADIR%%/themes/icons/default/kadu/go-next.png
-%%DATADIR%%/themes/icons/default/kadu/go-next_dis.png
 %%DATADIR%%/themes/icons/default/kadu/go-previous.png
 %%DATADIR%%/themes/icons/default/kadu/help-about-kadu.png
 %%DATADIR%%/themes/icons/default/kadu/help-about-kadu_big.png
 %%DATADIR%%/themes/icons/default/kadu/help-contents.png
 %%DATADIR%%/themes/icons/default/kadu/history-clear.png
 %%DATADIR%%/themes/icons/default/kadu/history.png
-%%DATADIR%%/themes/icons/default/kadu/history_dis.png
 %%DATADIR%%/themes/icons/default/kadu/identity.png
 %%DATADIR%%/themes/icons/default/kadu/identity_big.png
 %%DATADIR%%/themes/icons/default/kadu/image-loading.png
 %%DATADIR%%/themes/icons/default/kadu/insert-image.png
-%%DATADIR%%/themes/icons/default/kadu/insert-image_dis.png
 %%DATADIR%%/themes/icons/default/kadu/kadu-blocking.png
-%%DATADIR%%/themes/icons/default/kadu/kadu-blocking_dis.png
 %%DATADIR%%/themes/icons/default/kadu/kadu-chat.png
 %%DATADIR%%/themes/icons/default/kadu/kadu-chat_big.png
-%%DATADIR%%/themes/icons/default/kadu/kadu-chat_dis.png
 %%DATADIR%%/themes/icons/default/kadu/kadu-colors.png
-%%DATADIR%%/themes/icons/default/kadu/kadu-colors_dis.png
 %%DATADIR%%/themes/icons/default/kadu/kadu-contacts.png
 %%DATADIR%%/themes/icons/default/kadu/kadu-copypersonal.png
 %%DATADIR%%/themes/icons/default/kadu/kadu-decrypted.png
-%%DATADIR%%/themes/icons/default/kadu/kadu-decrypted_dis.png
 %%DATADIR%%/themes/icons/default/kadu/kadu-descriptions_off.png
-%%DATADIR%%/themes/icons/default/kadu/kadu-descriptions_off_dis.png
 %%DATADIR%%/themes/icons/default/kadu/kadu-descriptions_on.png
-%%DATADIR%%/themes/icons/default/kadu/kadu-descriptions_on_dis.png
 %%DATADIR%%/themes/icons/default/kadu/kadu-email.png
 %%DATADIR%%/themes/icons/default/kadu/kadu-encrypted.png
 %%DATADIR%%/themes/icons/default/kadu/kadu-encrypted_big.png
-%%DATADIR%%/themes/icons/default/kadu/kadu-encrypted_dis.png
 %%DATADIR%%/themes/icons/default/kadu/kadu-enter.png
-%%DATADIR%%/themes/icons/default/kadu/kadu-enter_dis.png
 %%DATADIR%%/themes/icons/default/kadu/kadu-eraser.png
-%%DATADIR%%/themes/icons/default/kadu/kadu-eraser_dis.png
 %%DATADIR%%/themes/icons/default/kadu/kadu-exporttofile.png
-%%DATADIR%%/themes/icons/default/kadu/kadu-exporttofile_dis.png
 %%DATADIR%%/themes/icons/default/kadu/kadu-exportuserlist.png
-%%DATADIR%%/themes/icons/default/kadu/kadu-exportuserlist_dis.png
 %%DATADIR%%/themes/icons/default/kadu/kadu-impexp.png
 %%DATADIR%%/themes/icons/default/kadu/kadu-impexp_big.png
 %%DATADIR%%/themes/icons/default/kadu/kadu-importfromfile.png
 %%DATADIR%%/themes/icons/default/kadu/kadu-importuserlist.png
-%%DATADIR%%/themes/icons/default/kadu/kadu-importuserlist_dis.png
 %%DATADIR%%/themes/icons/default/kadu/kadu-kadu.png
 %%DATADIR%%/themes/icons/default/kadu/kadu-look.png
 %%DATADIR%%/themes/icons/default/kadu/kadu-manageignored.png
 %%DATADIR%%/themes/icons/default/kadu/kadu-manageignored_big.png
-%%DATADIR%%/themes/icons/default/kadu/kadu-manageignored_dis.png
 %%DATADIR%%/themes/icons/default/kadu/kadu-message.png
 %%DATADIR%%/themes/icons/default/kadu/kadu-message_anim.gif
 %%DATADIR%%/themes/icons/default/kadu/kadu-modmanager.png
@@ -404,9 +237,7 @@ lib/kadu/modules/x11_docking.so
 %%DATADIR%%/themes/icons/default/kadu/kadu-notifications.png
 %%DATADIR%%/themes/icons/default/kadu/kadu-notifyaboutuser.png
 %%DATADIR%%/themes/icons/default/kadu/kadu-onoff_onlineandd.png
-%%DATADIR%%/themes/icons/default/kadu/kadu-onoff_onlineandd_dis.png
 %%DATADIR%%/themes/icons/default/kadu/kadu-onoff_onlineandd_off.png
-%%DATADIR%%/themes/icons/default/kadu/kadu-onoff_onlineandd_off_dis.png
 %%DATADIR%%/themes/icons/default/kadu/kadu-registeraccount.png
 %%DATADIR%%/themes/icons/default/kadu/kadu-registeraccount_big.png
 %%DATADIR%%/themes/icons/default/kadu/kadu-remindpassword.png
@@ -414,13 +245,9 @@ lib/kadu/modules/x11_docking.so
 %%DATADIR%%/themes/icons/default/kadu/kadu-saveuserlist.png
 %%DATADIR%%/themes/icons/default/kadu/kadu-shortcuts.png
 %%DATADIR%%/themes/icons/default/kadu/kadu-showdescriptionusers.png
-%%DATADIR%%/themes/icons/default/kadu/kadu-showdescriptionusers_dis.png
 %%DATADIR%%/themes/icons/default/kadu/kadu-showdescriptionusers_off.png
-%%DATADIR%%/themes/icons/default/kadu/kadu-showdescriptionusers_off_dis.png
 %%DATADIR%%/themes/icons/default/kadu/kadu-showoffliners.png
-%%DATADIR%%/themes/icons/default/kadu/kadu-showoffliners_dis.png
 %%DATADIR%%/themes/icons/default/kadu/kadu-showoffliners_off.png
-%%DATADIR%%/themes/icons/default/kadu/kadu-showoffliners_off_dis.png
 %%DATADIR%%/themes/icons/default/kadu/kadu-status.png
 %%DATADIR%%/themes/icons/default/kadu/kadu-transfer_receive.png
 %%DATADIR%%/themes/icons/default/kadu/kadu-transfer_send.png
@@ -430,13 +257,10 @@ lib/kadu/modules/x11_docking.so
 %%DATADIR%%/themes/icons/default/kadu/kadu-wizard.png
 %%DATADIR%%/themes/icons/default/kadu/list-add.png
 %%DATADIR%%/themes/icons/default/kadu/list-remove.png
-%%DATADIR%%/themes/icons/default/kadu/list-remove_dis.png
 %%DATADIR%%/themes/icons/default/kadu/mail-attachment.png
-%%DATADIR%%/themes/icons/default/kadu/mail-attachment_dis.png
 %%DATADIR%%/themes/icons/default/kadu/phone.png
 %%DATADIR%%/themes/icons/default/kadu/phone_big.png
 %%DATADIR%%/themes/icons/default/kadu/view-refresh.png
-%%DATADIR%%/themes/icons/default/kadu/view-refresh_dis.png
 %%DATADIR%%/themes/icons/default/protocols/gg/user-away.png
 %%DATADIR%%/themes/icons/default/protocols/gg/user-away_d.png
 %%DATADIR%%/themes/icons/default/protocols/gg/user-away_d_m.png
@@ -1149,21 +973,15 @@ share/icons/hicolor/32x32/apps/kadu.png
 share/icons/hicolor/48x48/apps/kadu.png
 share/icons/hicolor/64x64/apps/kadu.png
 share/icons/hicolor/128x128/apps/kadu.png
-%%ARTS_MOD%%include/kadu/modules/player_arts.h
-%%ARTS_MOD%%lib/kadu/modules/arts_sound.so
+%%AO_SOUND_MOD%%lib/kadu/modules/libao_sound.so
+%%AO_SOUND_MOD%%share/kadu/modules/ao_sound.desc
+%%ARTS_MOD%%lib/kadu/modules/libarts_sound.so
 %%ARTS_MOD%%share/kadu/modules/bin/arts_sound/arts_connector
 %%ARTS_MOD%%share/kadu/modules/arts_sound.desc
-%%ASPELL_MOD%%include/kadu/modules/spellchecker.h
-%%ASPELL_MOD%%lib/kadu/modules/spellchecker.so
+%%ASPELL_MOD%%lib/kadu/modules/libspellchecker.so
 %%ASPELL_MOD%%share/kadu/modules/translations/spellchecker_pl.qm
-%%ASPELL_MOD%%share/kadu/modules/data/spellchecker/config.png
 %%ASPELL_MOD%%share/kadu/modules/spellchecker.desc
-%%ESOUND_MOD%%include/kadu/modules/esd_sound.h
-%%ESOUND_MOD%%lib/kadu/modules/esd_sound.so
-%%ESOUND_MOD%%share/kadu/modules/esd_sound.desc
-%%TABS_MOD%%include/kadu/modules/tabs.h
-%%TABS_MOD%%include/kadu/modules/tabwidget.h
-%%TABS_MOD%%lib/kadu/modules/tabs.so
+%%TABS_MOD%%lib/kadu/modules/libtabs.so
 %%TABS_MOD%%share/kadu/modules/translations/tabs_pl.qm
 %%TABS_MOD%%share/kadu/modules/tabs.desc
 @dirrmtry share/icons/hicolor/16x16/apps
@@ -1203,17 +1021,11 @@ share/icons/hicolor/128x128/apps/kadu.png
 @dirrm %%DATADIR%%/syntax/chat
 @dirrm %%DATADIR%%/syntax
 @dirrm %%DATADIR%%/modules/translations
-@dirrm %%DATADIR%%/modules/data/config_wizard/ronk2
-@dirrm %%DATADIR%%/modules/data/config_wizard/joi
 @dirrm %%DATADIR%%/modules/data/config_wizard
-%%ASPELL_MOD%%@dirrm %%DATADIR%%/modules/data/spellchecker
 @dirrm %%DATADIR%%/modules/data
 @dirrm %%DATADIR%%/modules/configuration
 @dirrm %%DATADIR%%/modules
 @dirrm %%DATADIR%%/configuration
 @dirrm %%DATADIR%%
-@dirrm lib/kadu/modules/bin
 @dirrm lib/kadu/modules
 @dirrm lib/kadu
-@dirrm include/kadu/modules
-@dirrm include/kadu