5 files changed, 83 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..4120377
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,53 @@
+add_subdirectory( parsers )
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/parsers
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/parsers
+)
+
+
+##### tdeio_apt (kpart)
+
+tde_add_kpart( tdeio_apt AUTOMOC
+
+  SOURCES
+        aptcache.cpp
+        apt.cpp
+        regexps.cpp
+        packagemanager.cpp
+        dpkg.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     parsers-static
+     
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+    FILES apt.protocol apt+http.protocol
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
+
+install(
+    FILES tdeio_apt.css tdedeb_logo.png
+    DESTINATION ${DATA_INSTALL_DIR}/tdeio_apt/
+)
+
+install(
+    FILES apt-search.desktop apt-file.desktop apt-files.desktop
+   DESTINATION ${SERVICES_INSTALL_DIR}/searchproviders
+)
diff --git a/src/Makefile.am b/src/Makefile.am
index c195f1f..c3ff703 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,7 +13,7 @@ protocoldir = $(kde_servicesdir)
 protocol_DATA = apt.protocol apt+http.protocol
 
 appdatadir = $(kde_datadir)/tdeio_apt/
-appdata_DATA = tdeio_apt.css kdedeb_logo.png
+appdata_DATA = tdeio_apt.css tdedeb_logo.png
 
 messages: rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/tdeio_apt.pot
diff --git a/src/apt.cpp b/src/apt.cpp
index 8c8f362..fdc9751 100644
--- a/src/apt.cpp
+++ b/src/apt.cpp
@@ -229,7 +229,7 @@ AptProtocol::AptProtocol( const TQCString &pool_socket, const TQCString &app_soc
   m_stylesheet = dirs->findResource( "data", "tdeio_apt/tdeio_apt.css" );
 
   m_logo = dirs->findResource( "data", "tdeio_apt/" 
-          + TDEGlobal::config() -> readEntryUntranslated("logo", "kdedeb_logo.png" ) );
+          + TDEGlobal::config() -> readEntryUntranslated("logo", "tdedeb_logo.png" ) );
 
   m_header_background = dirs->findResource( "data", "tdeio_apt/" 
           + TDEGlobal::config() -> readEntryUntranslated("background", "headerbg.png" ) );
diff --git a/src/parsers/CMakeLists.txt b/src/parsers/CMakeLists.txt
new file mode 100644
index 0000000..116447b
--- /dev/null
+++ b/src/parsers/CMakeLists.txt
@@ -0,0 +1,28 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### parsers (static)
+
+tde_add_library( parsers STATIC_PIC AUTOMOC
+
+  SOURCES
+        list.cpp
+        search.cpp
+        policy.cpp
+        show.cpp
+        parsers.cpp
+        filesearch.cpp
+  LINK
+     tdeio-shared
+)
diff --git a/src/kdedeb_logo.png b/src/tdedeb_logo.png
index ce01333..ce01333 100644
--- a/src/kdedeb_logo.png
+++ b/src/tdedeb_logo.png