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

[Modestas Vainius]

The following commit has been merged in the experimental branch:
commit f870a73b11e5a57e16e6f4f8e653997bd7021a17
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Mon Apr 5 16:06:29 2010 +0300

    Drop hunk 1 from the general/fix_target_link_libraries.diff patch - merged upstream.
---
 debian/changelog                                   |    2 +
 .../patches/general/fix_target_link_libraries.diff |   23 +-------------------
 debian/patches/series                              |    2 +-
 3 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b0f40ab..a28c54c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ ktorrent (4.0~beta2-0r1) UNRELEASED; urgency=low
   * New upstream release.
   * Enable parallel building: pass --parallel option to dh.
   * Merge changes from debian 3.3.{3,4} packages.
+  * Drop hunk 1 from the general/fix_target_link_libraries.diff patch - merged
+    upstream.
 
  -- Modestas Vainius <modax at debian.org>  Mon, 28 Dec 2009 15:00:04 +0200
 
diff --git a/debian/patches/general/fix_target_link_libraries.diff b/debian/patches/general/fix_target_link_libraries.diff
index d637d7b..fb4b3e7 100644
--- a/debian/patches/general/fix_target_link_libraries.diff
+++ b/debian/patches/general/fix_target_link_libraries.diff
@@ -5,26 +5,6 @@ Do not link with excess libraries.
 
 Signed-off-by: Modestas Vainius <modestas at vainius.eu>
 
----
- libktcore/CMakeLists.txt         |    2 +-
- plugins/scripting/CMakeLists.txt |    1 -
- 2 files changed, 1 insertions(+), 2 deletions(-)
-
-diff --git a/libktcore/CMakeLists.txt b/libktcore/CMakeLists.txt
-index 1ee89ee..7c5f7c8 100644
---- a/libktcore/CMakeLists.txt
-+++ b/libktcore/CMakeLists.txt
-@@ -54,7 +54,7 @@ kde4_add_ui_files(libktorrent_SRC ${libktorrent_UI})
- kde4_add_kcfg_files(libktorrent_SRC settings.kcfgc)
- kde4_add_library(ktcore SHARED ${libktorrent_SRC})
- 
--target_link_libraries(ktcore ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KUTILS_LIBS} btcore ${KDE4_SOLID_LIBS} ${GMP_LIBRARIES})
-+target_link_libraries(ktcore ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KPARTS_LIBS} ${KDE4_KUTILS_LIBS} btcore ${KDE4_SOLID_LIBS} ${GMP_LIBRARIES})
- set_target_properties(ktcore PROPERTIES VERSION 10.2.0 SOVERSION 10 )
- install(TARGETS ktcore  ${INSTALL_TARGETS_DEFAULT_ARGS} )
- 
-diff --git a/plugins/scripting/CMakeLists.txt b/plugins/scripting/CMakeLists.txt
-index dff2ba7..8663e5e 100644
 --- a/plugins/scripting/CMakeLists.txt
 +++ b/plugins/scripting/CMakeLists.txt
 @@ -20,7 +20,6 @@ target_link_libraries(
@@ -34,5 +14,4 @@ index dff2ba7..8663e5e 100644
 -    ${KDE4_KROSSUI_LIBS}
      ${KDE4_KPARTS_LIBS}
      ${QT_QTCORE_LIBRARY}
-     ${QT_QT3SUPPORT_LIBRARY}
--- 
+     )
diff --git a/debian/patches/series b/debian/patches/series
index 5e5ce98..18e8e91 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-general/fix_target_link_libraries.diff -p1
+general/fix_target_link_libraries.diff

-- 
KTorrent Debian packaging.