[SCM] KTorrent Debian packaging. branch, experimental, updated. debian/4.0-beta2-1-7-gc6aa400

[Modestas Vainius]

The following commit has been merged in the experimental branch:
commit c6aa400cf13bdcf95436afad451718b42a603165
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sat May 8 20:02:35 2010 +0300

    Drop excess build dependency requirements from CMakeLists.txt.
    
    Add patch general/drop_excess_dependencies.diff - drop excess build dependency
    requirements from CMakeLists.txt, adjust required versions of Qt and KDE.
---
 debian/changelog                                   |    3 +
 .../patches/general/drop_excess_dependencies.diff  |   75 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 79 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5563341..52a82fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ ktorrent (4.0~rc1-0r1) UNRELEASED; urgency=low
     - remove libgmp3-dev, libqca2-dev, and libboost-serialization-dev from
       build depends;
     - drop libbtcore from ktorrent.install file;
+  * Add patch general/drop_excess_dependencies.diff - drop excess build
+    dependency requirements from CMakeLists.txt, adjust required versions of Qt
+    and KDE.
 
  -- Modestas Vainius <modax at debian.org>  Sat, 08 May 2010 18:23:59 +0300
 
diff --git a/debian/patches/general/drop_excess_dependencies.diff b/debian/patches/general/drop_excess_dependencies.diff
new file mode 100644
index 0000000..03a2df3
--- /dev/null
+++ b/debian/patches/general/drop_excess_dependencies.diff
@@ -0,0 +1,75 @@
+Description: clean up CMakeLists.txt
+ * Drop excess build dependencies that are not actually used.
+ * Require KDE 4.4.0
+ * Require Qt 4.6.0
+ * Drop obsolete hacks for Plasma from <= KDE 4.1
+Author: Modestas Vainius <modax at debian.org>
+Forwarded: yes
+Last-Update: 2010-05-08
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,21 +1,8 @@
+ project(KTORRENT)
+-find_package(KDE4 REQUIRED)
+-find_package(KDE4Internal REQUIRED)
+-find_package(GMP REQUIRED)
+-find_package(QCA2 REQUIRED)
+-find_package(Boost REQUIRED)
++find_package(Qt4 4.6.0 REQUIRED)
++find_package(KDE4 4.4.0 REQUIRED)
+ find_package(KTorrent REQUIRED)
+ 
+-# backward compatibility to <= KDE 4.1
+-MACRO_ENSURE_VERSION( "4.1.83" ${KDE_VERSION} KDE_VERSION_OK)
+-if(NOT KDE_VERSION_OK)
+-  macro_optional_find_package(Plasma)
+-  macro_log_feature(PLASMA_FOUND "Plasma" "Plasma libraries and header files" "http://plasma.kde.org/" FALSE "" "Plasma is needed for KTorrent Plasmoid")
+-else(NOT KDE_VERSION_OK)
+-  set(PLASMA_FOUND true)
+-  set(PLASMA_LIBS ${KDE4_PLASMA_LIBS})
+-endif(NOT KDE_VERSION_OK)
+-
+ # set some default settings
+ include(KDE4Defaults)
+ enable_testing()
+@@ -53,9 +40,7 @@ add_subdirectory(plugins)
+ add_subdirectory(ideal)
+ add_subdirectory(ktorrent)
+ add_subdirectory(ktupnptest)
+-if( PLASMA_FOUND )
+-    add_subdirectory(plasma)
+-endif(PLASMA_FOUND)
++add_subdirectory(plasma)
+ add_subdirectory(ktmagnetdownloader)
+ 
+ # --- show log ---
+--- a/plasma/applet/CMakeLists.txt
++++ b/plasma/applet/CMakeLists.txt
+@@ -18,7 +18,7 @@ else(NOT QT_VERSION_OK)
+ 		kde4_add_ui_files(ktapplet_SRCS appletconfig.ui)
+ 		
+ 		kde4_add_plugin(plasma_applet_ktorrent ${ktapplet_SRCS})
+-		target_link_libraries(plasma_applet_ktorrent  ${PLASMA_LIBS} ${KDE4_KIO_LIBS} ${TASKMANAGER_LIBRARY} ${LIBKTORRENT_LIBRARIES} ktcore)
++		target_link_libraries(plasma_applet_ktorrent  ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${TASKMANAGER_LIBRARY} ${LIBKTORRENT_LIBRARIES} ktcore)
+ 		
+ 		install(TARGETS plasma_applet_ktorrent DESTINATION ${PLUGIN_INSTALL_DIR})
+ 		install(FILES plasma-applet-ktorrent.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+@@ -26,4 +26,4 @@ else(NOT QT_VERSION_OK)
+ 
+ 	macro_log_feature(TASKMANAGER_FOUND "libtaskmanager" "libtaskmanager library and header files" "http://www.kde.org/" FALSE "" "libtaskmanager is needed for KTorrent Plasmoid")
+ 
+-endif(NOT QT_VERSION_OK)
+\ No newline at end of file
++endif(NOT QT_VERSION_OK)
+--- a/plasma/dataengine/CMakeLists.txt
++++ b/plasma/dataengine/CMakeLists.txt
+@@ -3,7 +3,7 @@ set(ktengine_SRCS
+ )
+ 
+ kde4_add_plugin(plasma_engine_ktorrent ${ktengine_SRCS})
+-target_link_libraries(plasma_engine_ktorrent ${KDE4_KDECORE_LIBS} ${PLASMA_LIBS} ${LIBKTORRENT_LIBRARIES})
++target_link_libraries(plasma_engine_ktorrent ${KDE4_KDECORE_LIBS} ${KDE4_PLASMA_LIBS} ${LIBKTORRENT_LIBRARIES})
+ 
+ install(TARGETS plasma_engine_ktorrent DESTINATION ${PLUGIN_INSTALL_DIR})
+ install(FILES plasma-dataengine-ktorrent.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
diff --git a/debian/patches/series b/debian/patches/series
index 18e8e91..a0841d9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 general/fix_target_link_libraries.diff
+general/drop_excess_dependencies.diff

-- 
KTorrent Debian packaging.