[SCM] Konversation packaging for Debian branch, master, updated. debian/1.3.1+git457.g8b28316-1

Modestas Vainius modax at alioth.debian.org
Sat Jul 30 18:44:31 UTC 2011


The following commit has been merged in the master branch:
commit ad0c63a51c4f0fd6fc61b560c435c7a3b135cad7
Merge: b253305efbc42cd849966d16fd7558613dd9db90 0115b8e91629233f64392388f781da2fa6516545
Author: Modestas Vainius <modax at debian.org>
Date:   Sat Jul 30 14:32:10 2011 +0300

    Merge branch 'upstream' into a

 .gitignore                                         |    2 +
 CMakeLists.txt                                     |   54 +-
 ChangeLog                                          |  139 +-
 Messages.sh                                        |    4 +-
 NEWS                                               |    3 +
 config-konversation.h.cmake                        |    7 +-
 data/CMakeLists.txt                                |    1 +
 data/images/nickicons/alternative/index.desktop    |   10 +-
 data/images/nickicons/christmas/index.desktop      |    8 +-
 data/images/nickicons/classic/index.desktop        |    8 +-
 data/images/nickicons/default/index.desktop        |    8 +-
 data/images/nickicons/simplistic/index.desktop     |   12 +-
 data/images/nickicons/smiling/index.desktop        |   10 +-
 data/images/nickicons/square/index.desktop         |   10 +-
 data/konversation.desktop                          |    4 +
 data/konversation.notifyrc                         |  117 +-
 data/scripting_support/CMakeLists.txt              |    1 +
 data/scripting_support/python/CMakeLists.txt       |    1 +
 .../python/konversation/CMakeLists.txt             |    5 +
 .../python/konversation/__init__.py                |   12 +
 data/scripting_support/python/konversation/dbus.py |   98 +
 data/scripting_support/python/konversation/i18n.py |  143 +
 data/scripts/cmd                                   |   87 +-
 data/scripts/media                                 |  363 +-
 doc/index.docbook                                  |    4 +-
 po/CMakeLists.txt                                  |   65 +
 po/ar/CMakeLists.txt                               |    2 +
 po/ar/konversation.po                              |10438 ++++++++++++++++++
 po/bg/CMakeLists.txt                               |    2 +
 po/bg/konversation.po                              |10148 +++++++++++++++++
 po/br/CMakeLists.txt                               |    2 +
 po/br/konversation.po                              | 9487 ++++++++++++++++
 po/bs/CMakeLists.txt                               |    2 +
 po/bs/konversation.po                              | 9530 ++++++++++++++++
 po/ca/CMakeLists.txt                               |    2 +
 po/ca/konversation.po                              | 9588 ++++++++++++++++
 po/ca at valencia/CMakeLists.txt                      |    2 +
 po/ca at valencia/konversation.po                     | 9583 ++++++++++++++++
 po/cs/CMakeLists.txt                               |    2 +
 po/cs/konversation.po                              | 9195 ++++++++++++++++
 po/cy/CMakeLists.txt                               |    2 +
 po/cy/konversation.po                              | 9373 ++++++++++++++++
 po/da/CMakeLists.txt                               |    2 +
 po/da/konversation.po                              |10182 +++++++++++++++++
 po/de/CMakeLists.txt                               |    2 +
 po/de/konversation.po                              |10073 +++++++++++++++++
 po/el/CMakeLists.txt                               |    2 +
 po/el/konversation.po                              |10067 +++++++++++++++++
 po/en_GB/CMakeLists.txt                            |    2 +
 po/en_GB/konversation.po                           |10029 +++++++++++++++++
 po/eo/CMakeLists.txt                               |    2 +
 po/eo/konversation.po                              | 9089 +++++++++++++++
 po/es/CMakeLists.txt                               |    2 +
 po/es/konversation.po                              | 9807 +++++++++++++++++
 po/et/CMakeLists.txt                               |    2 +
 po/et/konversation.po                              | 9691 ++++++++++++++++
 po/fi/CMakeLists.txt                               |    2 +
 po/fi/konversation.po                              |10093 +++++++++++++++++
 po/fr/CMakeLists.txt                               |    2 +
 po/fr/konversation.po                              | 9767 +++++++++++++++++
 po/ga/CMakeLists.txt                               |    2 +
 po/ga/konversation.po                              | 9622 ++++++++++++++++
 po/gl/CMakeLists.txt                               |    2 +
 po/gl/konversation.po                              |10368 +++++++++++++++++
 po/he/CMakeLists.txt                               |    2 +
 po/he/konversation.po                              | 9736 ++++++++++++++++
 po/hi/CMakeLists.txt                               |    2 +
 po/hi/konversation.po                              | 9829 +++++++++++++++++
 po/hr/CMakeLists.txt                               |    2 +
 po/hr/konversation.po                              | 8967 +++++++++++++++
 po/hu/CMakeLists.txt                               |    2 +
 po/hu/konversation.po                              |10183 +++++++++++++++++
 po/is/CMakeLists.txt                               |    2 +
 po/is/konversation.po                              | 9281 ++++++++++++++++
 po/it/CMakeLists.txt                               |    2 +
 po/it/konversation.po                              |10034 +++++++++++++++++
 po/ja/CMakeLists.txt                               |    2 +
 po/ja/konversation.po                              |10034 +++++++++++++++++
 po/ka/CMakeLists.txt                               |    2 +
 po/ka/konversation.po                              |10371 +++++++++++++++++
 po/km/CMakeLists.txt                               |    2 +
 po/km/konversation.po                              |10069 +++++++++++++++++
 po/ko/CMakeLists.txt                               |    2 +
 po/ko/konversation.po                              | 9497 ++++++++++++++++
 po/lt/CMakeLists.txt                               |    2 +
 po/lt/konversation.po                              | 9389 ++++++++++++++++
 po/ms/CMakeLists.txt                               |    2 +
 po/ms/konversation.po                              | 9647 ++++++++++++++++
 po/mt/CMakeLists.txt                               |    2 +
 po/mt/konversation.po                              | 9391 ++++++++++++++++
 po/nb/CMakeLists.txt                               |    2 +
 po/nb/konversation.po                              | 9404 ++++++++++++++++
 po/nds/CMakeLists.txt                              |    2 +
 po/nds/konversation.po                             | 9865 +++++++++++++++++
 po/nl/CMakeLists.txt                               |    2 +
 po/nl/konversation.po                              | 9869 +++++++++++++++++
 po/pa/CMakeLists.txt                               |    2 +
 po/pa/konversation.po                              | 9303 ++++++++++++++++
 po/pl/CMakeLists.txt                               |    2 +
 po/pl/konversation.po                              | 9915 +++++++++++++++++
 po/pt/CMakeLists.txt                               |    2 +
 po/pt/konversation.po                              | 9552 ++++++++++++++++
 po/pt_BR/CMakeLists.txt                            |    2 +
 po/pt_BR/konversation.po                           | 9559 ++++++++++++++++
 po/ro/CMakeLists.txt                               |    2 +
 po/ro/konversation.po                              | 8981 +++++++++++++++
 po/ru/CMakeLists.txt                               |    2 +
 po/ru/konversation.po                              |10203 +++++++++++++++++
 po/rw/CMakeLists.txt                               |    2 +
 po/rw/konversation.po                              |11592 ++++++++++++++++++++
 po/si/CMakeLists.txt                               |    2 +
 po/si/konversation.po                              | 8884 +++++++++++++++
 po/sk/CMakeLists.txt                               |    2 +
 po/sk/konversation.po                              | 9397 ++++++++++++++++
 po/sl/CMakeLists.txt                               |    2 +
 po/sl/konversation.po                              | 9926 +++++++++++++++++
 po/sq/CMakeLists.txt                               |    2 +
 po/sq/konversation.po                              | 8890 +++++++++++++++
 po/sr/CMakeLists.txt                               |    2 +
 po/sr/konversation.po                              | 9627 ++++++++++++++++
 po/sr at ijekavian/CMakeLists.txt                     |    2 +
 po/sr at ijekavian/konversation.po                    | 9631 ++++++++++++++++
 po/sr at ijekavianlatin/CMakeLists.txt                |    2 +
 po/sr at ijekavianlatin/konversation.po               | 9636 ++++++++++++++++
 po/sr at latin/CMakeLists.txt                         |    2 +
 po/sr at latin/konversation.po                        | 9632 ++++++++++++++++
 po/sv/CMakeLists.txt                               |    2 +
 po/sv/konversation.po                              | 9751 ++++++++++++++++
 po/ta/CMakeLists.txt                               |    2 +
 po/ta/konversation.po                              | 9797 +++++++++++++++++
 po/tr/CMakeLists.txt                               |    2 +
 po/tr/konversation.po                              |10296 +++++++++++++++++
 po/ug/CMakeLists.txt                               |    2 +
 po/ug/konversation.po                              | 8856 +++++++++++++++
 po/uk/CMakeLists.txt                               |    2 +
 po/uk/konversation.po                              |10133 +++++++++++++++++
 po/zh_CN/CMakeLists.txt                            |    2 +
 po/zh_CN/konversation.po                           | 9656 ++++++++++++++++
 po/zh_TW/CMakeLists.txt                            |    2 +
 po/zh_TW/konversation.po                           |10289 +++++++++++++++++
 src/CMakeLists.txt                                 |   44 +-
 src/abstractawaymanager.cpp                        |  197 -
 src/abstractawaymanager.h                          |  114 -
 src/application.cpp                                |   36 +-
 src/application.h                                  |    6 +-
 src/awaymanager.cpp                                |  430 +-
 src/awaymanager.h                                  |  148 +-
 src/awaymanagerkidletime.cpp                       |  183 -
 src/awaymanagerkidletime.h                         |  124 -
 src/cipher.cpp                                     |   51 +-
 src/cipher.h                                       |   11 +-
 src/commit.h                                       |    2 +-
 src/config/alias_config.cpp                        |   11 +-
 src/config/autoreplace_config.cpp                  |   17 +-
 src/config/chatwindowbehaviour_config.ui           |  182 +-
 src/config/connectionbehavior_config.cpp           |    2 +-
 src/config/dcc_config.cpp                          |   23 +-
 src/config/dcc_configui.ui                         |  107 +-
 src/config/generalbehavior_configui.ui             |  245 +-
 src/config/highlight_config.cpp                    |  448 +-
 src/config/highlight_config.h                      |    7 +-
 src/config/highlight_configui.ui                   |   42 +
 src/config/ignore_config.cpp                       |    6 +-
 src/config/konversation.kcfg                       |   12 +-
 src/config/osd_config.cpp                          |    8 +-
 src/config/preferences.cpp                         |   74 +-
 src/config/preferences.h                           |   13 +-
 src/config/quickbuttons_config.cpp                 |   13 +-
 src/config/settingsdialog.cpp                      |   16 +-
 src/config/theme_config.cpp                        |   10 +-
 src/config/warnings_config.cpp                     |    2 +-
 src/config/watchednicknames_config.cpp             |  353 -
 src/config/watchednicknames_config.h               |   59 -
 src/config/watchednicknames_configui.ui            |  201 +-
 src/connectionmanager.cpp                          |   16 +-
 src/dbus.cpp                                       |    6 +-
 src/dcc/chat.cpp                                   |    8 +-
 src/dcc/chatcontainer.cpp                          |   12 +-
 src/dcc/dcccommon.cpp                              |    2 +-
 src/dcc/dccfiledialog.cpp                          |   46 +
 src/dcc/dccfiledialog.h                            |   32 +
 src/dcc/recipientdialog.cpp                        |    4 +-
 src/dcc/resumedialog.cpp                           |   32 +-
 src/dcc/resumedialog.h                             |   12 +-
 src/dcc/transferdetailedinfopanel.cpp              |    6 +-
 src/dcc/transferdetailedinfopanelui.ui             |    2 +-
 src/dcc/transferlistmodel.cpp                      |    2 +-
 src/dcc/transfermanager.cpp                        |   18 +-
 src/dcc/transferpanel.cpp                          |   11 +-
 src/dcc/transferrecv.cpp                           |   32 +-
 src/dcc/transfersend.cpp                           |    4 +-
 src/dcc/transferview.cpp                           |   13 +-
 src/dcc/whiteboard.cpp                             |   68 +-
 src/dcc/whiteboardfontchooser.cpp                  |    8 +-
 src/dcc/whiteboardtoolbar.cpp                      |   14 +-
 src/guess_ja.h                                     |    6 +-
 src/identitydialog.cpp                             |   38 +-
 src/identitydialog.h                               |   16 +-
 src/identitydialog.ui                              |   37 +-
 src/irc/channel.cpp                                |  221 +-
 src/irc/channel.h                                  |   13 +-
 src/irc/channellistpanel.cpp                       |   10 +-
 src/irc/channeloptionsdialog.cpp                   |   12 +-
 src/irc/inputfilter.cpp                            |  482 +-
 src/irc/inputfilter.h                              |   12 +-
 src/irc/ircqueue.cpp                               |    2 +-
 src/irc/joinchanneldialog.cpp                      |   10 +-
 src/irc/nicklistview.cpp                           |   11 +-
 src/irc/nicklistview.h                             |    3 -
 src/irc/nicksonline.cpp                            |   10 +-
 src/irc/outputfilter.cpp                           |  216 +-
 src/irc/outputfilterresolvejob.cpp                 |   88 +
 src/irc/outputfilterresolvejob.h                   |   51 +
 src/irc/query.cpp                                  |   44 +-
 src/irc/query.h                                    |    3 +-
 src/irc/server.cpp                                 |  250 +-
 src/irc/server.h                                   |   11 +-
 src/irc/servergroupdialog.cpp                      |    4 +-
 src/irc/servergroupsettings.cpp                    |    6 +-
 src/irc/servergroupsettings.h                      |    2 +-
 src/irc/serverison.cpp                             |   18 +-
 src/irc/serverlistdialog.cpp                       |   26 +-
 src/irc/serverlistdialog.h                         |   14 +-
 src/konsolepanel.cpp                               |    2 +-
 src/linkaddressbook/addressbook.cpp                |    4 +-
 src/linkaddressbook/addressbook.h                  |    2 +-
 src/linkaddressbook/addressbook_base.cpp           |    2 +-
 src/linkaddressbook/linkaddressbookui.cpp          |   14 +-
 src/main.cpp                                       |    2 +-
 src/mainwindow.cpp                                 |   69 +-
 src/mainwindow.h                                   |    3 +-
 src/notificationhandler.cpp                        |   16 +-
 src/queuetuner.cpp                                 |   15 +-
 src/quickconnectdialog.cpp                         |    2 +-
 src/scriptlauncher.cpp                             |   20 +-
 src/sound.cpp                                      |   10 +-
 src/upnp/upnpmcastsocket.cpp                       |    6 +-
 src/upnp/upnprouter.cpp                            |    8 +-
 src/urlcatcher.cpp                                 |   10 +-
 src/viewer/awaylabel.cpp                           |   44 +
 src/viewer/awaylabel.h                             |   35 +
 src/viewer/chatwindow.cpp                          |   22 +-
 src/viewer/chatwindow.h                            |   10 +-
 src/viewer/editnotifydialog.cpp                    |    2 +-
 src/viewer/highlight.cpp                           |  105 +-
 src/viewer/highlight.h                             |   35 +-
 src/viewer/highlightviewitem.cpp                   |   91 +-
 src/viewer/highlightviewitem.h                     |   36 +-
 src/viewer/ignore.cpp                              |    4 +-
 src/viewer/ignore.h                                |    4 +-
 src/viewer/insertchardialog.cpp                    |   14 +-
 src/viewer/insertchardialog.h                      |    3 +-
 src/viewer/irccontextmenus.cpp                     |   17 +-
 src/viewer/ircinput.cpp                            |    6 +-
 src/viewer/ircview.cpp                             |  163 +-
 src/viewer/ircview.h                               |   10 +-
 src/viewer/ircviewbox.cpp                          |    4 +-
 src/viewer/osd.cpp                                 |    5 +-
 src/viewer/searchbar.cpp                           |    6 +-
 src/viewer/statuspanel.cpp                         |   15 +-
 src/viewer/statuspanel.h                           |    6 +-
 src/viewer/topiclabel.cpp                          |  178 +-
 src/viewer/topiclabel.h                            |   12 +-
 ...rayiconkstatusnotifieritem.cpp => trayicon.cpp} |    0
 src/viewer/trayicon.h                              |   27 +-
 src/viewer/trayiconksystemtray.cpp                 |   99 -
 src/viewer/viewcontainer.cpp                       |   88 +-
 src/viewer/viewtree.cpp                            |    2 +-
 src/viewer/viewtreeitem.cpp                        |    6 +
 269 files changed, 559288 insertions(+), 3599 deletions(-)

-- 
Konversation packaging for Debian



More information about the pkg-kde-commits mailing list