[SCM] KTorrent Debian packaging. branch, general/fix_target_link_libraries, updated. upstream/3.3-rc1+dfsg.1-4-gead66e0

Modestas Vainius modax-guest at alioth.debian.org
Sun Oct 25 14:58:10 UTC 2009


The following commit has been merged in the general/fix_target_link_libraries branch:
commit ead66e094a4cc803634e15e1bf79c60745ab5cf9
Merge: 236cfe6b5d38039f4d4bf28921e0f5b85ad0a1ff 742dff5819400c77d51dfb378952217bec60e086
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Oct 25 16:44:27 2009 +0200

    Merge commit 'refs/top-bases/general/fix_target_link_libraries' into general/fix_target_link_libraries
    
    Conflicts:
    	libktcore/CMakeLists.txt

 CMakeLists.txt                                     |    2 +-
 ChangeLog                                          |   76 +
 Messages.sh                                        |    2 +-
 dbus_xml/org.freedesktop.ScreenSaver.xml           |   41 +
 ktorrent/CMakeLists.txt                            |    8 +
 ktorrent/advancedpref.cpp                          |   34 -
 ktorrent/advancedpref.h                            |   15 +-
 ktorrent/advancedpref.ui                           |   84 +-
 ktorrent/btpref.cpp                                |   62 +
 ktorrent/btpref.h                                  |   42 +
 ktorrent/btpref.ui                                 |  237 +-
 ktorrent/core.cpp                                  |  184 +-
 ktorrent/core.h                                    |   48 +-
 ktorrent/fileselectdlg.cpp                         |  235 +-
 ktorrent/fileselectdlg.h                           |   24 +-
 ktorrent/fileselectdlg.ui                          |  404 +-
 ktorrent/generalpref.cpp                           |   78 +
 ktorrent/generalpref.h                             |   41 +
 ktorrent/generalpref.ui                            |  146 +-
 ktorrent/groupview.cpp                             |    6 +-
 ktorrent/groupview.h                               |    6 +-
 ktorrent/gui.cpp                                   |  308 +-
 ktorrent/gui.h                                     |   93 +-
 ktorrent/importdialog.cpp                          |   22 +-
 ktorrent/ipfilterlist.cpp                          |    4 +-
 ktorrent/ktorrent.desktop                          |    9 +-
 ktorrent/ktorrent.notifyrc                         |   35 +-
 ktorrent/ktorrentplugin.desktop                    |    6 +-
 ktorrent/ktorrentui.rc                             |   11 +-
 ktorrent/main.cpp                                  |    1 +
 ktorrent/missingfilesdlg.cpp                       |   14 +-
 ktorrent/missingfilesdlg.h                         |    3 +-
 ktorrent/missingfilesdlg.ui                        |   86 +-
 ktorrent/networkpref.ui                            |    2 +-
 ktorrent/prefdialog.cpp                            |   85 +-
 ktorrent/qmpref.cpp                                |   52 +
 ktorrent/qmpref.h                                  |   47 +
 ktorrent/qmpref.ui                                 |   74 +-
 ktorrent/queuemanagermodel.cpp                     |   52 +-
 ktorrent/queuemanagermodel.h                       |    7 +-
 ktorrent/queuemanagerwidget.cpp                    |   14 -
 ktorrent/queuemanagerwidget.h                      |    1 -
 ktorrent/queuemanagerwidget.ui                     |    7 -
 ktorrent/scandlg.cpp                               |   32 +-
 ktorrent/scandlg.h                                 |    2 -
 ktorrent/scanextender.cpp                          |  101 +
 ktorrent/scanextender.h                            |   63 +
 ktorrent/scanextender.ui                           |  250 +
 ktorrent/scanlistener.cpp                          |   90 +
 ktorrent/scanlistener.h                            |   86 +
 ktorrent/speedlimitsdlg.cpp                        |   28 +-
 ktorrent/speedlimitsdlg.h                          |    4 +-
 ktorrent/speedlimitsdlg.ui                         |  147 +-
 ktorrent/statusbar.cpp                             |    5 +-
 ktorrent/torrentactivity.cpp                       |  271 +
 ktorrent/torrentactivity.h                         |  128 +
 ktorrent/torrentcreatordlg.cpp                     |   35 +-
 ktorrent/torrentcreatordlg.h                       |    6 +
 ktorrent/torrentmigratordlg.cpp                    |    4 +-
 ktorrent/trayicon.cpp                              |   55 +-
 ktorrent/trayicon.h                                |   15 +-
 ktorrent/view.cpp                                  |   94 +-
 ktorrent/view.h                                    |   25 +-
 ktorrent/viewdelegate.cpp                          |  285 +
 ktorrent/viewdelegate.h                            |   92 +
 ktorrent/viewmanager.cpp                           |  247 +-
 ktorrent/viewmanager.h                             |   81 +-
 ktorrent/viewmodel.cpp                             |   65 +-
 ktorrent/viewmodel.h                               |   15 +-
 ktorrent/viewselectionmodel.h                      |    1 -
 ktupnptest/upnptestwidget.ui                       |    2 +-
 libbtcore/CMakeLists.txt                           |   24 +-
 libbtcore/bcodec/bdecoder.cpp                      |    2 +-
 libbtcore/bcodec/bnode.cpp                         |  116 +-
 libbtcore/bcodec/bnode.h                           |   29 +-
 libbtcore/btversion.h                              |    6 +-
 libbtcore/datachecker/datacheckerjob.cpp           |   95 +
 libbtcore/datachecker/datacheckerjob.h             |   53 +
 libbtcore/datachecker/multidatachecker.cpp         |   12 +-
 libbtcore/datachecker/singledatachecker.cpp        |   13 +-
 libbtcore/dht/announcetask.cpp                     |   16 +-
 libbtcore/dht/database.cpp                         |    2 +-
 libbtcore/dht/dht.cpp                              |    7 +-
 libbtcore/dht/dhttrackerbackend.cpp                |    3 +
 libbtcore/dht/kbucket.cpp                          |    3 +-
 libbtcore/dht/kbucket.h                            |    2 +-
 libbtcore/dht/key.cpp                              |    2 +-
 libbtcore/dht/nodelookup.cpp                       |    4 +-
 libbtcore/dht/pack.cpp                             |    8 +-
 libbtcore/dht/rpcmsg.cpp                           |   31 +-
 libbtcore/dht/rpcserver.cpp                        |  202 +-
 libbtcore/dht/rpcserver.h                          |   37 +-
 libbtcore/diskio/cache.cpp                         |    5 +-
 libbtcore/diskio/cache.h                           |   27 +-
 libbtcore/diskio/cachefile.cpp                     |   12 +-
 libbtcore/diskio/chunkmanager.cpp                  |   12 +-
 libbtcore/diskio/chunkmanager.h                    |   12 +-
 libbtcore/diskio/deletedatafilesjob.cpp            |    9 +-
 libbtcore/diskio/deletedatafilesjob.h              |    7 +-
 libbtcore/diskio/movedatafilesjob.cpp              |   44 +-
 libbtcore/diskio/movedatafilesjob.h                |   22 +-
 libbtcore/diskio/multifilecache.cpp                |   85 +-
 libbtcore/diskio/multifilecache.h                  |   10 +-
 libbtcore/diskio/preallocationjob.cpp              |   67 +
 libbtcore/diskio/preallocationjob.h                |   52 +
 libbtcore/diskio/preallocationthread.cpp           |    2 +-
 libbtcore/diskio/singlefilecache.cpp               |   14 +-
 libbtcore/diskio/singlefilecache.h                 |    6 +-
 libbtcore/download/chunkdownload.cpp               |   16 +-
 libbtcore/download/chunkdownload.h                 |   22 +-
 libbtcore/download/downloader.cpp                  |   78 +-
 libbtcore/download/downloader.h                    |    9 +
 libbtcore/download/httpconnection.cpp              |    4 +-
 libbtcore/download/httpdownloader.cpp              |   68 -
 libbtcore/download/httpdownloader.h                |   59 -
 libbtcore/download/webseed.cpp                     |   20 +-
 libbtcore/download/webseed.h                       |    2 +
 libbtcore/interfaces/peerinterface.h               |    8 +-
 libbtcore/interfaces/queuemanagerinterface.cpp     |    5 +
 libbtcore/interfaces/queuemanagerinterface.h       |   45 +-
 libbtcore/interfaces/torrentinterface.cpp          |   11 +-
 libbtcore/interfaces/torrentinterface.h            |  185 +-
 libbtcore/interfaces/trackerinterface.cpp          |   67 +
 libbtcore/interfaces/trackerinterface.h            |  101 +
 libbtcore/interfaces/trackerslist.h                |  126 +-
 libbtcore/interfaces/webseedinterface.cpp          |    6 +-
 libbtcore/interfaces/webseedinterface.h            |    7 +
 libbtcore/migrate/cachemigrate.cpp                 |    2 +-
 libbtcore/net/downloadthread.cpp                   |    6 +-
 libbtcore/net/downloadthread.h                     |    3 +-
 libbtcore/net/reverseresolver.cpp                  |  140 +
 libbtcore/net/reverseresolver.h                    |  103 +
 libbtcore/peer/authenticationmonitor.cpp           |    2 +-
 libbtcore/peer/packetreader.cpp                    |    2 +-
 libbtcore/peer/peer.cpp                            |   60 +-
 libbtcore/peer/peer.h                              |   30 +-
 libbtcore/peer/peermanager.cpp                     |    8 +
 libbtcore/peer/peermanager.h                       |    3 +
 libbtcore/torrent/advancedchokealgorithm.cpp       |   10 +-
 libbtcore/torrent/globals.cpp                      |    5 +-
 libbtcore/torrent/job.cpp                          |   54 +
 libbtcore/torrent/job.h                            |   59 +
 libbtcore/torrent/jobqueue.cpp                     |  111 +
 libbtcore/torrent/jobqueue.h                       |   68 +
 libbtcore/torrent/peersourcemanager.cpp            |  510 +--
 libbtcore/torrent/peersourcemanager.h              |  133 +-
 libbtcore/torrent/timeestimator.cpp                |    2 +-
 libbtcore/torrent/torrent.cpp                      |  215 +-
 libbtcore/torrent/torrent.h                        |   25 +-
 libbtcore/torrent/torrentcontrol.cpp               |  558 +-
 libbtcore/torrent/torrentcontrol.h                 |   82 +-
 libbtcore/torrent/torrentcreator.cpp               |    4 +-
 libbtcore/torrent/torrentstats.cpp                 |   95 +
 libbtcore/torrent/torrentstats.h                   |  147 +
 libbtcore/tracker/httpannouncejob.cpp              |   46 +-
 libbtcore/tracker/httpannouncejob.h                |    5 +-
 libbtcore/tracker/httptracker.cpp                  |   77 +-
 libbtcore/tracker/httptracker.h                    |    7 +-
 libbtcore/tracker/tracker.cpp                      |   73 +-
 libbtcore/tracker/tracker.h                        |   52 +-
 libbtcore/tracker/trackermanager.cpp               |  540 ++
 libbtcore/tracker/trackermanager.h                 |  131 +
 libbtcore/tracker/udptracker.cpp                   |   43 +-
 libbtcore/tracker/udptracker.h                     |    6 +-
 libbtcore/tracker/udptrackersocket.cpp             |    2 +-
 libbtcore/util/compressfilejob.cpp                 |    4 +-
 libbtcore/util/compressfilejob.h                   |    5 +-
 libbtcore/util/decompressfilejob.cpp               |  134 +
 libbtcore/util/decompressfilejob.h                 |   79 +
 libbtcore/util/extractfilejob.cpp                  |  145 +
 libbtcore/util/extractfilejob.h                    |   57 +
 libbtcore/util/log.cpp                             |    5 +-
 libbtcore/util/sha1hashgen.cpp                     |    4 +-
 libktcore/CMakeLists.txt                           |   20 +-
 libktcore/dbus/dbus.cpp                            |   25 +-
 libktcore/dbus/dbus.h                              |    9 +-
 libktcore/dbus/dbussettings.cpp                    |  771 ++
 libktcore/dbus/dbussettings.h                      |  194 +
 libktcore/dbus/dbustorrent.cpp                     |   38 +-
 libktcore/dbus/dbustorrent.h                       |    6 +-
 libktcore/groups/groupmanager.cpp                  |   25 -
 libktcore/groups/torrentgroup.cpp                  |   50 +-
 libktcore/gui/activitybar.cpp                      |   72 +
 libktcore/gui/activitybar.h                        |   56 +
 libktcore/gui/activitylistdelegate.cpp             |   61 +
 libktcore/gui/activitylistdelegate.h               |   47 +
 libktcore/gui/activitylistmodel.cpp                |  117 +
 libktcore/gui/activitylistmodel.h                  |   54 +
 libktcore/gui/activitylistwidget.cpp               |  320 +
 libktcore/gui/activitylistwidget.h                 |  104 +
 libktcore/gui/centralwidget.cpp                    |   90 +
 libktcore/gui/centralwidget.h                      |   61 +
 libktcore/gui/tabbarwidget.cpp                     |  244 +
 libktcore/gui/tabbarwidget.h                       |   87 +
 libktcore/interfaces/activity.cpp                  |   54 +
 libktcore/interfaces/activity.h                    |   68 +
 libktcore/interfaces/coreinterface.h               |   25 +-
 libktcore/interfaces/functions.cpp                 |    5 +-
 libktcore/interfaces/guiinterface.cpp              |   33 -
 libktcore/interfaces/guiinterface.h                |  169 +-
 libktcore/interfaces/torrentactivityinterface.cpp  |   49 +
 libktcore/interfaces/torrentactivityinterface.h    |   95 +
 libktcore/ktorrent.kcfg                            |   19 +-
 libktcore/ktversion.h                              |   10 +-
 libktcore/plugin/pluginactivity.cpp                |   69 +
 libktcore/plugin/pluginactivity.h                  |   56 +
 libktcore/plugin/pluginmanager.cpp                 |  207 +
 libktcore/plugin/pluginmanager.h                   |   89 +
 libktcore/pluginmanager.cpp                        |  208 -
 libktcore/pluginmanager.h                          |   89 -
 libktcore/pluginmanagerprefpage.cpp                |   69 -
 libktcore/pluginmanagerprefpage.h                  |   56 -
 libktcore/torrent/chunkbar.h                       |    1 -
 libktcore/torrent/queuemanager.cpp                 |  314 +-
 libktcore/torrent/queuemanager.h                   |   44 +-
 libktcore/util/hintlineedit.cpp                    |  133 +
 libktcore/util/hintlineedit.h                      |   92 +
 libktcore/util/mmapfile.cpp                        |    2 +-
 libktcore/util/stringcompletionmodel.cpp           |   87 +
 libktcore/util/stringcompletionmodel.h             |   60 +
 libktcore/util/treefiltermodel.cpp                 |   58 +
 libktcore/util/treefiltermodel.h                   |   44 +
 libktupnp/CMakeLists.txt                           |    2 -
 libktupnp/httprequest.cpp                          |    2 +-
 libktupnp/upnpmcastsocket.cpp                      |    4 +-
 libktupnp/upnprouter.cpp                           |    8 +-
 plasma/applet/CMakeLists.txt                       |    2 +-
 plasma/applet/applet.cpp                           |  324 +-
 plasma/applet/applet.h                             |   24 +-
 plasma/applet/appletconfig.ui                      |    2 +-
 plasma/applet/chunkbar.cpp                         |   42 +-
 plasma/applet/chunkbar.h                           |    4 +
 plasma/applet/fadingitem.cpp                       |  128 +
 plasma/applet/fadingitem.h                         |   53 +
 plasma/applet/fadingnavigationwidget.cpp           |   89 +
 plasma/applet/fadingnavigationwidget.h             |   58 +
 plasma/applet/plasma-applet-ktorrent.desktop       |  104 +-
 .../dataengine/plasma-dataengine-ktorrent.desktop  |    2 -
 plugins/CMakeLists.txt                             |    7 +-
 plugins/bitfinder/CMakeLists.txt                   |   32 -
 plugins/bitfinder/bfitem.cpp                       |  110 -
 plugins/bitfinder/bfitem.h                         |   65 -
 plugins/bitfinder/bitfinderplugin.cpp              |  146 -
 plugins/bitfinder/bitfinderplugin.h                |   77 -
 plugins/bitfinder/filter/capture.cpp               |  339 -
 plugins/bitfinder/filter/capture.h                 |   72 -
 plugins/bitfinder/filter/capturechecker.cpp        |  439 --
 plugins/bitfinder/filter/capturechecker.h          |  110 -
 plugins/bitfinder/filter/capturecheckerdetails.cpp |  462 --
 plugins/bitfinder/filter/capturecheckerdetails.h   |  116 -
 plugins/bitfinder/filter/capturecheckerdetails.ui  |  130 -
 plugins/bitfinder/filter/filter.cpp                |  682 --
 plugins/bitfinder/filter/filter.h                  |  128 -
 plugins/bitfinder/filter/filterconstants.h         |   60 -
 plugins/bitfinder/filter/filterdetails.cpp         |  413 -
 plugins/bitfinder/filter/filterdetails.h           |  101 -
 plugins/bitfinder/filter/filterdetails.ui          |  356 -
 plugins/bitfinder/filter/filterlistmodel.cpp       |  465 --
 plugins/bitfinder/filter/filterlistmodel.h         |   91 -
 plugins/bitfinder/filter/filtersview.cpp           |  164 -
 plugins/bitfinder/filter/filtersview.h             |   74 -
 plugins/bitfinder/filter/matches.cpp               |  330 -
 plugins/bitfinder/filter/matches.h                 |   81 -
 plugins/bitfinder/ktbitfinderplugin.desktop        |   86 -
 plugins/bitfinder/source/sourcesview.cpp           |   46 -
 plugins/bitfinder/source/sourcesview.h             |   62 -
 plugins/bwscheduler/CMakeLists.txt                 |    3 +
 plugins/bwscheduler/additemdlg.cpp                 |   29 +-
 plugins/bwscheduler/additemdlg.h                   |    2 +
 plugins/bwscheduler/additemdlg.ui                  |  108 +-
 plugins/bwscheduler/bwprefpage.cpp                 |    4 +
 plugins/bwscheduler/bwprefpage.ui                  |  139 +-
 plugins/bwscheduler/bwschedulerplugin.cpp          |  178 +-
 plugins/bwscheduler/bwschedulerplugin.h            |   15 +-
 plugins/bwscheduler/edititemdlg.cpp                |   28 +-
 plugins/bwscheduler/edititemdlg.h                  |    2 +
 plugins/bwscheduler/edititemdlg.ui                 |  288 +-
 plugins/bwscheduler/ktbwschedulerplugin.desktop    |  118 +-
 plugins/bwscheduler/ktbwschedulerplugin.kcfg       |   11 +
 plugins/bwscheduler/schedule.cpp                   |   31 +-
 plugins/bwscheduler/schedule.h                     |    3 +
 plugins/bwscheduler/scheduleeditor.cpp             |    8 +-
 plugins/bwscheduler/scheduleeditor.h               |    4 +-
 plugins/downloadorder/downloadorderplugin.cpp      |   10 +-
 plugins/downloadorder/downloadorderplugin.h        |    2 +-
 .../downloadorder/ktdownloadorderplugin.desktop    |  107 +-
 plugins/infowidget/CMakeLists.txt                  |    1 +
 plugins/infowidget/chunkdownloadview.cpp           |    9 +
 plugins/infowidget/chunkdownloadview.ui            |   27 +-
 plugins/infowidget/downloadedchunkbar.h            |    4 +
 plugins/infowidget/fileview.cpp                    |  206 +-
 plugins/infowidget/fileview.h                      |   22 +-
 plugins/infowidget/geoip/CMakeLists.txt            |    7 -
 plugins/infowidget/geoipmanager.cpp                |  179 +
 plugins/infowidget/geoipmanager.h                  |  100 +
 plugins/infowidget/infowidgetplugin.cpp            |   72 +-
 plugins/infowidget/infowidgetplugin.h              |    1 +
 plugins/infowidget/ktinfowidgetplugin.desktop      |  113 +-
 plugins/infowidget/peerviewmodel.cpp               |  102 +-
 plugins/infowidget/peerviewmodel.h                 |    4 +-
 plugins/infowidget/statustab.cpp                   |   45 +-
 plugins/infowidget/statustab.ui                    |  411 +-
 plugins/infowidget/trackermodel.cpp                |  218 +-
 plugins/infowidget/trackermodel.h                  |   33 +-
 plugins/infowidget/trackerview.cpp                 |  173 +-
 plugins/infowidget/trackerview.h                   |    4 +
 plugins/infowidget/trackerview.ui                  |  335 +-
 plugins/infowidget/webseedsmodel.cpp               |   29 +-
 plugins/infowidget/webseedsmodel.h                 |    7 +-
 plugins/infowidget/webseedstab.cpp                 |   23 +-
 plugins/infowidget/webseedstab.h                   |    2 +
 plugins/infowidget/webseedstab.ui                  |   23 +-
 plugins/ipfilter/downloadandconvertjob.cpp         |   56 +-
 plugins/ipfilter/ipblockingprefpage.cpp            |    6 +-
 plugins/ipfilter/ktipfilterplugin.desktop          |  124 +-
 plugins/ipfilter/ktipfilterplugin.kcfg             |    2 +-
 plugins/logviewer/ktlogviewerplugin.desktop        |  121 +-
 plugins/logviewer/ktlogviewerplugin.kcfg           |   78 +-
 plugins/logviewer/logflags.cpp                     |   10 +-
 plugins/logviewer/logflags.h                       |    2 +-
 plugins/logviewer/logprefwidget.ui                 |   57 +-
 plugins/logviewer/logviewer.cpp                    |   61 +-
 plugins/logviewer/logviewer.h                      |   15 +-
 plugins/logviewer/logviewerplugin.cpp              |   70 +-
 plugins/logviewer/logviewerplugin.h                |   17 +-
 plugins/mediaplayer/CMakeLists.txt                 |   15 +-
 plugins/mediaplayer/ktmediaplayerplugin.desktop    |  118 +-
 plugins/mediaplayer/mediamodel.cpp                 |  122 +-
 plugins/mediaplayer/mediamodel.h                   |   10 +-
 plugins/mediaplayer/mediaplayer.cpp                |    6 +-
 plugins/mediaplayer/mediaplayer.h                  |   10 +-
 plugins/mediaplayer/mediaplayeractivity.cpp        |  397 +
 plugins/mediaplayer/mediaplayeractivity.h          |  100 +
 plugins/mediaplayer/mediaplayerplugin.cpp          |  307 +-
 plugins/mediaplayer/mediaplayerplugin.h            |   44 +-
 plugins/mediaplayer/mediaview.cpp                  |  142 +-
 plugins/mediaplayer/mediaview.h                    |   34 +-
 plugins/mediaplayer/playlist.cpp                   |  307 +
 plugins/mediaplayer/playlist.h                     |   73 +
 plugins/mediaplayer/playlistwidget.cpp             |  338 +
 plugins/mediaplayer/playlistwidget.h               |  109 +
 plugins/mediaplayer/videowidget.cpp                |   26 +-
 plugins/mediaplayer/videowidget.h                  |    4 +
 plugins/scanfolder/ktscanfolderplugin.desktop      |  123 +-
 plugins/scanfolder/scanfolder.cpp                  |   13 +-
 plugins/scanfolder/scanfolderprefpage.cpp          |    2 +-
 plugins/scripting/CMakeLists.txt                   |    3 +-
 plugins/scripting/ktscriptingplugin.desktop        |  111 +-
 plugins/scripting/script.cpp                       |    5 +-
 plugins/scripting/script.h                         |    7 +
 plugins/scripting/scriptdelegate.cpp               |  184 +
 plugins/scripting/scriptdelegate.h                 |   59 +
 plugins/scripting/scriptingplugin.cpp              |   96 +-
 plugins/scripting/scriptingplugin.h                |    1 +
 plugins/scripting/scriptmanager.cpp                |    7 +-
 plugins/scripting/scriptmanager.h                  |    3 +-
 plugins/scripting/scriptmodel.cpp                  |  135 +-
 plugins/scripting/scriptmodel.h                    |   17 +
 plugins/scripting/scripts/CMakeLists.txt           |    3 +-
 .../scripting/scripts/auto_remove/CMakeLists.txt   |    3 +
 .../scripts/auto_remove/auto_remove.desktop        |   60 +
 .../scripting/scripts/auto_remove/auto_remove.py   |   74 +
 .../scripting/scripts/auto_remove/auto_remove.ui   |   41 +
 .../scripts/auto_resume/auto_resume.desktop        |   11 +-
 .../scripting/scripts/auto_resume/auto_resume.py   |    5 +-
 .../email_notifications.desktop                    |    9 +-
 .../email_notifications/email_notifications.py     |    6 +-
 .../scripts/tracker_groups/tracker_groups.desktop  |   13 +-
 .../scripts/tracker_groups/tracker_groups.py       |    4 +-
 plugins/search/CMakeLists.txt                      |    5 +-
 plugins/search/home/CMakeLists.txt                 |   18 +
 plugins/search/home/body-background.jpg            |  Bin 0 -> 299494 bytes
 plugins/search/home/box-bottom-left.png            |  Bin 0 -> 421 bytes
 plugins/search/home/box-bottom-middle.png          |  Bin 0 -> 468 bytes
 plugins/search/home/box-bottom-right.png           |  Bin 0 -> 430 bytes
 plugins/search/home/box-center.png                 |  Bin 0 -> 119101 bytes
 plugins/search/home/box-middle-left.png            |  Bin 0 -> 492 bytes
 plugins/search/home/box-middle-right.png           |  Bin 0 -> 519 bytes
 plugins/search/home/box-top-left.png               |  Bin 0 -> 417 bytes
 plugins/search/home/box-top-middle.png             |  Bin 0 -> 367 bytes
 plugins/search/home/box-top-right.png              |  Bin 0 -> 451 bytes
 plugins/search/home/home.css                       |   20 +
 plugins/search/home/home.html                      |   81 +
 .../search/home/ktorrent-icon.png                  |  Bin 15035 -> 15035 bytes
 plugins/search/home/ktorrent_infopage.css          |  256 +
 plugins/search/homepage.cpp                        |  134 +
 plugins/search/homepage.h                          |   61 +
 plugins/search/htmlpart.cpp                        |   34 +-
 plugins/search/htmlpart.h                          |    8 +-
 plugins/search/ktsearchplugin.desktop              |  124 +-
 plugins/search/opensearch/CMakeLists.txt           |    1 +
 .../search/opensearch/legittorrents/opensearch.xml |    7 +
 plugins/search/searchactivity.cpp                  |  290 +
 plugins/search/searchactivity.h                    |   74 +
 plugins/search/searchenginelist.cpp                |   89 +-
 plugins/search/searchenginelist.h                  |    3 +
 plugins/search/searchplugin.cpp                    |  222 +-
 plugins/search/searchplugin.h                      |   27 +-
 plugins/search/searchprefpage.cpp                  |    2 +-
 plugins/search/searchwidget.cpp                    |   43 +-
 plugins/search/searchwidget.h                      |    7 +-
 plugins/shutdown/CMakeLists.txt                    |   34 +
 plugins/shutdown/ktshutdownplugin.desktop          |   62 +
 plugins/shutdown/ktshutdownpluginui.rc             |   15 +
 plugins/shutdown/shutdowndlg.cpp                   |  159 +
 plugins/shutdown/shutdowndlg.h                     |   57 +
 plugins/shutdown/shutdowndlg.ui                    |   57 +
 plugins/shutdown/shutdownplugin.cpp                |  169 +
 plugins/shutdown/shutdownplugin.h                  |   64 +
 plugins/shutdown/shutdownruleset.cpp               |  313 +
 plugins/shutdown/shutdownruleset.h                 |  130 +
 plugins/shutdown/shutdowntorrentmodel.cpp          |  271 +
 plugins/shutdown/shutdowntorrentmodel.h            |   95 +
 plugins/stats/CMakeLists.txt                       |    1 -
 plugins/stats/StatsPlugin.cc                       |   11 +-
 plugins/stats/ktstatsplugin.desktop                |  115 +-
 plugins/syndication/CMakeLists.txt                 |    1 +
 plugins/syndication/feed.cpp                       |  146 +-
 plugins/syndication/feed.h                         |   20 +
 plugins/syndication/feedlist.cpp                   |   41 +-
 plugins/syndication/feedlist.h                     |    6 +-
 plugins/syndication/feedlistview.cpp               |    1 +
 plugins/syndication/feedwidget.cpp                 |   22 +-
 plugins/syndication/feedwidget.h                   |   10 +-
 plugins/syndication/feedwidget.ui                  |  109 +-
 plugins/syndication/filtereditor.cpp               |    4 +-
 plugins/syndication/ktsyndicationplugin.desktop    |   58 +-
 plugins/syndication/linkdownloader.cpp             |    2 +-
 plugins/syndication/managefiltersdlg.cpp           |    6 +-
 plugins/syndication/managefiltersdlg.h             |    6 +-
 plugins/syndication/syndicationactivity.cpp        |  352 +
 plugins/syndication/syndicationactivity.h          |   81 +
 plugins/syndication/syndicationplugin.cpp          |  308 +-
 plugins/syndication/syndicationplugin.h            |   42 +-
 plugins/syndication/syndicationtab.cpp             |   10 +
 plugins/syndication/syndicationtab.h               |    3 +
 plugins/upnp/ktupnpplugin.desktop                  |  119 +-
 plugins/upnp/upnpplugin.cpp                        |    8 +-
 plugins/upnp/upnpwidget.ui                         |    3 +
 plugins/webinterface/actionhandler.cpp             |    6 +-
 plugins/webinterface/httpclienthandler.cpp         |   12 +-
 plugins/webinterface/httpclienthandler.h           |    5 +-
 plugins/webinterface/httpserver.cpp                |   49 +-
 plugins/webinterface/ktwebinterfaceplugin.desktop  |   89 +-
 plugins/webinterface/ktwebinterfaceplugin.kcfg     |    4 +
 plugins/webinterface/settingsgenerator.cpp         |   19 +-
 plugins/webinterface/torrentlistgenerator.cpp      |    2 +-
 plugins/webinterface/torrentposthandler.cpp        |    7 +-
 plugins/webinterface/webinterfaceprefwidget.cpp    |   17 +-
 plugins/webinterface/webinterfaceprefwidget.ui     |    2 +-
 plugins/webinterface/www/coldmilk/coldmilk.html    |   40 +-
 plugins/webinterface/www/coldmilk/coldmilk.js      |   83 +-
 plugins/webinterface/www/coldmilk/login.html       |    2 +-
 plugins/webinterface/www/coldmilk/page_update.js   |   70 +-
 plugins/webinterface/www/common/login.js           |    2 +-
 plugins/webinterface/www/common/settings.js        |    4 +-
 plugins/webinterface/www/common/torrent_details.js |   10 +-
 plugins/webinterface/www/common/torrent_list.js    |    8 +-
 plugins/webinterface/www/default/interface.html    |   32 +-
 plugins/webinterface/www/default/interface.js      |   57 +-
 plugins/webinterface/www/default/login.html        |    2 +-
 plugins/webinterface/www/mobile/interface.html     |    4 +-
 plugins/webinterface/www/mobile/login.html         |    2 +-
 plugins/webinterface/www/mobile/mobile.js          |   10 +-
 plugins/zeroconf/CMakeLists.txt                    |    2 +-
 plugins/zeroconf/ktzeroconfplugin.desktop          |  119 +-
 po/ar/ktorrent.po                                  | 5291 ++++++++-----
 po/be/ktorrent.po                                  | 4955 ++++++++-----
 po/bg/ktorrent.po                                  | 5618 +++++++++------
 po/ca/ktorrent.po                                  | 4989 ++++++++-----
 po/cs/ktorrent.po                                  | 5081 ++++++++-----
 po/da/ktorrent.po                                  | 6519 ++++++++++------
 po/de/ktorrent.po                                  | 5421 ++++++++------
 po/el/ktorrent.po                                  | 5673 +++++++++-----
 po/en_GB/ktorrent.po                               | 5591 ++++++++------
 po/es/ktorrent.po                                  | 5023 ++++++++-----
 po/et/ktorrent.po                                  | 5530 ++++++++-------
 po/eu/ktorrent.po                                  | 4626 +++++++-----
 po/fr/ktorrent.po                                  | 5646 +++++++++------
 po/ga/ktorrent.po                                  | 5433 ++++++++------
 po/gl/ktorrent.po                                  | 5741 +++++++++------
 po/hi/ktorrent.po                                  | 4987 ++++++++-----
 po/hne/ktorrent.po                                 | 5056 ++++++++-----
 po/hr/ktorrent.po                                  |   15 +-
 po/hu/ktorrent.po                                  | 5977 ++++++++-------
 po/is/ktorrent.po                                  | 7861 +++++++++++++-------
 po/it/ktorrent.po                                  | 5590 +++++++++-----
 po/ja/ktorrent.po                                  | 5309 +++++++++-----
 po/km/ktorrent.po                                  | 5392 +++++++++-----
 po/lt/ktorrent.po                                  | 5071 ++++++++------
 po/lv/ktorrent.po                                  | 5577 +++++++++-----
 po/mai/ktorrent.po                                 | 4778 +++++++-----
 po/ms/ktorrent.po                                  | 5031 ++++++++------
 po/nb/ktorrent.po                                  | 4793 +++++++-----
 po/nds/ktorrent.po                                 | 5266 ++++++++-----
 po/nl/ktorrent.po                                  | 5518 +++++++++------
 po/nn/ktorrent.po                                  | 4851 +++++++-----
 po/oc/ktorrent.po                                  | 4955 ++++++++-----
 po/pl/ktorrent.po                                  | 5128 ++++++++------
 po/pt/ktorrent.po                                  | 4949 ++++++++-----
 po/pt_BR/ktorrent.po                               | 5027 ++++++++-----
 po/ro/ktorrent.po                                  | 5404 +++++++++-----
 po/ru/ktorrent.po                                  | 5361 ++++++++------
 po/se/ktorrent.po                                  | 4554 +++++++-----
 po/sk/ktorrent.po                                  | 5028 ++++++++-----
 po/sl/ktorrent.po                                  | 5555 +++++++++-----
 po/sr/ktorrent.po                                  | 4899 ++++++++-----
 po/sv/ktorrent.po                                  | 4924 ++++++++-----
 po/tr/ktorrent.po                                  | 5135 ++++++++-----
 po/uk/ktorrent.po                                  | 5092 ++++++++-----
 po/zh_CN/ktorrent.po                               | 7106 +++++++++---------
 po/zh_TW/ktorrent.po                               | 5156 ++++++++-----
 scripts/gen_kde4_pkg.rb                            |    4 +-
 scripts/gen_kde4_pkg_stable.rb                     |    4 +-
 scripts/kcfg_qobject_gen.py                        |  240 +
 scripts/update_stable_translations.rb              |   63 +
 516 files changed, 164999 insertions(+), 109315 deletions(-)

diff --cc libktcore/CMakeLists.txt
index 97432a7,1dbc722..a209b9c
--- a/libktcore/CMakeLists.txt
+++ b/libktcore/CMakeLists.txt
@@@ -40,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 9.3.0 SOVERSION 9 )
+ set_target_properties(ktcore PROPERTIES VERSION 10.0.0 SOVERSION 10 )
  install(TARGETS ktcore  ${INSTALL_TARGETS_DEFAULT_ARGS} )
  

-- 
KTorrent Debian packaging.



More information about the pkg-kde-commits mailing list