[SCM] KTorrent Debian packaging. branch, master, updated. master/3.2.3.1+dfsg.1-1-12-gd2d3d2c

Modestas Vainius modax-guest at alioth.debian.org
Sun Sep 27 15:52:59 UTC 2009


The following commit has been merged in the master branch:
commit d2d3d2cc20d67728ad2217cfad1c176a8e122510
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Sep 27 17:46:18 2009 +0300

    Add patch general/fix_target_link_libraries: do not link with excess libraries.
---
 debian/changelog                                   |    2 +
 .../patches/general/fix_target_link_libraries.diff |   39 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 42 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c6d57ec..6d7857b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ ktorrent (3.2.4+dfsg.1-1) unstable; urgency=low
   * Fix syntax problems in debian/watch.
   * Refresh patches.
   * Add ${misc:Depends} to Depends fields.
+  * Add patch general/fix_target_link_libraries: do not link with excess
+    libraries.
 
  -- Modestas Vainius <modestas at vainius.eu>  Sun, 27 Sep 2009 17:27:52 +0300
 
diff --git a/debian/patches/general/fix_target_link_libraries.diff b/debian/patches/general/fix_target_link_libraries.diff
new file mode 100644
index 0000000..dad4c93
--- /dev/null
+++ b/debian/patches/general/fix_target_link_libraries.diff
@@ -0,0 +1,39 @@
+From: Modestas Vainius <modestas at vainius.eu>
+Subject: [PATCH] general/fix_target_link_libraries
+
+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 ff536e5..97432a7 100644
+--- a/libktcore/CMakeLists.txt
++++ b/libktcore/CMakeLists.txt
+@@ -40,7 +40,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 9.3.0 SOVERSION 9 )
+ install(TARGETS ktcore  ${INSTALL_TARGETS_DEFAULT_ARGS} )
+ 
+diff --git a/plugins/scripting/CMakeLists.txt b/plugins/scripting/CMakeLists.txt
+index 680ac3c..e0476f5 100644
+--- a/plugins/scripting/CMakeLists.txt
++++ b/plugins/scripting/CMakeLists.txt
+@@ -19,7 +19,6 @@ target_link_libraries(
+     ${KDE4_KDECORE_LIBS}
+     ${KDE4_KDEUI_LIBS}
+     ${KDE4_KROSSCORE_LIBS}
+-    ${KDE4_KROSSUI_LIBS}
+     ${KDE4_KPARTS_LIBS}
+     ${QT_QTCORE_LIBRARY}
+     ${QT_QT3SUPPORT_LIBRARY}
+-- 
+tg: (69c25da..) general/fix_target_link_libraries (depends on: upstream)
diff --git a/debian/patches/series b/debian/patches/series
index 3888b86..08c3da4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 debian/qt_4.5.2-1_phonon_ftbfs_fix.diff -p1
+general/fix_target_link_libraries.diff -p1

-- 
KTorrent Debian packaging.



More information about the pkg-kde-commits mailing list