[SCM] KTorrent Debian packaging. branch, general/fix_target_link_libraries, updated. upstream/3.3.3+dfsg.1-9-g557da93
Modestas Vainius
modax at alioth.debian.org
Mon Jan 18 00:20:45 UTC 2010
The following commit has been merged in the general/fix_target_link_libraries branch:
commit 557da9365f2a091448d7cb0ee4642aa0751f8bb4
Merge: e8b5750af07b12d591e9c53202af0c58f78c3466 c4e3ad37980ffb46673f6c77fc8fbcaa61d850dd
Author: Modestas Vainius <modestas at vainius.eu>
Date: Mon Jan 18 01:42:59 2010 +0200
Merge commit 'refs/top-bases/general/fix_target_link_libraries' into general/fix_target_link_libraries
Conflicts:
libktcore/CMakeLists.txt
ChangeLog | 20 +
ktorrent/core.cpp | 69 +-
ktorrent/core.h | 3 +
ktorrent/ktorrent.desktop | 3 +
ktorrent/ktorrent.notifyrc | 16 +-
ktorrent/ktorrentplugin.desktop | 3 +-
libbtcore/CMakeLists.txt | 2 +-
libbtcore/btversion.h | 2 +-
libbtcore/config-btcore.h.cmake | 2 +
libbtcore/dht/rpcserver.cpp | 24 +-
libbtcore/diskio/multifilecache.cpp | 8 +-
libbtcore/diskio/preallocationjob.cpp | 12 +-
libbtcore/download/downloader.cpp | 77 +-
libbtcore/interfaces/torrentinterface.h | 7 +
libbtcore/torrent/jobqueue.cpp | 1 +
libbtcore/torrent/torrentcontrol.cpp | 1 +
libbtcore/tracker/udptracker.cpp | 1 +
libktcore/CMakeLists.txt | 2 +-
libktcore/gui/activitylistmodel.cpp | 8 +
libktcore/gui/activitylistmodel.h | 1 +
libktcore/ktversion.h | 6 +-
libktcore/torrent/queuemanager.cpp | 11 +-
libktcore/torrent/torrentfiletreemodel.cpp | 15 +-
plasma/applet/plasma-applet-ktorrent.desktop | 3 +
.../dataengine/plasma-dataengine-ktorrent.desktop | 3 +
plugins/bwscheduler/ktbwschedulerplugin.desktop | 5 +-
.../downloadorder/ktdownloadorderplugin.desktop | 3 +
plugins/infowidget/ktinfowidgetplugin.desktop | 3 +
plugins/infowidget/statustab.cpp | 9 +-
plugins/infowidget/trackermodel.cpp | 25 +-
plugins/infowidget/trackermodel.h | 2 +
plugins/infowidget/trackerview.cpp | 7 +-
plugins/ipfilter/ktipfilterplugin.desktop | 3 +
plugins/logviewer/ktlogviewerplugin.desktop | 4 +
plugins/mediaplayer/ktmediaplayerplugin.desktop | 3 +
plugins/scanfolder/ktscanfolderplugin.desktop | 3 +
plugins/scanfolder/scanfolder.cpp | 19 +-
plugins/scripting/ktscriptingplugin.desktop | 2 +
.../scripts/auto_remove/auto_remove.desktop | 3 +
.../scripts/auto_resume/auto_resume.desktop | 3 +
.../email_notifications.desktop | 2 +
.../scripts/tracker_groups/tracker_groups.desktop | 2 +
plugins/search/ktsearchplugin.desktop | 3 +
plugins/search/opensearch/ktorrents/opensearch.xml | 2 +-
plugins/shutdown/ktshutdownplugin.desktop | 3 +
plugins/stats/ktstatsplugin.desktop | 3 +
plugins/syndication/feedlist.cpp | 3 +-
plugins/syndication/filterlistmodel.cpp | 4 +-
plugins/syndication/ktsyndicationplugin.desktop | 2 +
plugins/upnp/ktupnpplugin.desktop | 2 +
plugins/webinterface/ktwebinterfaceplugin.desktop | 2 +
plugins/zeroconf/ktzeroconfplugin.desktop | 2 +
po/CMakeLists.txt | 1 +
po/ar/ktorrent.po | 180 +-
po/be/ktorrent.po | 56 +-
po/bg/ktorrent.po | 56 +-
po/ca/ktorrent.po | 78 +-
po/ca at valencia/CMakeLists.txt | 2 +
po/{ca => ca at valencia}/ktorrent.po | 405 ++--
po/cs/ktorrent.po | 182 +-
po/da/ktorrent.po | 56 +-
po/de/ktorrent.po | 56 +-
po/el/ktorrent.po | 56 +-
po/en_GB/ktorrent.po | 56 +-
po/es/ktorrent.po | 56 +-
po/et/ktorrent.po | 56 +-
po/eu/ktorrent.po | 56 +-
po/fr/ktorrent.po | 56 +-
po/ga/ktorrent.po | 56 +-
po/gl/ktorrent.po | 56 +-
po/hi/ktorrent.po | 56 +-
po/hne/ktorrent.po | 56 +-
po/hr/ktorrent.po | 56 +-
po/hu/ktorrent.po | 56 +-
po/is/ktorrent.po | 490 ++--
po/it/ktorrent.po | 56 +-
po/ja/ktorrent.po | 56 +-
po/km/ktorrent.po | 56 +-
po/lt/ktorrent.po | 56 +-
po/lv/ktorrent.po | 56 +-
po/mai/ktorrent.po | 149 +-
po/ms/ktorrent.po | 56 +-
po/nb/ktorrent.po | 3054 ++++++++++++--------
po/nds/ktorrent.po | 56 +-
po/nl/ktorrent.po | 56 +-
po/nn/ktorrent.po | 684 +++---
po/oc/ktorrent.po | 56 +-
po/pl/ktorrent.po | 56 +-
po/pt/ktorrent.po | 56 +-
po/pt_BR/ktorrent.po | 72 +-
po/ro/ktorrent.po | 56 +-
po/ru/ktorrent.po | 56 +-
po/sk/ktorrent.po | 56 +-
po/sl/ktorrent.po | 56 +-
po/sr/ktorrent.po | 742 +++---
po/sv/ktorrent.po | 56 +-
po/tr/ktorrent.po | 56 +-
po/uk/ktorrent.po | 105 +-
po/zh_CN/ktorrent.po | 56 +-
po/zh_TW/ktorrent.po | 56 +-
100 files changed, 4644 insertions(+), 3884 deletions(-)
diff --cc libktcore/CMakeLists.txt
index 2ccda72,1ee89ee..7c5f7c8
--- a/libktcore/CMakeLists.txt
+++ b/libktcore/CMakeLists.txt
@@@ -54,7 -54,7 +54,7 @@@ kde4_add_ui_files(libktorrent_SRC ${lib
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.1.0 SOVERSION 10 )
+ set_target_properties(ktcore PROPERTIES VERSION 10.2.0 SOVERSION 10 )
install(TARGETS ktcore ${INSTALL_TARGETS_DEFAULT_ARGS} )
--
KTorrent Debian packaging.
More information about the pkg-kde-commits
mailing list