[SCM] KTorrent Debian packaging. branch, master, updated. debian/4.1-rc1-1

Modestas Vainius modax at alioth.debian.org
Sat Feb 19 00:59:25 UTC 2011


The following commit has been merged in the master branch:
commit 76766c8f1844e9bc11046b3e672eb9edb67b1718
Merge: 8f5dc5fc926394bae216b466a8996fe10e826efc 736afbb227c65d1a3947d6edfedec6fc592fa182
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sat Feb 19 01:32:32 2011 +0200

    Merge commit 'upstream/4.1-rc1'

 CMakeLists.txt                                     |    5 +-
 ChangeLog                                          |   51 +
 RoadMap                                            |   13 +
 doc/CMakeLists.txt                                 |    2 +
 doc/index.docbook                                  |   75 +
 ideal/CMakeLists.txt                               |    8 -
 ideal/box.cpp                                      |   54 -
 ideal/box.h                                        |   50 -
 ideal/mainwindow.cpp                               |  321 -
 ideal/mainwindow.h                                 |  127 -
 ideal/sidebar.cpp                                  |  287 -
 ideal/sidebar.h                                    |   94 -
 kio-magnet/CMakeLists.txt                          |   70 +
 kio-magnet/INSTALL                                 |   18 +
 kio-magnet/Messages.sh                             |    2 +
 kio-magnet/README                                  |  394 +
 kio-magnet/TODO                                    |   12 +
 kio-magnet/dbushandler.cpp                         |  576 ++
 kio-magnet/dbushandler.h                           |   77 +
 kio-magnet/dbusthread.cpp                          |   39 +
 kio-magnet/dbusthread.h                            |   34 +
 kio-magnet/interfaces/ktorrentcoreinterface.cpp    |   26 +
 kio-magnet/interfaces/ktorrentcoreinterface.h      |  183 +
 kio-magnet/interfaces/ktorrentgroupinterface.cpp   |   26 +
 kio-magnet/interfaces/ktorrentgroupinterface.h     |  137 +
 .../ktorrenttorrentfilestreaminterface.cpp         |   26 +
 .../ktorrenttorrentfilestreaminterface.h           |   85 +
 kio-magnet/interfaces/ktorrenttorrentinterface.cpp |   26 +
 kio-magnet/interfaces/ktorrenttorrentinterface.h   |  412 +
 kio-magnet/interfaces/org.ktorrent.core.xml        |   85 +
 kio-magnet/interfaces/org.ktorrent.group.xml       |   47 +
 kio-magnet/interfaces/org.ktorrent.torrent.xml     |  191 +
 kio-magnet/kio_magnet.cpp                          |  412 +
 kio-magnet/kio_magnet.h                            |   62 +
 kio-magnet/magnet.protocol                         |   18 +
 kio-magnet/magnetsettings.kcfg                     |   31 +
 kio-magnet/magnetsettings.kcfgc                    |    4 +
 ktmagnetdownloader/CMakeLists.txt                  |    4 +-
 ktmagnetdownloader/magnetdownloader.cpp            |    9 +-
 ktmagnetdownloader/magnettest.cpp                  |   23 +-
 ktmagnetdownloader/magnettest.h                    |    6 +-
 ktorrent/CMakeLists.txt                            |    9 +-
 ktorrent/core.cpp                                  |  150 +-
 ktorrent/core.h                                    |   36 +-
 ktorrent/dialogs/fileselectdlg.cpp                 |  153 +-
 ktorrent/dialogs/fileselectdlg.h                   |   35 +-
 ktorrent/dialogs/fileselectdlg.ui                  |   20 +
 ktorrent/dialogs/importdialog.cpp                  |  252 +-
 ktorrent/dialogs/importdialog.h                    |   22 +-
 ktorrent/dialogs/torrentcreatordlg.cpp             |    6 +-
 ktorrent/dialogs/torrentmigratordlg.cpp            |    2 +-
 ktorrent/groups/grouppolicydlg.cpp                 |    8 +
 ktorrent/groups/grouppolicydlg.ui                  |  220 +-
 ktorrent/groups/groupview.cpp                      |    5 +-
 ktorrent/groups/groupview.h                        |    4 +-
 ktorrent/gui.cpp                                   |  155 +-
 ktorrent/gui.h                                     |   26 +-
 ktorrent/ktorrent.desktop                          |   14 +-
 ktorrent/ktorrent.notifyrc                         |   58 +-
 ktorrent/ktorrentplugin.desktop                    |    4 +-
 ktorrent/ktorrentui.rc                             |   89 +-
 ktorrent/kttorrentactivityui.rc                    |   90 +
 ktorrent/main.cpp                                  |   21 +-
 ktorrent/pref/generalpref.ui                       |   30 +
 ktorrent/pref/prefdialog.cpp                       |   16 +-
 ktorrent/pref/prefdialog.h                         |    1 +
 ktorrent/pref/qmpref.cpp                           |    1 +
 ktorrent/pref/qmpref.ui                            |  286 +-
 ktorrent/scanlistener.cpp                          |   95 -
 ktorrent/scanlistener.h                            |   93 -
 ktorrent/statusbar.cpp                             |    1 +
 ktorrent/tools/queuemanagerwidget.cpp              |    2 +-
 ktorrent/torrentactivity.cpp                       |   76 +-
 ktorrent/torrentactivity.h                         |   25 +-
 ktorrent/trayicon.cpp                              |   13 +-
 ktorrent/view/propertiesextender.cpp               |   13 +
 ktorrent/view/propertiesextender.h                 |    1 +
 ktorrent/view/propertiesextender.ui                |   44 +-
 ktorrent/view/scanextender.cpp                     |  108 +-
 ktorrent/view/scanextender.h                       |   24 +-
 ktorrent/view/view.cpp                             |  114 +-
 ktorrent/view/view.h                               |   15 +-
 ktorrent/view/viewdelegate.cpp                     |   23 +-
 ktorrent/view/viewdelegate.h                       |   25 +-
 ktorrent/view/viewmanager.cpp                      |  193 +-
 ktorrent/view/viewmanager.h                        |   31 +-
 ktorrent/view/viewmodel.cpp                        |   89 +-
 ktorrent/view/viewmodel.h                          |   21 +-
 ktupnptest/CMakeLists.txt                          |    4 +-
 ktupnptest/main.cpp                                |   16 +-
 ktupnptest/upnptestwidget.cpp                      |   11 +-
 ktupnptest/upnptestwidget.h                        |    8 +-
 libktcore/CMakeLists.txt                           |   13 +-
 libktcore/dbus/dbusgroup.cpp                       |   14 +
 libktcore/dbus/dbusgroup.h                         |    2 +
 libktcore/dbus/dbussettings.cpp                    |   20 +
 libktcore/dbus/dbussettings.h                      |    4 +
 libktcore/dbus/dbustorrent.cpp                     |   31 +-
 libktcore/dbus/dbustorrent.h                       |    6 +
 libktcore/dbus/dbustorrentfilestream.cpp           |   91 +
 libktcore/dbus/dbustorrentfilestream.h             |   76 +
 libktcore/groups/group.h                           |    1 +
 libktcore/groups/torrentgroup.cpp                  |   14 +-
 libktcore/gui/activitybar.cpp                      |   72 -
 libktcore/gui/activitybar.h                        |   56 -
 libktcore/gui/activitylistdelegate.cpp             |   61 -
 libktcore/gui/activitylistdelegate.h               |   47 -
 libktcore/gui/activitylistmodel.cpp                |  125 -
 libktcore/gui/activitylistmodel.h                  |   55 -
 libktcore/gui/activitylistwidget.cpp               |  323 -
 libktcore/gui/activitylistwidget.h                 |  104 -
 libktcore/gui/centralwidget.cpp                    |  108 +-
 libktcore/gui/centralwidget.h                      |   42 +-
 libktcore/gui/extender.cpp                         |   34 +
 libktcore/gui/extender.h                           |   62 +
 libktcore/gui/tabbarwidget.cpp                     |   12 +-
 libktcore/interfaces/activity.cpp                  |   34 +-
 libktcore/interfaces/activity.h                    |   34 +
 libktcore/interfaces/coreinterface.h               |    6 +-
 libktcore/interfaces/functions.cpp                 |   12 +-
 libktcore/interfaces/functions.h                   |    7 +-
 libktcore/interfaces/guiinterface.h                |    7 -
 libktcore/interfaces/plugin.h                      |    3 +
 libktcore/interfaces/prefpageinterface.h           |    7 +
 libktcore/ktorrent.kcfg                            |   18 +-
 libktcore/ktversion.h                              |   12 +-
 libktcore/torrent/basicjobprogresswidget.cpp       |   92 +
 libktcore/torrent/basicjobprogresswidget.h         |   52 +
 libktcore/torrent/basicjobprogresswidget.ui        |   67 +
 libktcore/torrent/chunkbar.cpp                     |    4 +-
 libktcore/torrent/chunkbar.h                       |    2 +-
 libktcore/torrent/jobprogresswidget.cpp            |   42 +
 libktcore/torrent/jobprogresswidget.h              |   88 +
 libktcore/torrent/jobtracker.cpp                   |  157 +
 libktcore/torrent/jobtracker.h                     |   76 +
 libktcore/torrent/queuemanager.cpp                 |   91 +-
 libktcore/torrent/queuemanager.h                   |   29 +-
 libktcore/torrent/torrentfiletreemodel.h           |    1 +
 libktupnp/CMakeLists.txt                           |   14 -
 libktupnp/httprequest.cpp                          |  144 -
 libktupnp/httprequest.h                            |  104 -
 libktupnp/ktupnp_export.h                          |   42 -
 libktupnp/soap.cpp                                 |   52 -
 libktupnp/soap.h                                   |   62 -
 libktupnp/upnpdescriptionparser.cpp                |  236 -
 libktupnp/upnpdescriptionparser.h                  |   58 -
 libktupnp/upnpmcastsocket.cpp                      |  320 -
 libktupnp/upnpmcastsocket.h                        |   97 -
 libktupnp/upnprouter.cpp                           |  480 -
 libktupnp/upnprouter.h                             |  231 -
 plasma/applet/plasma-applet-ktorrent.desktop       |   52 +-
 .../dataengine/plasma-dataengine-ktorrent.desktop  |   52 +-
 plugins/bwscheduler/CMakeLists.txt                 |    1 +
 plugins/bwscheduler/additemdlg.cpp                 |   19 +-
 plugins/bwscheduler/additemdlg.h                   |    1 +
 plugins/bwscheduler/edititemdlg.cpp                |    8 +-
 plugins/bwscheduler/ktbwschedulerplugin.desktop    |    2 +
 plugins/bwscheduler/ktbwschedulerpluginui.rc       |   21 +-
 plugins/bwscheduler/scheduleeditor.cpp             |   66 +-
 plugins/bwscheduler/scheduleeditor.h               |    6 +-
 plugins/downloadorder/downloadorderplugin.h        |    1 +
 .../downloadorder/ktdownloadorderplugin.desktop    |    4 +-
 plugins/infowidget/chunkdownloadmodel.cpp          |  103 +-
 plugins/infowidget/chunkdownloadmodel.h            |   18 +-
 plugins/infowidget/chunkdownloadview.cpp           |   11 +-
 plugins/infowidget/chunkdownloadview.h             |    5 +-
 plugins/infowidget/downloadedchunkbar.cpp          |    4 +-
 plugins/infowidget/downloadedchunkbar.h            |    2 +-
 plugins/infowidget/iwfiletreemodel.cpp             |   44 +-
 plugins/infowidget/iwfiletreemodel.h               |    3 +-
 plugins/infowidget/ktinfowidgetplugin.desktop      |    5 +-
 plugins/infowidget/peerview.cpp                    |   16 +-
 plugins/infowidget/peerview.h                      |    4 +-
 plugins/infowidget/peerviewmodel.cpp               |  176 +-
 plugins/infowidget/peerviewmodel.h                 |   19 +-
 plugins/infowidget/statustab.cpp                   |    3 +-
 plugins/infowidget/trackermodel.cpp                |    2 +-
 plugins/infowidget/trackerview.cpp                 |    8 +-
 plugins/infowidget/webseedsmodel.h                 |    3 +-
 plugins/ipfilter/convertthread.cpp                 |    4 +-
 plugins/ipfilter/downloadandconvertjob.cpp         |   51 +-
 plugins/ipfilter/downloadandconvertjob.h           |    4 +
 plugins/ipfilter/ipblockingprefpage.cpp            |    2 +
 plugins/ipfilter/ipblockingprefpage.ui             |  165 +-
 plugins/ipfilter/ipfilterplugin.cpp                |    5 +
 plugins/ipfilter/ipfilterplugin.h                  |    1 +
 plugins/ipfilter/ktipfilterplugin.desktop          |    3 +
 plugins/logviewer/ktlogviewerplugin.desktop        |    3 +-
 plugins/logviewer/ktlogviewerplugin.kcfg           |    5 +
 plugins/logviewer/logprefwidget.ui                 |  109 +-
 plugins/logviewer/logviewer.cpp                    |   57 +-
 plugins/logviewer/logviewer.h                      |    9 +-
 plugins/logviewer/logviewerplugin.cpp              |    7 +-
 plugins/logviewer/logviewerplugin.h                |    1 +
 .../ktmagnetgeneratorplugin.desktop                |   12 +-
 plugins/magnetgenerator/magnetgeneratorplugin.h    |    1 +
 plugins/mediaplayer/CMakeLists.txt                 |    3 +
 plugins/mediaplayer/ktmediaplayerplugin.desktop    |    5 +-
 plugins/mediaplayer/mediafile.cpp                  |  271 +
 plugins/mediaplayer/mediafile.h                    |  166 +
 plugins/mediaplayer/mediafilestream.cpp            |  140 +
 plugins/mediaplayer/mediafilestream.h              |   73 +
 plugins/mediaplayer/mediamodel.cpp                 |  298 +-
 plugins/mediaplayer/mediamodel.h                   |   43 +-
 plugins/mediaplayer/mediaplayer.cpp                |  144 +-
 plugins/mediaplayer/mediaplayer.h                  |   23 +-
 plugins/mediaplayer/mediaplayeractivity.cpp        |   65 +-
 plugins/mediaplayer/mediaplayeractivity.h          |   13 +-
 plugins/mediaplayer/mediaplayerplugin.cpp          |    4 +-
 plugins/mediaplayer/mediaview.cpp                  |   47 +-
 plugins/mediaplayer/mediaview.h                    |   17 +-
 plugins/mediaplayer/playlist.cpp                   |   64 +-
 plugins/mediaplayer/playlist.h                     |   15 +-
 plugins/mediaplayer/playlistwidget.cpp             |   46 +-
 plugins/mediaplayer/playlistwidget.h               |   12 +-
 plugins/mediaplayer/videochunkbar.cpp              |  125 +
 plugins/mediaplayer/videochunkbar.h                |   64 +
 plugins/mediaplayer/videowidget.cpp                |  186 +-
 plugins/mediaplayer/videowidget.h                  |   35 +-
 plugins/scanfolder/ktscanfolderplugin.desktop      |    3 +-
 plugins/scanfolder/scanfolder.cpp                  |   48 +-
 plugins/scanfolder/scanfolder.h                    |   76 +-
 plugins/scanfolder/scanfolderprefpage.cpp          |   18 +-
 plugins/scanfolder/scanfolderprefpage.h            |    2 +
 plugins/scripting/CMakeLists.txt                   |    2 +-
 plugins/scripting/ktscriptingplugin.desktop        |    3 +
 plugins/scripting/ktscriptingpluginui.rc           |   26 +
 plugins/scripting/scriptingplugin.cpp              |  123 +-
 plugins/scripting/scriptingplugin.h                |   17 +-
 plugins/scripting/scriptmanager.cpp                |  190 +-
 plugins/scripting/scriptmanager.h                  |   32 +-
 .../scripts/auto_remove/auto_remove.desktop        |    9 +-
 .../scripts/auto_resume/auto_resume.desktop        |    6 +-
 .../email_notifications.desktop                    |    6 +-
 .../scripts/tracker_groups/tracker_groups.desktop  |   36 +-
 plugins/search/CMakeLists.txt                      |    9 +-
 plugins/search/buffernetworkreply.cpp              |   65 +
 plugins/search/buffernetworkreply.h                |   58 +
 plugins/search/home/home.html                      |  134 +-
 plugins/search/home/ktorrent_infopage.css          |    4 +-
 plugins/search/homepage.cpp                        |  134 -
 plugins/search/homepage.h                          |   61 -
 plugins/search/htmlpart.cpp                        |  232 -
 plugins/search/htmlpart.h                          |   80 -
 plugins/search/ktsearchplugin.desktop              |    3 +-
 plugins/search/ktsearchplugin.kcfg                 |    3 +
 plugins/search/localfilenetworkreply.cpp           |   83 +
 plugins/search/localfilenetworkreply.h             |   54 +
 plugins/search/searchactivity.cpp                  |  105 +-
 plugins/search/searchactivity.h                    |   19 +-
 plugins/search/searchenginelist.cpp                |    4 +-
 plugins/search/searchplugin.cpp                    |   41 +-
 plugins/search/searchplugin.h                      |   16 +-
 plugins/search/searchpref.ui                       |  131 +-
 plugins/search/searchprefpage.cpp                  |    9 +-
 plugins/search/searchprefpage.h                    |    1 +
 plugins/search/searchtoolbar.cpp                   |    4 +-
 plugins/search/searchtoolbar.h                     |    9 +-
 plugins/search/searchwidget.cpp                    |  300 +-
 plugins/search/searchwidget.h                      |   48 +-
 plugins/search/webview.cpp                         |  194 +
 plugins/search/webview.h                           |  107 +
 plugins/shutdown/ktshutdownplugin.desktop          |   12 +-
 plugins/stats/SpdTabPage.cc                        |   11 +-
 plugins/stats/ktstatsplugin.desktop                |    3 +-
 plugins/syndication/feed.cpp                       |   46 +-
 plugins/syndication/feed.h                         |   20 +-
 plugins/syndication/feedlist.cpp                   |   18 +-
 plugins/syndication/feedretriever.cpp              |   35 +-
 plugins/syndication/feedretriever.h                |   14 +-
 plugins/syndication/feedwidget.cpp                 |   25 +-
 plugins/syndication/feedwidget.h                   |    1 +
 plugins/syndication/feedwidget.ui                  |   36 +-
 plugins/syndication/filter.cpp                     |   76 +
 plugins/syndication/filter.h                       |   41 +
 plugins/syndication/filtereditor.cpp               |   34 +
 plugins/syndication/filtereditor.ui                |  323 +-
 plugins/syndication/ktsyndicationplugin.desktop    |    5 +-
 plugins/syndication/linkdownloader.cpp             |   27 +-
 plugins/syndication/linkdownloader.h               |    3 +-
 plugins/syndication/syndicationactivity.cpp        |   36 +-
 plugins/syndication/syndicationactivity.h          |    4 +-
 plugins/upnp/CMakeLists.txt                        |    3 -
 plugins/upnp/ktupnpplugin.desktop                  |    2 +
 plugins/upnp/routermodel.cpp                       |  118 +-
 plugins/upnp/routermodel.h                         |   16 +-
 plugins/upnp/upnpplugin.cpp                        |    2 +-
 plugins/upnp/upnpplugin.h                          |    8 +-
 plugins/upnp/upnpwidget.cpp                        |   12 +-
 plugins/upnp/upnpwidget.h                          |   18 +-
 plugins/webinterface/httpserver.cpp                |   50 +-
 plugins/webinterface/httpserver.h                  |   12 +-
 plugins/webinterface/ktwebinterfaceplugin.desktop  |    4 +-
 plugins/zeroconf/ktzeroconfplugin.desktop          |    4 +-
 po/CMakeLists.txt                                  |    2 +-
 po/ar/ktorrent.po                                  | 4573 +++++-----
 po/ast/ktorrent.po                                 | 4617 ++++++----
 po/be/ktorrent.po                                  | 4334 +++++----
 po/bg/ktorrent.po                                  | 4661 ++++++-----
 po/ca/ktorrent.po                                  | 4446 +++++----
 po/ca at valencia/ktorrent.po                         | 4446 +++++----
 po/cs/ktorrent.po                                  | 4737 ++++++-----
 po/da/ktorrent.po                                  | 4644 ++++++-----
 po/de/ktorrent.po                                  | 4729 ++++++-----
 po/el/ktorrent.po                                  | 5832 +++++++-----
 po/en_GB/ktorrent.po                               | 4679 ++++++-----
 po/eo/ktorrent.po                                  | 4799 ++++++-----
 po/es/ktorrent.po                                  | 4696 ++++++-----
 po/et/ktorrent.po                                  | 4609 ++++++-----
 po/eu/ktorrent.po                                  | 7575 ++++++++++------
 po/fi/ktorrent.po                                  | 4794 ++++++-----
 po/fr/ktorrent.po                                  | 7802 ++++++++---------
 po/ga/ktorrent.po                                  | 4626 ++++++----
 po/gl/ktorrent.po                                  | 4791 ++++++-----
 po/hi/ktorrent.po                                  | 4395 +++++----
 po/hne/ktorrent.po                                 | 4399 +++++----
 po/hr/ktorrent.po                                  | 4177 +++++----
 po/hu/ktorrent.po                                  | 4762 ++++++-----
 po/is/ktorrent.po                                  | 5053 ++++++-----
 po/it/ktorrent.po                                  | 4769 ++++++-----
 po/ja/ktorrent.po                                  | 4488 +++++----
 po/km/ktorrent.po                                  | 4749 ++++++-----
 po/ku/CMakeLists.txt                               |    2 +
 po/ku/ktorrent.po                                  | 9643 ++++++++++++++++++++
 po/lt/ktorrent.po                                  | 4642 +++++-----
 po/lv/ktorrent.po                                  | 4755 ++++++-----
 po/mai/CMakeLists.txt                              |    2 -
 po/mai/ktorrent.po                                 | 8892 ------------------
 po/ms/ktorrent.po                                  | 4385 +++++----
 po/nb/ktorrent.po                                  | 5157 ++++++-----
 po/nds/ktorrent.po                                 | 4635 ++++++-----
 po/nl/ktorrent.po                                  | 4667 ++++++-----
 po/nn/ktorrent.po                                  | 5057 ++++++-----
 po/oc/ktorrent.po                                  | 4330 +++++----
 po/pl/ktorrent.po                                  | 4706 ++++++-----
 po/pt/ktorrent.po                                  | 4525 +++++-----
 po/pt_BR/ktorrent.po                               | 4473 +++++----
 po/ro/ktorrent.po                                  | 4842 ++++++-----
 po/ru/ktorrent.po                                  | 4745 ++++++-----
 po/se/ktorrent.po                                  | 4851 ++++++-----
 po/si/ktorrent.po                                  | 4167 +++++----
 po/sk/ktorrent.po                                  | 4620 ++++++----
 po/sl/ktorrent.po                                  | 4791 ++++++-----
 po/sr/ktorrent.po                                  | 4510 +++++----
 po/sr at ijekavian/ktorrent.po                        | 4511 +++++----
 po/sr at ijekavianlatin/ktorrent.po                   | 4509 +++++----
 po/sr at latin/ktorrent.po                            | 4509 +++++----
 po/sv/ktorrent.po                                  | 4633 ++++++-----
 po/tr/ktorrent.po                                  | 4846 ++++++-----
 po/uk/ktorrent.po                                  | 4632 ++++++-----
 po/zh_CN/ktorrent.po                               | 6213 +++++++-------
 po/zh_TW/ktorrent.po                               | 4557 +++++-----
 scripts/gen_kde4_pkg.rb                            |  156 -
 scripts/gen_kde4_pkg_stable.rb                     |  159 -
 scripts/gen_pkg.rb                                 |  161 +
 scripts/kcfg_qobject_gen.py                        |    2 +-
 356 files changed, 160938 insertions(+), 129946 deletions(-)

-- 
KTorrent Debian packaging.



More information about the pkg-kde-commits mailing list