[SCM] KTorrent Debian packaging. branch, experimental, updated. debian/3.2.5+dfsg.1-1-22-g17ebbd1

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


The following commit has been merged in the experimental branch:
commit 247a753bd177a4ad590b515f246c41149a1c25e2
Merge: 6ddfd061dde5f84f5aa81e47f1ac0934e6e28541 742dff5819400c77d51dfb378952217bec60e086
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Oct 25 16:19:18 2009 +0200

    Merge branch 'upstream-exp' into experimental

 ChangeLog                                          |   42 +-
 ktorrent/btpref.cpp                                |    6 +
 ktorrent/btpref.ui                                 |   14 +-
 ktorrent/core.cpp                                  |   95 +-
 ktorrent/core.h                                    |    6 +-
 ktorrent/fileselectdlg.cpp                         |  110 +-
 ktorrent/fileselectdlg.h                           |    5 +-
 ktorrent/fileselectdlg.ui                          |   25 +-
 ktorrent/generalpref.cpp                           |    8 +-
 ktorrent/groupview.cpp                             |    2 +
 ktorrent/gui.cpp                                   |   17 +-
 ktorrent/gui.h                                     |    3 +-
 ktorrent/importdialog.cpp                          |   18 +-
 ktorrent/ktorrent.desktop                          |   51 +-
 ktorrent/ktorrent.notifyrc                         |   56 +-
 ktorrent/ktorrentplugin.desktop                    |    5 +-
 ktorrent/ktorrentui.rc                             |    6 +-
 ktorrent/missingfilesdlg.cpp                       |    8 -
 ktorrent/missingfilesdlg.h                         |    3 +-
 ktorrent/missingfilesdlg.ui                        |   86 +-
 ktorrent/scanlistener.cpp                          |    6 +
 ktorrent/scanlistener.h                            |    3 +
 ktorrent/torrentactivity.cpp                       |    6 +
 ktorrent/torrentactivity.h                         |    5 +
 ktorrent/torrentcreatordlg.cpp                     |    2 +-
 ktorrent/trayicon.h                                |    2 +-
 ktorrent/view.cpp                                  |   20 +-
 ktorrent/view.h                                    |    1 +
 ktorrent/viewdelegate.cpp                          |   30 +-
 ktorrent/viewdelegate.h                            |    2 +
 ktorrent/viewmanager.cpp                           |    1 +
 ktorrent/viewmodel.cpp                             |   32 +-
 ktorrent/viewmodel.h                               |    3 +-
 libbtcore/CMakeLists.txt                           |    2 +
 libbtcore/btversion.h                              |    2 +-
 libbtcore/dht/announcetask.cpp                     |   16 +-
 libbtcore/dht/dht.cpp                              |    7 +-
 libbtcore/dht/dhttrackerbackend.cpp                |    3 +
 libbtcore/dht/kbucket.h                            |    2 +-
 libbtcore/dht/nodelookup.cpp                       |    4 +-
 libbtcore/dht/rpcmsg.cpp                           |   11 +-
 libbtcore/dht/rpcserver.cpp                        |  198 +-
 libbtcore/dht/rpcserver.h                          |   37 +-
 libbtcore/diskio/multifilecache.cpp                |    7 +
 libbtcore/diskio/singlefilecache.cpp               |    3 +-
 libbtcore/download/chunkdownload.cpp               |   16 +-
 libbtcore/download/chunkdownload.h                 |   22 +-
 libbtcore/net/reverseresolver.cpp                  |  140 +
 .../decompressfilejob.h => net/reverseresolver.h}  |   90 +-
 libbtcore/peer/peer.cpp                            |   14 +-
 libbtcore/peer/peer.h                              |    3 +-
 libbtcore/torrent/globals.cpp                      |    5 +-
 libbtcore/torrent/torrentcontrol.cpp               |    9 +-
 libbtcore/torrent/torrentstats.h                   |    4 +
 libbtcore/tracker/httpannouncejob.cpp              |   46 +-
 libbtcore/tracker/httpannouncejob.h                |    5 +-
 libbtcore/tracker/httptracker.cpp                  |    1 +
 libbtcore/tracker/trackermanager.cpp               |    3 +-
 libbtcore/tracker/trackermanager.h                 |    2 +-
 libbtcore/tracker/udptracker.cpp                   |   19 +-
 libbtcore/tracker/udptracker.h                     |    4 +-
 libbtcore/util/log.cpp                             |    6 +-
 libktcore/interfaces/coreinterface.h               |   10 -
 libktcore/interfaces/guiinterface.h                |    2 +-
 libktcore/ktversion.h                              |    6 +-
 libktcore/torrent/queuemanager.cpp                 |   21 +
 libktcore/torrent/queuemanager.h                   |    6 +
 libktcore/torrent/torrentfilelistmodel.cpp         |    6 +-
 libktcore/util/treefiltermodel.cpp                 |    1 +
 libktupnp/CMakeLists.txt                           |    2 -
 plasma/applet/applet.cpp                           |    2 +-
 plasma/applet/fadingitem.h                         |    3 +
 plasma/applet/plasma-applet-ktorrent.desktop       |   45 +-
 .../dataengine/plasma-dataengine-ktorrent.desktop  |   41 +-
 plugins/CMakeLists.txt                             |    6 +-
 plugins/bwscheduler/additemdlg.cpp                 |    3 +-
 plugins/bwscheduler/bwschedulerplugin.cpp          |    8 +
 plugins/bwscheduler/bwschedulerplugin.h            |    1 +
 plugins/bwscheduler/edititemdlg.cpp                |    3 +-
 plugins/bwscheduler/ktbwschedulerplugin.desktop    |   16 +-
 plugins/bwscheduler/schedule.cpp                   |   14 +-
 plugins/bwscheduler/schedule.h                     |    3 +
 plugins/bwscheduler/weekscene.cpp                  |    2 -
 .../downloadorder/ktdownloadorderplugin.desktop    |   15 +-
 plugins/infowidget/infowidgetplugin.cpp            |   17 +-
 plugins/infowidget/infowidgetplugin.h              |    1 +
 plugins/infowidget/ktinfowidgetplugin.desktop      |   15 +-
 plugins/infowidget/statustab.ui                    |  228 +-
 plugins/ipfilter/antip2p.cpp                       |   12 +
 plugins/ipfilter/antip2p.h                         |   12 +-
 plugins/ipfilter/convertthread.cpp                 |   60 +-
 plugins/ipfilter/ktipfilterplugin.desktop          |   16 +-
 plugins/logviewer/ktlogviewerplugin.desktop        |   15 +-
 plugins/mediaplayer/ktmediaplayerplugin.desktop    |   16 +-
 plugins/mediaplayer/mediaplayeractivity.cpp        |   27 +-
 plugins/mediaplayer/playlist.cpp                   |   78 +-
 plugins/mediaplayer/playlist.h                     |    6 +-
 plugins/mediaplayer/playlistwidget.cpp             |   87 +-
 plugins/mediaplayer/playlistwidget.h               |   16 +
 plugins/scanfolder/ktscanfolderplugin.desktop      |   16 +-
 plugins/scanfolder/scanfolder.cpp                  |   11 +-
 plugins/scanfolder/scanfolderprefpage.cpp          |    2 +-
 plugins/scripting/ktscriptingplugin.desktop        |   17 +-
 .../scripts/auto_remove/auto_remove.desktop        |   15 +-
 .../scripts/auto_resume/auto_resume.desktop        |    5 +
 .../email_notifications.desktop                    |    6 +
 .../scripts/tracker_groups/tracker_groups.desktop  |    9 +-
 plugins/search/CMakeLists.txt                      |    2 +
 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 +
 .../gui/activitybar.h => plugins/search/homepage.h |   47 +-
 plugins/search/htmlpart.cpp                        |   28 +-
 plugins/search/htmlpart.h                          |    6 +-
 plugins/search/ktsearchplugin.desktop              |   16 +-
 plugins/search/searchactivity.cpp                  |    7 +-
 plugins/search/searchwidget.cpp                    |   28 +-
 plugins/search/searchwidget.h                      |    3 +-
 plugins/shutdown/ktshutdownplugin.desktop          |   15 +-
 plugins/shutdown/shutdownruleset.cpp               |    2 +-
 plugins/stats/CMakeLists.txt                       |    1 -
 plugins/stats/ktstatsplugin.desktop                |   16 +-
 plugins/syndication/feedlist.cpp                   |    2 +-
 plugins/syndication/feedlistview.cpp               |    1 +
 plugins/syndication/filtereditor.cpp               |    2 +-
 plugins/syndication/ktsyndicationplugin.desktop    |   13 +-
 plugins/syndication/syndicationactivity.cpp        |    7 +
 plugins/syndication/syndicationactivity.h          |    1 +
 plugins/syndication/syndicationplugin.cpp          |    4 +
 plugins/syndication/syndicationplugin.h            |    1 +
 plugins/syndication/syndicationtab.cpp             |    1 +
 plugins/upnp/ktupnpplugin.desktop                  |   36 +-
 plugins/webinterface/httpclienthandler.cpp         |   12 +-
 plugins/webinterface/httpclienthandler.h           |    5 +-
 plugins/webinterface/httpserver.cpp                |   32 +-
 plugins/webinterface/ktwebinterfaceplugin.desktop  |   16 +-
 plugins/webinterface/ktwebinterfaceplugin.kcfg     |    4 +
 plugins/webinterface/settingsgenerator.cpp         |   19 +-
 plugins/webinterface/torrentposthandler.cpp        |    7 +-
 plugins/webinterface/webinterfaceprefwidget.cpp    |   17 +-
 plugins/webinterface/www/coldmilk/coldmilk.html    |   16 +-
 plugins/webinterface/www/coldmilk/coldmilk.js      |   83 +-
 plugins/webinterface/www/coldmilk/page_update.js   |   50 +-
 plugins/webinterface/www/default/interface.html    |   10 +-
 plugins/webinterface/www/default/interface.js      |   51 +-
 plugins/zeroconf/ktzeroconfplugin.desktop          |   29 +-
 po/CMakeLists.txt                                  |    5 +-
 po/ar/ktorrent.po                                  | 1794 ++--
 po/be/ktorrent.po                                  | 1752 ++--
 po/bg/ktorrent.po                                  | 3434 ++----
 po/ca/ktorrent.po                                  | 2838 +++---
 po/cs/ktorrent.po                                  | 2078 ++--
 po/da/ktorrent.po                                  | 1812 ++--
 po/de/ktorrent.po                                  | 1965 ++--
 po/el/ktorrent.po                                  | 1825 ++--
 po/en_GB/ktorrent.po                               | 1937 ++--
 po/eo/CMakeLists.txt                               |    2 -
 po/eo/ktorrent.po                                  |11903 --------------------
 po/es/ktorrent.po                                  | 1794 ++--
 po/et/ktorrent.po                                  | 2662 ++---
 po/eu/ktorrent.po                                  | 4912 +++------
 po/fi/CMakeLists.txt                               |    2 -
 po/fi/ktorrent.po                                  |10634 -----------------
 po/fr/ktorrent.po                                  | 1854 ++--
 po/ga/ktorrent.po                                  | 1831 ++--
 po/gl/ktorrent.po                                  | 2314 ++--
 po/hi/ktorrent.po                                  | 1753 ++--
 po/hne/ktorrent.po                                 | 1763 ++--
 po/hr/CMakeLists.txt                               |    2 +
 po/{se => hr}/ktorrent.po                          | 5369 ++++------
 po/hu/ktorrent.po                                  | 5122 ++++++----
 po/is/ktorrent.po                                  | 1791 ++--
 po/it/ktorrent.po                                  | 1814 ++--
 po/ja/ktorrent.po                                  | 1809 ++--
 po/km/ktorrent.po                                  | 1825 ++--
 po/ku/CMakeLists.txt                               |    2 -
 po/lt/ktorrent.po                                  | 2151 ++--
 po/lv/ktorrent.po                                  | 1821 ++--
 po/mai/CMakeLists.txt                              |    2 +
 po/{ku => mai}/ktorrent.po                         | 2984 +++---
 po/ms/ktorrent.po                                  | 1756 ++--
 po/nb/ktorrent.po                                  | 4773 ++------
 po/nds/ktorrent.po                                 | 2230 ++--
 po/nl/ktorrent.po                                  | 2802 +++---
 po/nn/ktorrent.po                                  | 3898 +++----
 po/oc/ktorrent.po                                  | 1750 ++--
 po/pl/ktorrent.po                                  | 2706 ++---
 po/pt/ktorrent.po                                  | 1789 ++--
 po/pt_BR/ktorrent.po                               | 1818 ++--
 po/ro/ktorrent.po                                  | 1824 ++--
 po/ru/ktorrent.po                                  | 1842 ++--
 po/se/ktorrent.po                                  | 2328 ++---
 po/sk/ktorrent.po                                  | 1791 ++--
 po/sl/ktorrent.po                                  | 1823 ++--
 po/sr/ktorrent.po                                  | 1689 ++--
 po/sv/ktorrent.po                                  | 1791 ++--
 po/tr/ktorrent.po                                  | 2491 ++---
 po/uk/ktorrent.po                                  | 1799 ++--
 po/zh_CN/ktorrent.po                               | 1810 ++--
 po/zh_TW/ktorrent.po                               | 1805 ++--
 scripts/gen_kde4_pkg.rb                            |    2 +-
 scripts/gen_kde4_pkg_stable.rb                     |    2 +-
 215 files changed, 54034 insertions(+), 79403 deletions(-)

-- 
KTorrent Debian packaging.



More information about the pkg-kde-commits mailing list