[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:30 UTC 2011


The following commit has been merged in the master branch:
commit b253305efbc42cd849966d16fd7558613dd9db90
Merge: 7fca6a2fd69790b05d91c8fc876ed49518629bd1 fcbde1c8d55719d258f506073ce88cf467dce30e
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sat Jul 30 13:56:40 2011 +0300

    Merge branch 'experimental'

 .gitignore                                         |    2 +
 CMakeLists.txt                                     |    6 +-
 ChangeLog                                          |  287 +
 data/CMakeLists.txt                                |    4 +-
 data/images/nickicons/alternative/index.desktop    |    2 +-
 data/images/nickicons/christmas/index.desktop      |    2 +-
 data/images/nickicons/classic/index.desktop        |    2 +-
 data/images/nickicons/default/index.desktop        |    2 +-
 data/images/nickicons/simplistic/index.desktop     |    2 +-
 data/images/nickicons/smiling/index.desktop        |    2 +-
 data/images/nickicons/square/index.desktop         |    2 +-
 data/konversation.desktop                          |    1 +
 data/konversation.notifyrc                         |   16 +-
 data/konversationui.rc                             |    3 +-
 data/{konvirc.protocol => konvircs.protocol}       |    2 +-
 debian/changelog                                   |   18 +
 debian/control                                     |    4 +-
 debian/konversation-data.install                   |    2 +-
 debian/konversation.install                        |    1 +
 ...-bug-217592-the-infamous-cursor-disappear.patch |   34 -
 debian/patches/series                              |    1 -
 doc-translations/CMakeLists.txt                    |    5 -
 .../et_konversation/konversation/CMakeLists.txt    |    1 -
 .../et_konversation/konversation/index.docbook     | 5981 ------------
 .../it_konversation/konversation/CMakeLists.txt    |    1 -
 .../it_konversation/konversation/index.docbook     | 6299 ------------
 .../pt_BR_konversation/konversation/CMakeLists.txt |    1 -
 .../pt_BR_konversation/konversation/index.docbook  | 6321 ------------
 .../sv_konversation/konversation/CMakeLists.txt    |    1 -
 .../sv_konversation/konversation/addchannel.png    |  Bin 3985 -> 0 bytes
 .../sv_konversation/konversation/addnetwork_co.png |  Bin 11970 -> 0 bytes
 .../sv_konversation/konversation/addserver_co.png  |  Bin 5902 -> 0 bytes
 .../konversation/channel_screen_tour_co.png        |  Bin 27272 -> 0 bytes
 .../konversation/channellist_screen_co.png         |  Bin 28918 -> 0 bytes
 .../konversation/checkidentities.png               |  Bin 5653 -> 0 bytes
 .../konversation/colorchooser_screen.png           |  Bin 5193 -> 0 bytes
 .../konversation/dccstatus_screen_co.png           |  Bin 14110 -> 0 bytes
 .../konversation/first_channel_co.png              |  Bin 20622 -> 0 bytes
 .../konversation/first_serverlist_co.png           |  Bin 6883 -> 0 bytes
 .../konversation/highlighting_screen_co.png        |  Bin 25708 -> 0 bytes
 .../konversation/identities_adv_co.png             |  Bin 10427 -> 0 bytes
 .../konversation/identities_away_co.png            |  Bin 11281 -> 0 bytes
 .../konversation/identities_gen_co.png             |  Bin 11732 -> 0 bytes
 .../sv_konversation/konversation/index.docbook     | 6313 ------------
 .../konversation/kimproxy_create_screen2.png       |  Bin 9386 -> 0 bytes
 .../konversation/kimproxy_create_screen_co.png     |  Bin 19640 -> 0 bytes
 .../sv_konversation/konversation/logviewer_co.png  |  Bin 18171 -> 0 bytes
 .../konversation/nicksonline_co.png                |  Bin 20765 -> 0 bytes
 .../konversation/nickthemes_screen_co.png          |  Bin 22363 -> 0 bytes
 .../konversation/notification_screen_co.png        |  Bin 19050 -> 0 bytes
 .../konversation/notifylist_screen_co.png          |  Bin 24738 -> 0 bytes
 .../sv_konversation/konversation/osd_demo.png      |  Bin 23487 -> 0 bytes
 .../sv_konversation/konversation/osd_screen_co.png |  Bin 26121 -> 0 bytes
 .../konversation/quickbuttons_screen.png           |  Bin 27271 -> 0 bytes
 .../konversation/quickconnect_screen.png           |  Bin 5646 -> 0 bytes
 .../sv_konversation/konversation/serverlist_co.png |  Bin 9386 -> 0 bytes
 .../konversation/urlcatcher_screen_co.png          |  Bin 12774 -> 0 bytes
 .../konversation/webbrowser_screen_co.png          |  Bin 28893 -> 0 bytes
 .../uk_konversation/konversation/CMakeLists.txt    |    1 -
 .../uk_konversation/konversation/index.docbook     | 6280 ------------
 doc/addchannel.png                                 |  Bin 6041 -> 16320 bytes
 doc/addnetwork_co.png                              |  Bin 14856 -> 33858 bytes
 doc/addserver_co.png                               |  Bin 7754 -> 20541 bytes
 doc/channel_screen_co.png                          |  Bin 25491 -> 0 bytes
 doc/channel_screen_tour_co.png                     |  Bin 42892 -> 89394 bytes
 doc/channellist_screen_co.png                      |  Bin 28004 -> 74573 bytes
 doc/checkidentities.png                            |  Bin 7640 -> 24323 bytes
 doc/colorchooser_screen.png                        |  Bin 7156 -> 20060 bytes
 doc/colorize.png                                   |  Bin 1012 -> 0 bytes
 doc/configure.png                                  |  Bin 1095 -> 0 bytes
 doc/dccstatus_screen_co.png                        |  Bin 18464 -> 60928 bytes
 doc/editserver_screen_co.png                       |  Bin 8595 -> 0 bytes
 doc/first_channel_co.png                           |  Bin 28554 -> 92588 bytes
 doc/first_serverlist_co.png                        |  Bin 9273 -> 26529 bytes
 doc/format-text-color.png                          |  Bin 0 -> 601 bytes
 doc/highlighting_screen_co.png                     |  Bin 29813 -> 75183 bytes
 doc/identities_adv_co.png                          |  Bin 13152 -> 37211 bytes
 doc/identities_away_co.png                         |  Bin 27974 -> 45107 bytes
 doc/identities_gen_co.png                          |  Bin 14339 -> 44240 bytes
 doc/index.docbook                                  |  490 +-
 doc/irc_admin.png                                  |  Bin 206 -> 744 bytes
 doc/irc_away.png                                   |  Bin 182 -> 452 bytes
 doc/irc_halfop.png                                 |  Bin 213 -> 741 bytes
 doc/irc_normal.png                                 |  Bin 207 -> 736 bytes
 doc/irc_op.png                                     |  Bin 213 -> 753 bytes
 doc/irc_owner.png                                  |  Bin 213 -> 731 bytes
 doc/irc_voice.png                                  |  Bin 213 -> 730 bytes
 doc/kimproxy_create_screen2.png                    |  Bin 11652 -> 24230 bytes
 doc/kimproxy_create_screen_co.png                  |  Bin 53752 -> 61438 bytes
 doc/led_blue_off.png                               |  Bin 283 -> 0 bytes
 doc/led_blue_on.png                                |  Bin 251 -> 221 bytes
 doc/led_green_off.png                              |  Bin 278 -> 0 bytes
 doc/led_green_on.png                               |  Bin 246 -> 246 bytes
 doc/led_red_off.png                                |  Bin 249 -> 0 bytes
 doc/led_red_on.png                                 |  Bin 256 -> 222 bytes
 doc/led_yellow_off.png                             |  Bin 260 -> 0 bytes
 doc/led_yellow_on.png                              |  Bin 225 -> 222 bytes
 doc/logviewer_co.png                               |  Bin 22421 -> 59373 bytes
 doc/nicksonline_co.png                             |  Bin 32818 -> 48646 bytes
 doc/nickthemes_screen_co.png                       |  Bin 27300 -> 70746 bytes
 doc/notification_screen_co.png                     |  Bin 60444 -> 68721 bytes
 doc/notifylist_screen_co.png                       |  Bin 64303 -> 75541 bytes
 doc/osd_demo.png                                   |  Bin 67030 -> 16995 bytes
 doc/osd_screen_co.png                              |  Bin 67638 -> 92578 bytes
 doc/prefs_identity_screen_co.png                   |  Bin 21695 -> 0 bytes
 doc/quickbuttons_screen.png                        |  Bin 29445 -> 81617 bytes
 doc/quickconnect_screen.png                        |  Bin 7587 -> 21312 bytes
 doc/serverlist_co.png                              |  Bin 11630 -> 27547 bytes
 doc/serverlist_screen_co.png                       |  Bin 16018 -> 0 bytes
 doc/urlcatcher_screen_co.png                       |  Bin 22316 -> 53270 bytes
 doc/webbrowser_screen_co.png                       |  Bin 70508 -> 82255 bytes
 po/CMakeLists.txt                                  |   34 -
 po/bg/CMakeLists.txt                               |    2 -
 po/bg/konversation.po                              | 9805 -------------------
 po/ca/CMakeLists.txt                               |    2 -
 po/ca/konversation.po                              | 9306 ------------------
 po/ca at valencia/CMakeLists.txt                      |    2 -
 po/ca at valencia/konversation.po                     | 9300 ------------------
 po/da/CMakeLists.txt                               |    2 -
 po/da/konversation.po                              | 9549 ------------------
 po/de/CMakeLists.txt                               |    2 -
 po/de/konversation.po                              | 9599 ------------------
 po/el/CMakeLists.txt                               |    2 -
 po/el/konversation.po                              |10176 --------------------
 po/en_GB/CMakeLists.txt                            |    2 -
 po/en_GB/konversation.po                           | 9515 ------------------
 po/es/CMakeLists.txt                               |    2 -
 po/es/konversation.po                              | 9269 ------------------
 po/et/CMakeLists.txt                               |    2 -
 po/et/konversation.po                              | 9215 ------------------
 po/fi/CMakeLists.txt                               |    2 -
 po/fi/konversation.po                              | 9473 ------------------
 po/fr/CMakeLists.txt                               |    2 -
 po/fr/konversation.po                              | 9246 ------------------
 po/gl/CMakeLists.txt                               |    2 -
 po/gl/konversation.po                              | 9752 -------------------
 po/hu/CMakeLists.txt                               |    2 -
 po/hu/konversation.po                              | 9569 ------------------
 po/it/CMakeLists.txt                               |    2 -
 po/it/konversation.po                              | 9527 ------------------
 po/ja/CMakeLists.txt                               |    2 -
 po/ja/konversation.po                              | 9597 ------------------
 po/lt/CMakeLists.txt                               |    2 -
 po/lt/konversation.po                              | 8989 -----------------
 po/nb/CMakeLists.txt                               |    2 -
 po/nb/konversation.po                              | 9065 -----------------
 po/nds/CMakeLists.txt                              |    2 -
 po/nds/konversation.po                             | 9416 ------------------
 po/nl/CMakeLists.txt                               |    2 -
 po/nl/konversation.po                              | 9503 ------------------
 po/pa/CMakeLists.txt                               |    2 -
 po/pa/konversation.po                              | 8882 -----------------
 po/pl/CMakeLists.txt                               |    2 -
 po/pl/konversation.po                              | 9387 ------------------
 po/pt/CMakeLists.txt                               |    2 -
 po/pt/konversation.po                              | 9214 ------------------
 po/pt_BR/CMakeLists.txt                            |    2 -
 po/pt_BR/konversation.po                           | 9174 ------------------
 po/ru/CMakeLists.txt                               |    2 -
 po/ru/konversation.po                              | 9635 ------------------
 po/sk/CMakeLists.txt                               |    2 -
 po/sk/konversation.po                              | 8962 -----------------
 po/sr/CMakeLists.txt                               |    2 -
 po/sr/konversation.po                              | 9169 ------------------
 po/sr at ijekavian/CMakeLists.txt                     |    2 -
 po/sr at ijekavian/konversation.po                    | 9173 ------------------
 po/sr at ijekavianlatin/CMakeLists.txt                |    2 -
 po/sr at ijekavianlatin/konversation.po               | 9173 ------------------
 po/sr at latin/CMakeLists.txt                         |    2 -
 po/sr at latin/konversation.po                        | 9168 ------------------
 po/sv/CMakeLists.txt                               |    2 -
 po/sv/konversation.po                              | 9257 ------------------
 po/tr/CMakeLists.txt                               |    2 -
 po/tr/konversation.po                              | 9741 -------------------
 po/uk/CMakeLists.txt                               |    2 -
 po/uk/konversation.po                              | 9599 ------------------
 po/zh_CN/CMakeLists.txt                            |    2 -
 po/zh_CN/konversation.po                           | 9167 ------------------
 po/zh_TW/CMakeLists.txt                            |    2 -
 po/zh_TW/konversation.po                           | 9814 -------------------
 src/CMakeLists.txt                                 |   13 +-
 src/application.cpp                                |  128 +-
 src/application.h                                  |   41 +-
 src/commit.h                                       |    2 +-
 src/common.cpp                                     |  199 +-
 src/common.h                                       |   22 +-
 src/config/chatwindowbehaviour_config.ui           |    2 +-
 src/config/configdialog.cpp                        |    2 +-
 src/config/dcc_config.cpp                          |    2 +
 src/config/dcc_configui.ui                         |   17 +-
 src/config/konversation.kcfg                       |    5 -
 src/config/preferences.cpp                         |   42 +-
 src/config/preferences.h                           |   22 +-
 src/config/settingsdialog.cpp                      |    2 -
 src/config/warnings_config.cpp                     |  318 +-
 src/config/warnings_configui.ui                    |    2 +-
 src/connectionmanager.cpp                          |   52 +-
 src/connectionmanager.h                            |    2 +-
 src/dbus.cpp                                       |   42 +-
 src/dbus.h                                         |   19 +-
 src/dcc/chatcontainer.cpp                          |   18 +-
 src/dcc/transferlistmodel.cpp                      |    5 +-
 src/dcc/transferlistmodel.h                        |   13 +
 src/dcc/transferpanel.cpp                          |   15 +-
 src/dcc/transferpanel.h                            |   41 +
 src/dcc/transferview.cpp                           |    7 +-
 src/dcc/transferview.h                             |   11 +
 src/dcc/whiteboard.cpp                             |   13 +-
 src/dcc/whiteboardcolorchooser.cpp                 |    2 +
 src/dcc/whiteboardglobals.h                        |   39 +-
 src/dcc/whiteboardpaintarea.cpp                    |    7 +
 src/dcc/whiteboardpaintarea.h                      |    1 +
 src/dcc/whiteboardtoolbar.cpp                      |   53 +-
 src/dcc/whiteboardtoolbar.h                        |    8 +-
 src/dcc/whiteboardtoolbarui.ui                     |   27 +-
 src/identity.cpp                                   |   32 +-
 src/identity.h                                     |   30 +-
 src/identitydialog.cpp                             |   18 +-
 src/identitydialog.ui                              |   90 +-
 src/irc/channel.cpp                                |  437 +-
 src/irc/channel.h                                  |   15 +-
 src/irc/channellistpanel.cpp                       |   77 +-
 src/irc/channellistpanel.h                         |    2 +-
 src/irc/channelnick.cpp                            |    4 +-
 src/irc/channeloptionsdialog.cpp                   |    7 +-
 src/irc/channeloptionsdialog.h                     |    2 +-
 src/irc/inputfilter.cpp                            |   56 +-
 src/irc/ircqueue.cpp                               |    2 +-
 src/irc/ircqueue.h                                 |    2 +-
 src/irc/joinchanneldialog.cpp                      |    8 +-
 src/irc/joinchanneldialog.h                        |    2 +-
 src/irc/nick.cpp                                   |    8 +-
 src/irc/nickinfo.cpp                               |   73 +-
 src/irc/nickinfo.h                                 |   12 -
 src/irc/nicklistview.cpp                           |  277 +-
 src/irc/nicklistview.h                             |   66 +-
 src/irc/nicksonline.cpp                            |   10 +-
 src/irc/nicksonline.h                              |    4 +-
 src/irc/outputfilter.cpp                           |  155 +-
 src/irc/outputfilter.h                             |   15 +-
 src/irc/query.cpp                                  |  208 +-
 src/irc/query.h                                    |   31 +-
 src/irc/replycodes.h                               |    2 +
 src/irc/server.cpp                                 |  199 +-
 src/irc/server.h                                   |   28 +-
 src/irc/servergroupdialog.cpp                      |    3 +
 src/irc/servergroupdialogui.ui                     |  105 +-
 src/irc/serverlistdialog.cpp                       |    1 +
 src/irc/serverlistdialog.h                         |    4 +-
 src/linkaddressbook/addressbook_base.cpp           |   15 +-
 src/linkaddressbook/addressbook_base.h             |    2 +-
 src/main.cpp                                       |   27 +-
 src/mainwindow.cpp                                 |  141 +-
 src/mainwindow.h                                   |   10 +-
 src/notificationhandler.cpp                        |  111 +-
 src/quickconnectdialog.cpp                         |    2 +-
 src/scriptlauncher.cpp                             |   22 +-
 src/scriptlauncher.h                               |   12 +-
 src/statusbar.cpp                                  |    9 +-
 src/statusbar.h                                    |    2 +-
 src/upnp/upnprouter.cpp                            |    2 +-
 src/urlcatcher.cpp                                 |  608 +-
 src/urlcatcher.h                                   |  120 +-
 src/urlcatcherui.ui                                |   60 -
 src/version.h                                      |    2 +-
 src/viewer/chatwindow.cpp                          |   64 +-
 src/viewer/chatwindow.h                            |   11 +-
 src/viewer/emoticons.cpp                           |   22 -
 src/viewer/emoticons.h                             |    4 +-
 src/viewer/images.cpp                              |    2 +-
 src/viewer/images.h                                |    2 +-
 src/viewer/irccolorchooser.cpp                     |    2 +-
 src/viewer/irccontextmenus.cpp                     | 1053 ++
 src/viewer/irccontextmenus.h                       |  161 +
 src/viewer/ircinput.cpp                            |    4 -
 src/viewer/ircinput.h                              |    4 +-
 src/viewer/ircview.cpp                             | 1365 ++-
 src/viewer/ircview.h                               |  146 +-
 src/viewer/ircviewbox.cpp                          |    4 +-
 src/viewer/ircviewbox.h                            |    3 +-
 src/viewer/logfilereader.cpp                       |   15 +-
 src/viewer/logfilereader.h                         |    1 +
 src/viewer/pasteeditor.cpp                         |    6 +-
 src/viewer/rawlog.cpp                              |   72 +-
 src/viewer/rawlog.h                                |    6 +-
 src/viewer/searchbar.cpp                           |   30 +-
 src/viewer/searchbar.h                             |    6 +
 src/viewer/statuspanel.cpp                         |   48 +-
 src/viewer/statuspanel.h                           |    5 +-
 src/viewer/topiclabel.cpp                          |  196 +-
 src/viewer/topiclabel.h                            |   21 +-
 src/viewer/trayicon.h                              |    5 +-
 src/viewer/trayiconkstatusnotifieritem.cpp         |   15 +-
 src/viewer/trayiconksystemtray.cpp                 |    9 +-
 src/viewer/viewcontainer.cpp                       |  145 +-
 src/viewer/viewcontainer.h                         |   11 +-
 src/viewer/viewtree.cpp                            |    4 +-
 src/viewer/viewtree.h                              |    4 +-
 src/viewer/viewtreeitem.cpp                        |   15 +-
 src/viewer/viewtreeitem.h                          |    2 +-
 300 files changed, 5129 insertions(+), 354235 deletions(-)

-- 
Konversation packaging for Debian



More information about the pkg-kde-commits mailing list