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

Modestas Vainius modax-guest at alioth.debian.org
Wed Oct 28 20:15:35 UTC 2009


The following commit has been merged in the master branch:
commit 0f9f7a010c87826323880f1948db2a73b312e4d7
Merge: 6b584c39c625d9a554c6766e1cacebd9f87d59d6 bdefea04aa59ac2633c44d97afd48a035aeb446c
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Tue Aug 11 12:09:49 2009 +0300

    Merge branch 'upstream-exp' into experimental

 CMakeLists.txt                                     |    5 +-
 ChangeLog                                          |   28 +
 cmake/modules/FindBTCore.cmake                     |    6 +-
 ktorrent/CMakeLists.txt                            |    4 +
 ktorrent/advancedpref.ui                           |   12 +
 ktorrent/core.cpp                                  |   56 +-
 ktorrent/core.h                                    |    3 +
 ktorrent/fileselectdlg.cpp                         |  101 +-
 ktorrent/fileselectdlg.h                           |   18 +
 ktorrent/fileselectdlg.ui                          |  366 +-
 ktorrent/generalpref.ui                            |  146 +-
 ktorrent/groupview.cpp                             |    6 +-
 ktorrent/groupview.h                               |    2 -
 ktorrent/gui.cpp                                   |   34 +-
 ktorrent/gui.h                                     |    4 +-
 ktorrent/ktorrent.desktop                          |    4 +-
 ktorrent/ktorrent.notifyrc                         |   25 +-
 ktorrent/ktorrentplugin.desktop                    |    3 +-
 ktorrent/ktorrentui.rc                             |    3 +-
 ktorrent/qmpref.ui                                 |    4 +-
 ktorrent/scanextender.cpp                          |  101 +
 ktorrent/{addpeersdlg.h => scanextender.h}         |   44 +-
 ktorrent/scanextender.ui                           |  250 +
 .../scanlistener.cpp                               |   67 +-
 ktorrent/{scandlg.h => scanlistener.h}             |  100 +-
 ktorrent/speedlimitsdlg.cpp                        |   28 +-
 ktorrent/speedlimitsdlg.h                          |    4 +-
 ktorrent/speedlimitsdlg.ui                         |  147 +-
 ktorrent/torrentactivity.cpp                       |   19 +
 ktorrent/torrentactivity.h                         |    9 +
 ktorrent/torrentcreatordlg.cpp                     |   31 +
 ktorrent/torrentcreatordlg.h                       |    6 +
 ktorrent/trayicon.cpp                              |   55 +-
 ktorrent/trayicon.h                                |   15 +-
 ktorrent/view.cpp                                  |   54 +-
 ktorrent/view.h                                    |   14 +-
 ktorrent/viewdelegate.cpp                          |  259 +
 ktorrent/viewdelegate.h                            |   90 +
 ktorrent/viewmanager.cpp                           |   77 +-
 ktorrent/viewmanager.h                             |   16 +-
 ktorrent/viewmodel.cpp                             |   24 +-
 ktorrent/viewmodel.h                               |   12 +-
 ktorrent/viewselectionmodel.h                      |    1 -
 libbtcore/CMakeLists.txt                           |   17 +-
 libbtcore/btversion.h                              |    4 +-
 libbtcore/datachecker/datacheckerjob.cpp           |   95 +
 .../datacheckerjob.h}                              |   49 +-
 libbtcore/datachecker/multidatachecker.cpp         |   10 -
 libbtcore/datachecker/singledatachecker.cpp        |   10 -
 libbtcore/dht/announcetask.cpp                     |   15 +-
 libbtcore/diskio/cache.cpp                         |    4 +-
 libbtcore/diskio/cache.h                           |   14 +-
 libbtcore/diskio/chunkmanager.cpp                  |   10 +-
 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                |   53 +-
 libbtcore/diskio/multifilecache.h                  |   10 +-
 .../preallocationjob.cpp}                          |   66 +-
 .../diskio/preallocationjob.h                      |   45 +-
 libbtcore/diskio/preallocationthread.cpp           |    2 +-
 libbtcore/diskio/singlefilecache.cpp               |   12 +-
 libbtcore/diskio/singlefilecache.h                 |    6 +-
 libbtcore/interfaces/peerinterface.h               |    5 +
 libbtcore/interfaces/torrentinterface.cpp          |   11 +-
 libbtcore/interfaces/torrentinterface.h            |  135 +-
 libbtcore/peer/peer.cpp                            |   40 +-
 libbtcore/peer/peer.h                              |   31 +-
 libbtcore/peer/peermanager.cpp                     |    8 +
 libbtcore/peer/peermanager.h                       |    3 +
 .../exitoperation.cpp => torrent/job.cpp}          |   39 +-
 .../{util/autorotatelogjob.h => torrent/job.h}     |   47 +-
 .../chunkbar.h => libbtcore/torrent/jobqueue.cpp   |  120 +-
 .../torrent/jobqueue.h                             |   53 +-
 libbtcore/torrent/timeestimator.cpp                |    2 +-
 libbtcore/torrent/torrent.h                        |    1 -
 libbtcore/torrent/torrentcontrol.cpp               |  395 +-
 libbtcore/torrent/torrentcontrol.h                 |   55 +-
 libbtcore/torrent/torrentcreator.cpp               |    2 +-
 libbtcore/torrent/torrentstats.cpp                 |   95 +
 libbtcore/torrent/torrentstats.h                   |  143 +
 libbtcore/tracker/httpannouncejob.cpp              |    7 +-
 libbtcore/util/compressfilejob.cpp                 |    4 +-
 libbtcore/util/compressfilejob.h                   |    5 +-
 .../{compressfilejob.cpp => decompressfilejob.cpp} |  101 +-
 .../{compressfilejob.h => decompressfilejob.h}     |   40 +-
 libbtcore/util/extractfilejob.cpp                  |  145 +
 .../qmpref.h => libbtcore/util/extractfilejob.h    |   40 +-
 libbtcore/util/fileops.cpp                         |    6 +-
 libktcore/CMakeLists.txt                           |    6 +-
 libktcore/dbus/dbus.cpp                            |    8 +
 libktcore/dbus/dbus.h                              |    6 +-
 libktcore/dbus/dbussettings.cpp                    |  771 +++
 libktcore/dbus/dbussettings.h                      |  194 +
 libktcore/dbus/dbustorrent.cpp                     |   13 +-
 libktcore/dbus/dbustorrent.h                       |    4 +-
 libktcore/gui/activitylistdelegate.cpp             |    6 +-
 libktcore/gui/activitylistdelegate.h               |    2 +
 libktcore/gui/activitylistwidget.cpp               |    2 +
 libktcore/interfaces/functions.cpp                 |    1 +
 libktcore/interfaces/guiinterface.h                |    9 +-
 libktcore/interfaces/torrentactivityinterface.h    |    5 +
 libktcore/ktorrent.kcfg                            |    6 +-
 libktcore/ktversion.h                              |    8 +-
 libktcore/torrent/chunkbar.h                       |    1 -
 libktcore/torrent/queuemanager.cpp                 |   20 +-
 libktcore/util/hintlineedit.cpp                    |  133 +
 libktcore/util/hintlineedit.h                      |   92 +
 .../stringcompletionmodel.cpp}                     |   73 +-
 .../activitybar.h => util/stringcompletionmodel.h} |   48 +-
 .../treefiltermodel.cpp}                           |   42 +-
 .../btpref.h => libktcore/util/treefiltermodel.h   |   28 +-
 plasma/applet/plasma-applet-ktorrent.desktop       |    7 +
 .../dataengine/plasma-dataengine-ktorrent.desktop  |    1 +
 plugins/bwscheduler/ktbwschedulerplugin.desktop    |   12 +-
 .../downloadorder/ktdownloadorderplugin.desktop    |   12 +-
 plugins/infowidget/downloadedchunkbar.h            |    4 +
 plugins/infowidget/fileview.cpp                    |  206 +-
 plugins/infowidget/fileview.h                      |   22 +-
 plugins/infowidget/geoipmanager.cpp                |   65 +-
 plugins/infowidget/geoipmanager.h                  |   34 +-
 plugins/infowidget/infowidgetplugin.cpp            |    1 -
 plugins/infowidget/ktinfowidgetplugin.desktop      |    8 +
 plugins/infowidget/peerviewmodel.cpp               |    9 +-
 plugins/infowidget/statustab.cpp                   |    4 +-
 plugins/infowidget/trackerview.cpp                 |   21 +-
 plugins/ipfilter/downloadandconvertjob.cpp         |   56 +-
 plugins/ipfilter/ktipfilterplugin.desktop          |    8 +
 plugins/ipfilter/ktipfilterplugin.kcfg             |    2 +-
 plugins/logviewer/ktlogviewerplugin.desktop        |   10 +-
 plugins/logviewer/logviewer.cpp                    |   46 +-
 plugins/logviewer/logviewer.h                      |    9 +-
 plugins/mediaplayer/ktmediaplayerplugin.desktop    |   10 +-
 plugins/mediaplayer/mediaplayeractivity.h          |    1 -
 plugins/mediaplayer/mediaplayerplugin.h            |    2 -
 plugins/mediaplayer/mediaview.h                    |    1 -
 plugins/mediaplayer/playlist.cpp                   |    2 +-
 plugins/scanfolder/ktscanfolderplugin.desktop      |    9 +-
 plugins/scripting/ktscriptingplugin.desktop        |    8 +-
 .../scripts/auto_remove/auto_remove.desktop        |   14 +-
 .../scripts/auto_resume/auto_resume.desktop        |    6 +-
 .../email_notifications.desktop                    |    6 +-
 .../scripts/tracker_groups/tracker_groups.desktop  |   12 +-
 plugins/search/ktsearchplugin.desktop              |    8 +-
 plugins/search/opensearch/CMakeLists.txt           |    1 +
 .../search/opensearch/legittorrents/opensearch.xml |    7 +
 plugins/search/searchactivity.h                    |    1 -
 plugins/search/searchenginelist.cpp                |   89 +-
 plugins/search/searchenginelist.h                  |    3 +
 plugins/search/searchplugin.h                      |    1 -
 plugins/search/searchwidget.cpp                    |    3 +-
 plugins/search/searchwidget.h                      |    1 -
 plugins/shutdown/ktshutdownplugin.desktop          |   12 +
 plugins/stats/ktstatsplugin.desktop                |    8 +-
 plugins/syndication/feed.cpp                       |   56 +-
 plugins/syndication/feed.h                         |   20 +
 plugins/syndication/feedlist.cpp                   |   35 +-
 plugins/syndication/feedlist.h                     |    2 +
 plugins/syndication/feedwidget.cpp                 |   16 +
 plugins/syndication/feedwidget.h                   |    2 +
 plugins/syndication/feedwidget.ui                  |  109 +-
 plugins/syndication/ktsyndicationplugin.desktop    |    8 +-
 plugins/syndication/syndicationactivity.cpp        |    2 +-
 plugins/syndication/syndicationplugin.h            |    2 -
 plugins/upnp/ktupnpplugin.desktop                  |    5 +-
 plugins/webinterface/ktwebinterfaceplugin.desktop  |    6 +
 plugins/webinterface/torrentlistgenerator.cpp      |    2 +-
 plugins/zeroconf/ktzeroconfplugin.desktop          |    4 +
 po/CMakeLists.txt                                  |   84 +-
 po/ar/ktorrent.po                                  | 2203 ++++---
 po/be/ktorrent.po                                  | 2082 ++++---
 po/bg/ktorrent.po                                  | 2134 ++++---
 po/ca/ktorrent.po                                  | 2129 ++++---
 po/cs/ktorrent.po                                  | 2145 ++++---
 po/da/ktorrent.po                                  | 2174 ++++---
 po/de/ktorrent.po                                  | 2159 ++++---
 po/el/ktorrent.po                                  | 2146 ++++---
 po/en_GB/ktorrent.po                               | 2158 ++++---
 po/eo/ktorrent.po                                  | 2180 ++++---
 po/es/ktorrent.po                                  | 2696 ++++-----
 po/et/ktorrent.po                                  | 2162 ++++---
 po/eu/ktorrent.po                                  | 2103 ++++---
 po/fi/ktorrent.po                                  | 2097 ++++---
 po/fr/ktorrent.po                                  | 2233 ++++----
 po/ga/ktorrent.po                                  | 2137 ++++---
 po/gl/ktorrent.po                                  | 3614 ++++++------
 po/hi/ktorrent.po                                  | 2086 ++++---
 po/hne/ktorrent.po                                 | 2086 ++++---
 po/hu/ktorrent.po                                  | 2058 ++++---
 po/is/CMakeLists.txt                               |    2 +
 po/{cs => is}/ktorrent.po                          | 6412 +++++++++++---------
 po/it/ktorrent.po                                  | 2149 ++++---
 po/ja/ktorrent.po                                  | 2259 ++++---
 po/km/ktorrent.po                                  | 2440 ++++----
 po/ku/ktorrent.po                                  | 2055 ++++---
 po/lt/ktorrent.po                                  | 2112 ++++---
 po/lv/ktorrent.po                                  | 2145 ++++---
 po/ms/CMakeLists.txt                               |    2 +
 po/{se => ms}/ktorrent.po                          | 4046 ++++++++-----
 po/nb/ktorrent.po                                  | 2224 ++++----
 po/nds/ktorrent.po                                 | 2180 ++++---
 po/nl/ktorrent.po                                  | 2196 ++++---
 po/nn/ktorrent.po                                  | 2790 +++++-----
 po/oc/ktorrent.po                                  | 2077 ++++---
 po/pl/ktorrent.po                                  | 2144 ++++---
 po/pt/ktorrent.po                                  | 2069 ++++---
 po/pt_BR/ktorrent.po                               | 2093 ++++---
 po/ro/ktorrent.po                                  | 2379 ++++----
 po/ru/ktorrent.po                                  | 2187 ++++---
 po/se/ktorrent.po                                  | 2065 ++++---
 po/sk/ktorrent.po                                  | 2090 ++++---
 po/sl/ktorrent.po                                  | 2193 ++++---
 po/sr/ktorrent.po                                  | 3015 +++++-----
 po/sv/ktorrent.po                                  | 2089 ++++---
 po/tr/ktorrent.po                                  | 2150 ++++---
 po/uk/ktorrent.po                                  | 2119 ++++---
 po/zh_CN/ktorrent.po                               | 2142 ++++---
 po/zh_TW/ktorrent.po                               | 2150 ++++---
 scripts/gen_kde4_pkg_stable.rb                     |    2 +-
 scripts/kcfg_qobject_gen.py                        |  240 +
 222 files changed, 64757 insertions(+), 53116 deletions(-)

-- 
KTorrent Debian packaging.



More information about the pkg-kde-commits mailing list