[SCM] Konversation packaging for Debian branch, master, updated. debian/1.4-1-9-g8644614

Diane Trout diane-guest at moszumanska.debian.org
Tue Feb 25 17:25:42 UTC 2014


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/konversation.git;a=commitdiff;h=71b808a

The following commit has been merged in the master branch:
commit 71b808a672e03bf0f56c0f93cb448b9355f37df0
Author: Diane Trout <diane at ghic.org>
Date:   Thu Feb 20 15:23:03 2014 -0800

    Imported Upstream version 1.5
---
 CMakeLists.txt                                     |     4 +-
 ChangeLog                                          |   351 +-
 README                                             |     2 +-
 config-konversation.h.cmake                        |     2 +-
 data/images/nickicons/alternative/index.desktop    |    22 +-
 data/images/nickicons/alternative/irc_normal.png   |   Bin 747 -> 686 bytes
 data/images/nickicons/christmas/index.desktop      |    18 +-
 data/images/nickicons/classic/index.desktop        |    14 +-
 data/images/nickicons/default/index.desktop        |    13 +-
 data/images/nickicons/simplistic/index.desktop     |    16 +-
 data/images/nickicons/smiling/index.desktop        |    18 +-
 data/images/nickicons/square/index.desktop         |    18 +-
 data/konversation.desktop                          |    14 +-
 data/konversation.notifyrc                         |   319 +-
 data/scripting_support/python/konversation/dbus.py |     7 +-
 data/scripting_support/python/konversation/i18n.py |    13 +-
 data/scripts/CMakeLists.txt                        |     1 -
 data/scripts/README                                |     3 -
 data/scripts/bug                                   |    71 +-
 data/scripts/cmd                                   |    19 +-
 data/scripts/kdeversion                            |     8 -
 data/scripts/media                                 |   726 +-
 data/scripts/sayclip                               |    58 +-
 data/scripts/sysinfo                               |   323 +-
 doc-translations/CMakeLists.txt                    |     4 +
 .../konversation/CMakeLists.txt                    |     2 +-
 .../ca_konversation/konversation/index.docbook     |  6353 ++++++++
 .../de_konversation/konversation/index.docbook     |   278 +-
 .../konversation/CMakeLists.txt                    |     2 +-
 .../es_konversation/konversation/index.docbook     |  6355 ++++++++
 .../konversation/CMakeLists.txt                    |     2 +-
 .../fr_konversation/konversation/index.docbook     |  6339 ++++++++
 .../konversation/CMakeLists.txt                    |     2 +-
 .../it_konversation/konversation/index.docbook     |  6389 ++++++++
 .../nl_konversation/konversation/index.docbook     |   332 +-
 .../pt_BR_konversation/konversation/index.docbook  |   338 +-
 .../sv_konversation/konversation/index.docbook     |   130 +-
 .../uk_konversation/konversation/index.docbook     |    98 +-
 doc/format-text-color.png                          |   Bin 601 -> 653 bytes
 doc/index.docbook                                  |   320 +-
 doc/irc_admin.png                                  |   Bin 744 -> 742 bytes
 doc/irc_away.png                                   |   Bin 452 -> 426 bytes
 doc/irc_halfop.png                                 |   Bin 741 -> 742 bytes
 doc/irc_normal.png                                 |   Bin 736 -> 723 bytes
 doc/irc_op.png                                     |   Bin 753 -> 762 bytes
 doc/irc_owner.png                                  |   Bin 731 -> 736 bytes
 doc/irc_voice.png                                  |   Bin 730 -> 742 bytes
 po/CMakeLists.txt                                  |     7 +-
 po/bg/konversation.po                              | 14624 ++++++++---------
 po/bs/konversation.po                              | 14296 ++++++++---------
 po/ca/konversation.po                              | 15015 +++++++++---------
 po/ca at valencia/konversation.po                     | 14763 +++++++++--------
 po/cs/konversation.po                              | 13237 ++++++++--------
 po/da/konversation.po                              | 14971 +++++++++--------
 po/de/konversation.po                              | 14478 +++++++++--------
 po/el/konversation.po                              | 14403 +++++++++--------
 po/en_GB/konversation.po                           | 15025 +++++++++---------
 po/es/konversation.po                              | 14458 +++++++++--------
 po/et/konversation.po                              | 14860 +++++++++--------
 po/fi/konversation.po                              | 15173 +++++++++---------
 po/fr/konversation.po                              | 14636 +++++++++--------
 po/gl/konversation.po                              | 15321 +++++++++---------
 po/he/CMakeLists.txt                               |     2 +
 po/{cs => he}/konversation.po                      | 14365 +++++++++--------
 po/hu/konversation.po                              | 15238 +++++++++---------
 po/it/konversation.po                              | 14364 +++++++++--------
 po/ja/CMakeLists.txt                               |     2 -
 po/ja/konversation.po                              | 10143 ------------
 po/kk/CMakeLists.txt                               |     2 +
 po/kk/konversation.po                              |  9106 +++++++++++
 po/km/CMakeLists.txt                               |     2 +
 po/km/konversation.po                              |  9035 +++++++++++
 po/lt/CMakeLists.txt                               |     2 +
 po/{cs => lt}/konversation.po                      | 14554 +++++++++--------
 po/nb/konversation.po                              | 14849 +++++++++--------
 po/nds/konversation.po                             | 14175 ++++++++---------
 po/nl/konversation.po                              | 15144 +++++++++---------
 po/pl/konversation.po                              | 14363 +++++++++--------
 po/pt/konversation.po                              | 15082 +++++++++---------
 po/pt_BR/konversation.po                           | 14259 ++++++++---------
 po/ru/konversation.po                              | 14591 ++++++++---------
 po/si/konversation.po                              | 13675 ++++++++--------
 po/sk/CMakeLists.txt                               |     2 +
 po/{cs => sk}/konversation.po                      | 14591 +++++++++--------
 po/sl/CMakeLists.txt                               |     2 +
 po/{si => sl}/konversation.po                      | 14509 ++++++++---------
 po/sr/konversation.po                              | 15326 +++++++++---------
 po/sr at ijekavian/konversation.po                    | 15350 +++++++++---------
 po/sr at ijekavianlatin/konversation.po               | 15361 +++++++++---------
 po/sr at latin/konversation.po                        | 15365 +++++++++---------
 po/sv/konversation.po                              | 14979 +++++++++--------
 po/tr/konversation.po                              | 15870 +++++++++----------
 po/uk/konversation.po                              | 15379 +++++++++---------
 po/zh_CN/konversation.po                           | 14605 +++++++++--------
 po/zh_TW/konversation.po                           | 13765 ++++++++--------
 src/CMakeLists.txt                                 |    20 +-
 src/application.cpp                                |   162 +-
 src/application.h                                  |     7 +-
 src/awaymanager.cpp                                |     9 +-
 src/awaymanager.h                                  |     2 +-
 src/commit.h                                       |     2 +-
 src/common.cpp                                     |    22 +-
 src/common.h                                       |     7 +-
 src/config/autoreplace_configui.ui                 |     3 +
 src/config/connectionbehavior_config.h             |     2 +-
 src/config/connectionbehavior_config.ui            |    51 +-
 src/config/dcc_configui.ui                         |     2 +
 src/config/fontappearance_config.ui                |    88 +-
 src/config/highlight_config.cpp                    |    22 +-
 src/config/highlight_config.h                      |     1 +
 src/config/highlight_configui.ui                   |    58 +-
 src/config/ignore_config.cpp                       |     7 +-
 src/config/ignore_configui.ui                      |     8 +
 src/config/konversation.kcfg                       |    10 +
 src/config/log_config.ui                           |    90 +-
 src/config/preferences.cpp                         |    57 +-
 src/config/preferences.h                           |    12 +-
 src/config/quickbuttons_configui.ui                |    84 +-
 src/config/settingsdialog.cpp                      |     8 +-
 src/config/settingsdialog.h                        |     2 -
 src/config/theme_configui.ui                       |     2 +-
 src/config/warnings_config.cpp                     |    13 +-
 src/dbus.cpp                                       |    11 +-
 src/dbus.h                                         |     4 +-
 src/dcc/chat.h                                     |     2 +-
 src/dcc/chatcontainer.cpp                          |    53 +-
 src/dcc/chatcontainer.h                            |     7 -
 src/dcc/dcccommon.cpp                              |    14 +
 src/dcc/dcccommon.h                                |     3 +
 src/dcc/transfer.cpp                               |    13 +-
 src/dcc/transfer.h                                 |     1 +
 src/dcc/transferdetailedinfopanel.cpp              |    18 +-
 src/dcc/transferdetailedinfopanel.h                |     2 +
 src/dcc/transferlistmodel.cpp                      |     4 -
 src/dcc/transferlistmodel.h                        |    18 +-
 src/dcc/transfermanager.h                          |     2 +-
 src/dcc/transferpanel.cpp                          |    56 +-
 src/dcc/transferpanel.h                            |    13 +-
 src/dcc/transferrecv.h                             |     2 +-
 src/dcc/transfersend.h                             |     2 +-
 src/dcc/transferview.cpp                           |    23 +-
 src/dcc/transferview.h                             |    13 +-
 src/dcc/whiteboard.h                               |     4 +-
 src/dcc/whiteboardcolorchooser.h                   |     2 +-
 src/dcc/whiteboardfontchooser.h                    |     2 +-
 src/dcc/whiteboardpaintarea.cpp                    |     8 +-
 src/dcc/whiteboardpaintarea.h                      |     2 +-
 src/dcc/whiteboardtoolbar.cpp                      |     2 +-
 src/dcc/whiteboardtoolbar.h                        |     2 +-
 src/identity.cpp                                   |    33 +-
 src/identity.h                                     |    32 +-
 src/identitydialog.cpp                             |    97 +-
 src/identitydialog.h                               |    19 +-
 src/identitydialog.ui                              |   117 +-
 src/irc/channel.cpp                                |   537 +-
 src/irc/channel.h                                  |    62 +-
 src/irc/channellistpanel.cpp                       |     4 +-
 src/irc/channellistpanel.h                         |     8 +-
 src/irc/inputfilter.cpp                            |   169 +-
 src/irc/inputfilter.h                              |     3 +-
 src/irc/invitedialog.cpp                           |     8 +
 src/irc/invitedialog.h                             |     4 +-
 src/irc/ircqueue.cpp                               |     5 +-
 src/irc/nickinfo.cpp                               |     2 +-
 src/irc/nicklistview.cpp                           |    45 +-
 src/irc/nicksonline.cpp                            |     2 +-
 src/irc/outputfilter.cpp                           |    54 +-
 src/irc/outputfilter.h                             |     3 +-
 src/irc/outputfilterresolvejob.h                   |     2 +-
 src/irc/query.cpp                                  |    67 +-
 src/irc/query.h                                    |     7 +-
 src/irc/replycodes.h                               |    10 +
 src/irc/server.cpp                                 |   365 +-
 src/irc/server.h                                   |    56 +-
 src/irc/servergroupsettings.h                      |     8 +-
 src/irc/serverison.cpp                             |     1 +
 src/irc/serverison.h                               |     5 +-
 src/irc/serverlistdialog.cpp                       |    10 +
 src/irc/serverlistview.cpp                         |     2 +-
 src/irc/topichistorymodel.cpp                      |   216 +
 src/irc/topichistorymodel.h                        |    91 +
 src/konsolepanel.cpp                               |     9 +-
 src/main.cpp                                       |    25 +-
 src/mainwindow.cpp                                 |    66 +-
 src/mainwindow.h                                   |     1 -
 src/notificationhandler.cpp                        |    24 +-
 src/notificationhandler.h                          |     8 +-
 src/queuetuner.cpp                                 |    10 +-
 src/scriptlauncher.cpp                             |     2 +-
 src/ssllabel.h                                     |     4 +-
 src/upnp/upnprouter.cpp                            |     2 +-
 src/urlcatcher.cpp                                 |    14 +
 src/urlcatcher.h                                   |     1 +
 src/version.h                                      |     2 +-
 src/{irc => viewer}/channeloptionsdialog.cpp       |   252 +-
 src/{irc => viewer}/channeloptionsdialog.h         |    34 +-
 src/{irc => viewer}/channeloptionsui.ui            |   110 +-
 src/viewer/chatwindow.cpp                          |    53 +-
 src/viewer/chatwindow.h                            |    14 +-
 src/viewer/highlight.cpp                           |    14 +-
 src/viewer/highlight.h                             |     6 +-
 src/viewer/highlightviewitem.cpp                   |    25 +-
 src/viewer/highlightviewitem.h                     |    18 +-
 src/viewer/ignore.h                                |    16 +-
 src/viewer/ignorelistviewitem.cpp                  |     1 +
 src/viewer/images.cpp                              |     6 +
 src/viewer/images.h                                |     2 +
 src/viewer/irccontextmenus.cpp                     |   165 +-
 src/viewer/irccontextmenus.h                       |    28 +-
 src/viewer/ircinput.cpp                            |   100 +-
 src/viewer/ircinput.h                              |    15 +-
 src/viewer/ircview.cpp                             |   120 +-
 src/viewer/ircview.h                               |     6 +-
 src/viewer/ircviewbox.h                            |     2 +-
 src/viewer/logfilereader.cpp                       |     3 +-
 src/viewer/logfilereader.h                         |     2 +-
 src/viewer/osd.cpp                                 |     7 +-
 src/viewer/pasteeditor.cpp                         |    60 +-
 src/viewer/pasteeditor.h                           |    17 +-
 src/viewer/quickbutton.h                           |     2 -
 src/viewer/rawlog.cpp                              |     6 +-
 src/viewer/rawlog.h                                |     2 +-
 src/viewer/searchbar.cpp                           |    25 +-
 src/viewer/statuspanel.cpp                         |    58 +-
 src/viewer/statuspanel.h                           |     7 +-
 src/viewer/topicedit.cpp                           |   339 +
 src/viewer/topicedit.h                             |    81 +
 src/viewer/topichistoryview.cpp                    |   354 +
 src/viewer/topichistoryview.h                      |   142 +
 src/viewer/topiclabel.cpp                          |    18 +-
 src/viewer/trayicon.cpp                            |    16 +-
 src/viewer/trayicon.h                              |     5 +-
 src/viewer/viewcontainer.cpp                       |   121 +-
 src/viewer/viewcontainer.h                         |     9 +-
 src/viewer/viewspringloader.cpp                    |   121 +
 .../viewspringloader.h}                            |    34 +-
 src/viewer/viewtree.cpp                            |    19 +-
 src/viewer/viewtreeitem.cpp                        |     4 +-
 238 files changed, 317015 insertions(+), 290978 deletions(-)

The diff has been stripped from this email because it exceeds 50KB


-- 
Konversation packaging for Debian



More information about the pkg-kde-commits mailing list