[SCM] KTorrent Debian packaging. branch, general/fix_target_link_libraries, updated. upstream/3.3.1+dfsg.1-8-ge8b5750
Modestas Vainius
modax-guest at alioth.debian.org
Tue Nov 24 12:42:25 UTC 2009
The following commit has been merged in the general/fix_target_link_libraries branch:
commit e8b5750af07b12d591e9c53202af0c58f78c3466
Merge: 8492014efb5be7722b73734f963e36df1cef55d9 d1013284bc53ce01b7a70c6a64cd244c4961068b
Author: Modestas Vainius <modestas at vainius.eu>
Date: Tue Nov 24 13:03:22 2009 +0200
Merge commit 'refs/top-bases/general/fix_target_link_libraries' into general/fix_target_link_libraries
Conflicts:
libktcore/CMakeLists.txt
ChangeLog | 14 +
ktorrent/groupview.cpp | 2 +-
ktorrent/ktorrent.desktop | 3 +
ktorrent/ktorrent.notifyrc | 6 +
ktorrent/ktorrentplugin.desktop | 1 +
ktorrent/recommendedsettingsdlg.cpp | 7 +-
ktorrent/torrentactivity.cpp | 3 +-
ktorrent/view.cpp | 2 +-
libbtcore/CMakeLists.txt | 2 +-
libbtcore/btversion.h | 2 +-
libbtcore/dht/announcetask.cpp | 37 +-
libbtcore/dht/dht.cpp | 26 +-
libbtcore/dht/nodelookup.cpp | 39 +-
libbtcore/dht/rpcserver.cpp | 8 +-
libbtcore/diskio/multifilecache.cpp | 1 +
libbtcore/torrent/torrentstats.cpp | 4 +-
libbtcore/util/decompressfilejob.cpp | 4 +-
libbtcore/util/log.cpp | 18 +-
libbtcore/util/log.h | 8 +-
libbtcore/util/sha1hash.cpp | 2 +-
libbtcore/util/waitjob.cpp | 5 +-
libktcore/CMakeLists.txt | 2 +-
libktcore/gui/activitylistwidget.cpp | 2 +-
libktcore/ktversion.h | 6 +-
libktupnp/CMakeLists.txt | 2 +-
libktupnp/httprequest.cpp | 3 +
libktupnp/upnprouter.cpp | 1 -
plasma/applet/plasma-applet-ktorrent.desktop | 2 +
.../dataengine/plasma-dataengine-ktorrent.desktop | 1 +
plugins/bwscheduler/bwschedulerplugin.cpp | 1 +
plugins/bwscheduler/ktbwschedulerplugin.desktop | 1 +
plugins/bwscheduler/schedulegraphicsitem.cpp | 1 +
plugins/bwscheduler/weekview.cpp | 2 +-
.../downloadorder/ktdownloadorderplugin.desktop | 1 +
plugins/infowidget/fileview.cpp | 8 +-
plugins/infowidget/infowidgetplugin.cpp | 7 +-
plugins/infowidget/iwfilelistmodel.cpp | 2 +-
plugins/infowidget/iwfiletreemodel.cpp | 3 +-
plugins/infowidget/iwprefpage.ui | 108 +-
plugins/infowidget/ktinfowidgetplugin.desktop | 1 +
plugins/infowidget/ktinfowidgetplugin.kcfg | 3 -
plugins/infowidget/peerview.cpp | 2 +-
plugins/ipfilter/downloadandconvertjob.cpp | 3 +-
plugins/ipfilter/ipfilterplugin.cpp | 1 +
plugins/ipfilter/ktipfilterplugin.desktop | 2 +
plugins/logviewer/ktlogviewerplugin.desktop | 4 +-
plugins/logviewer/logviewer.cpp | 2 +-
plugins/logviewer/logviewer.h | 2 +-
plugins/logviewer/logviewerplugin.cpp | 4 +-
plugins/mediaplayer/ktmediaplayerplugin.desktop | 2 +
plugins/mediaplayer/mediaplayeractivity.cpp | 1 +
plugins/mediaplayer/playlistwidget.cpp | 2 +-
plugins/scanfolder/ktscanfolderplugin.desktop | 3 +
plugins/scanfolder/scanfolderplugin.cpp | 1 +
plugins/scripting/ktscriptingplugin.desktop | 4 +
plugins/scripting/scriptmanager.cpp | 2 +-
.../scripts/auto_remove/auto_remove.desktop | 5 +
.../scripts/auto_resume/auto_resume.desktop | 1 +
.../email_notifications.desktop | 2 +
.../scripts/tracker_groups/tracker_groups.desktop | 2 +
plugins/search/ktsearchplugin.desktop | 4 +
plugins/search/searchplugin.cpp | 1 +
plugins/shutdown/ktshutdownplugin.desktop | 6 +
plugins/stats/ktstatsplugin.desktop | 4 +
plugins/syndication/ktsyndicationplugin.desktop | 3 +
plugins/syndication/syndicationtab.cpp | 4 +-
plugins/upnp/ktupnpplugin.desktop | 4 +
plugins/webinterface/httpserver.cpp | 4 +
plugins/webinterface/httpserver.h | 1 +
plugins/webinterface/ktwebinterfaceplugin.desktop | 4 +
plugins/webinterface/webinterfaceplugin.cpp | 1 +
plugins/zeroconf/ktzeroconfplugin.desktop | 4 +
po/ar/ktorrent.po | 739 +++++-----
po/be/ktorrent.po | 712 ++++-----
po/bg/ktorrent.po | 712 ++++-----
po/ca/ktorrent.po | 742 +++++-----
po/cs/ktorrent.po | 742 +++++-----
po/da/ktorrent.po | 742 +++++-----
po/de/ktorrent.po | 742 +++++-----
po/el/ktorrent.po | 805 +++++-----
po/en_GB/ktorrent.po | 742 +++++-----
po/es/ktorrent.po | 742 +++++-----
po/et/ktorrent.po | 742 +++++-----
po/eu/ktorrent.po | 712 ++++-----
po/fr/ktorrent.po | 744 +++++-----
po/ga/ktorrent.po | 715 ++++-----
po/gl/ktorrent.po | 742 +++++-----
po/hi/ktorrent.po | 712 ++++-----
po/hne/ktorrent.po | 712 ++++-----
po/hr/ktorrent.po | 712 ++++-----
po/hu/ktorrent.po | 742 +++++-----
po/is/ktorrent.po | 1425 +++++++----------
po/it/ktorrent.po | 742 +++++-----
po/ja/ktorrent.po | 726 +++++-----
po/km/ktorrent.po | 742 +++++-----
po/lt/ktorrent.po | 712 ++++-----
po/lv/ktorrent.po | 742 +++++-----
po/mai/ktorrent.po | 712 ++++-----
po/ms/ktorrent.po | 712 ++++-----
po/nb/ktorrent.po | 14 +-
po/nds/ktorrent.po | 742 +++++-----
po/nl/ktorrent.po | 742 +++++-----
po/nn/ktorrent.po | 104 +-
po/oc/ktorrent.po | 712 ++++-----
po/pl/ktorrent.po | 742 +++++-----
po/pt/ktorrent.po | 742 +++++-----
po/pt_BR/ktorrent.po | 742 +++++-----
po/ro/ktorrent.po | 742 +++++-----
po/ru/ktorrent.po | 742 +++++-----
po/sk/ktorrent.po | 720 ++++-----
po/sl/ktorrent.po | 1694 ++++++++------------
po/sr/ktorrent.po | 74 +-
po/sv/ktorrent.po | 744 +++++-----
po/tr/ktorrent.po | 746 +++++-----
po/uk/ktorrent.po | 859 +++++-----
po/zh_CN/ktorrent.po | 742 +++++-----
po/zh_TW/ktorrent.po | 742 +++++-----
117 files changed, 16164 insertions(+), 17083 deletions(-)
diff --cc libktcore/CMakeLists.txt
index a209b9c,3eb487e..2ccda72
--- 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.0.0 SOVERSION 10 )
+ set_target_properties(ktcore PROPERTIES VERSION 10.1.0 SOVERSION 10 )
install(TARGETS ktcore ${INSTALL_TARGETS_DEFAULT_ARGS} )
--
KTorrent Debian packaging.
More information about the pkg-kde-commits
mailing list