← Back to branch summary

~ubuntu-branches/ubuntu/lucid/konversation/lucid-updates

~ubuntu-branches/ubuntu/lucid/konversation/lucid-updates

Viewing all changes in revision 38.1.1.

Committer: Bazaar Package Importer
Author(s): Alessandro Ghersi
Date: 2009-07-04 19:55:41 UTC
mfrom: (2.2.4 sid)
mto: This revision was merged to the branch mainline in revision 39.
Revision ID: james.westby@ubuntu.com-20090704195541-824l8sqiyawt88ch

Tags: 1.2~alpha4-2ubuntu1

https://launchpad.net/bugs/395450

* Merge from Debian unstable, remaining changes (LP: #395450)
  - Use include /usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk
  - Use /usr/share/cdbs/1/rules/debhelper.mk
  - Add include /usr/share/cdbs/1/rules/patchsys-quilt.mk
  - Add kubuntu/default_channels.diff, disable debian/default_channel.diff
  - Change xpm/README.scripts path slightly to accomidate our differing
    Build systems
  - Use the Kubuntu docpath (/usr/share/doc/kde)
  - Build-depend on cdbs
  - Do not call debhelper with --with quilt for backportability reasons

files added:
debian/patches/general

debian/patches/general/qt4.4_build_fix.diff

doc-translations/sv_konversation

doc-translations/sv_konversation/konversation

doc-translations/sv_konversation/konversation/CMakeLists.txt

doc-translations/sv_konversation/konversation/index.docbook

doc-translations/uk_konversation

doc-translations/uk_konversation/konversation

doc-translations/uk_konversation/konversation/CMakeLists.txt

doc-translations/uk_konversation/konversation/index.docbook

po/ca

po/ca/CMakeLists.txt

po/ca/konversation.po

po/nds

po/nds/CMakeLists.txt

po/nds/konversation.po

src/cipher.cpp

src/cipher.h

src/irc/channeldialogui.ui

src/irc/invitedialog.cpp

src/irc/invitedialog.h

src/irc/invitedialog.ui

src/irc/serverdialogui.ui

src/upnp

src/upnp/soap.cpp

src/upnp/soap.h

src/upnp/upnpdescriptionparser.cpp

src/upnp/upnpdescriptionparser.h

src/upnp/upnpmcastsocket.cpp

src/upnp/upnpmcastsocket.h

src/upnp/upnprouter.cpp

src/upnp/upnprouter.h

src/viewer/statuspanel.cpp

src/viewer/statuspanel.h

files removed:
debian/copyright.in

debian/copyright.licenses

debian/copyright.source

po/hu

po/hu/CMakeLists.txt

po/hu/konversation.po

src/blowfish

src/blowfish/BlowfishCbc.cpp

src/blowfish/BlowfishCbc.h

src/blowfish/README

src/blowfish/b64stuff.cpp

src/blowfish/b64stuff.h

src/blowfish/blowfish.cpp

src/blowfish/blowfish.h

src/blowfish/mc_blowfish.cpp

src/blowfish/mc_blowfish.h

src/blowfish/newblowfish.cpp

src/blowfish/newblowfish.h

src/blowfish/oldblowfish.cpp

src/blowfish/oldblowfish1.h

src/blowfish/oldblowfish2.h

src/config/valuelistviewitem.cpp

src/config/valuelistviewitem.h

src/irc/channeldialog.cpp

src/irc/channeldialog.h

src/irc/serverdialog.cpp

src/irc/serverdialog.h

src/statuspanel.cpp

src/statuspanel.h

files modified:
CMakeLists.txt

ChangeLog

README

TODO

config-konversation.h.cmake

data/images/nickicons/alternative/index.desktop

data/images/nickicons/christmas/index.desktop

data/images/nickicons/classic/index.desktop

data/images/nickicons/default/index.desktop

data/images/nickicons/simplistic/index.desktop

data/images/nickicons/smiling/index.desktop

data/images/nickicons/square/index.desktop

data/konversation.desktop

data/konversation.notifyrc

data/scripts/bug

data/scripts/media

debian/changelog

debian/control

debian/copyright

debian/patches/debian/dbug_autoreplace.diff

debian/patches/debian/debian_channel.diff

debian/patches/series

doc-translations/CMakeLists.txt

doc/index.docbook

po/CMakeLists.txt

po/ar/konversation.po

po/bg/konversation.po

po/da/konversation.po

po/de/konversation.po

po/el/konversation.po

po/en_GB/konversation.po

po/es/konversation.po

po/et/konversation.po

po/fr/konversation.po

po/gl/konversation.po

po/he/konversation.po

po/it/konversation.po

po/ja/konversation.po

po/ko/konversation.po

po/nl/konversation.po

po/pt/konversation.po

po/pt_BR/konversation.po

po/ru/konversation.po

po/sv/konversation.po

po/tr/konversation.po

po/uk/konversation.po

po/zh_CN/konversation.po

po/zh_TW/konversation.po

src/CMakeLists.txt

src/application.cpp

src/application.h

src/awaymanager.cpp

src/awaymanager.h

src/bookmarkhandler.cpp

src/bookmarkhandler.h

src/commit.h

src/common.cpp

src/config/alias_config.cpp

src/config/alias_config.h

src/config/autoreplace_config.cpp

src/config/autoreplace_configui.ui

src/config/chatwindowappearance_config.ui

src/config/chatwindowbehaviour_config.ui

src/config/configdialog.cpp

src/config/configdialog.h

src/config/connectionbehavior_config.ui

src/config/dcc_config.cpp

src/config/dcc_config.h

src/config/dcc_configui.ui

src/config/generalbehavior_config.ui

src/config/highlight_config.cpp

src/config/ignore_config.cpp

src/config/ignore_configui.ui

src/config/konversation.kcfg

src/config/nicklistbehavior_config.cpp

src/config/nicklistbehavior_config.h

src/config/osd_config.cpp

src/config/osd_config.h

src/config/preferences.cpp

src/config/preferences.h

src/config/quickbuttons_config.cpp

src/config/quickbuttons_config.h

src/config/settingsdialog.cpp

src/config/settingsdialog.h

src/config/tabs_config.cpp

src/config/tabs_configui.ui

src/config/theme_config.cpp

src/config/theme_config.h

src/config/warnings_config.cpp

src/config/warnings_config.h

src/config/watchednicknames_config.cpp

src/config/watchednicknames_config.h

src/config/watchednicknames_configui.ui

src/connectionmanager.cpp

src/connectionmanager.h

src/connectionsettings.h

src/dbus.cpp

src/dbus.h

src/dcc/chat.cpp

src/dcc/chat.h

src/dcc/dcccommon.cpp

src/dcc/dcccommon.h

src/dcc/recipientdialog.cpp

src/dcc/recipientdialog.h

src/dcc/resumedialog.cpp

src/dcc/resumedialog.h

src/dcc/transfer.cpp

src/dcc/transfer.h

src/dcc/transferdetailedinfopanel.cpp

src/dcc/transferdetailedinfopanel.h

src/dcc/transfermanager.cpp

src/dcc/transfermanager.h

src/dcc/transferpanel.cpp

src/dcc/transferpanel.h

src/dcc/transferpanelitem.cpp

src/dcc/transferpanelitem.h

src/dcc/transferrecv.cpp

src/dcc/transferrecv.h

src/dcc/transfersend.cpp

src/dcc/transfersend.h

src/decoder.h

src/identity.cpp

src/identity.h

src/identitydialog.cpp

src/irc/channel.cpp

src/irc/channel.h

src/irc/channellistpanel.cpp

src/irc/channellistpanel.h

src/irc/channellistviewitem.h

src/irc/channelnick.cpp

src/irc/channeloptionsdialog.cpp

src/irc/channeloptionsdialog.h

src/irc/channeloptionsui.ui

src/irc/inputfilter.cpp

src/irc/inputfilter.h

src/irc/irccharsets.cpp

src/irc/irccharsets.h

src/irc/ircqueue.cpp

src/irc/joinchanneldialog.cpp

src/irc/modebutton.h

src/irc/nick.cpp

src/irc/nick.h

src/irc/nickinfo.cpp

src/irc/nickinfo.h

src/irc/nicklistview.cpp

src/irc/nicklistview.h

src/irc/nicksonline.cpp

src/irc/nicksonline.h

src/irc/nicksonlineitem.h

src/irc/outputfilter.cpp

src/irc/outputfilter.h

src/irc/query.cpp

src/irc/query.h

src/irc/server.cpp

src/irc/server.h

src/irc/servergroupdialog.cpp

src/irc/servergroupdialog.h

src/irc/servergroupdialogui.ui

src/irc/servergroupsettings.cpp

src/irc/servergroupsettings.h

src/irc/serverison.cpp

src/irc/serverlistdialog.cpp

src/irc/serverlistdialog.h

src/irc/serverlistview.cpp

src/irc/serversettings.h

src/konsolepanel.cpp

src/linkaddressbook/addressbook.cpp

src/linkaddressbook/addressbook.h

src/linkaddressbook/addressbook_base.cpp

src/linkaddressbook/addressbook_base.h

src/linkaddressbook/addresseeitem.cpp

src/linkaddressbook/addresseeitem.h

src/linkaddressbook/kimiface.h

src/linkaddressbook/linkaddressbookui.cpp

src/linkaddressbook/linkaddressbookui.h

src/main.cpp

src/mainwindow.cpp

src/mainwindow.h

src/notificationhandler.cpp

src/notificationhandler.h

src/queuetuner.cpp

src/queuetuner.h

src/quickconnectdialog.cpp

src/quickconnectdialog.h

src/scriptlauncher.cpp

src/scriptlauncher.h

src/ssllabel.h

src/statusbar.cpp

src/statusbar.h

src/urlcatcher.cpp

src/version.h

src/viewer/chatwindow.cpp

src/viewer/chatwindow.h

src/viewer/editnotifydialog.cpp

src/viewer/editnotifydialog.h

src/viewer/highlight.h

src/viewer/ignore.h

src/viewer/ignorelistviewitem.cpp

src/viewer/ignorelistviewitem.h

src/viewer/images.cpp

src/viewer/images.h

src/viewer/insertchardialog.cpp

src/viewer/irccolorchooser.cpp

src/viewer/ircinput.cpp

src/viewer/ircinput.h

src/viewer/ircview.cpp

src/viewer/ircview.h

src/viewer/ircviewbox.cpp

src/viewer/logfilereader.cpp

src/viewer/logfilereader.h

src/viewer/osd.cpp

src/viewer/quickbutton.h

src/viewer/rawlog.cpp

src/viewer/searchbar.cpp

src/viewer/topiclabel.cpp

src/viewer/trayicon.cpp

src/viewer/trayicon.h

src/viewer/viewcontainer.cpp

src/viewer/viewcontainer.h

src/viewer/viewtree.cpp

src/viewer/viewtree.h

src/viewer/viewtreeitem.cpp

src/viewer/viewtreeitem.h

Show diffs side-by-side

added added

removed removed

config-konversation.h.cmake

data/images/nickicons/alternative/index.desktop

data/images/nickicons/christmas/index.desktop

data/images/nickicons/classic/index.desktop

data/images/nickicons/default/index.desktop

data/images/nickicons/simplistic/index.desktop

data/images/nickicons/smiling/index.desktop

data/images/nickicons/square/index.desktop

data/konversation.desktop

data/konversation.notifyrc

data/scripts/bug

data/scripts/media

debian/changelog

debian/copyright

debian/copyright.in

debian/copyright.licenses

debian/copyright.source

debian/patches/debian/dbug_autoreplace.diff

debian/patches/debian/debian_channel.diff

debian/patches/general/

debian/patches/general/qt4.4_build_fix.diff

debian/patches/series

doc-translations/CMakeLists.txt

doc-translations/sv_konversation/

doc-translations/sv_konversation/konversation/

doc-translations/sv_konversation/konversation/CMakeLists.txt

doc-translations/sv_konversation/konversation/index.docbook

doc-translations/uk_konversation/

doc-translations/uk_konversation/konversation/

doc-translations/uk_konversation/konversation/CMakeLists.txt

doc-translations/uk_konversation/konversation/index.docbook

doc/index.docbook

po/CMakeLists.txt

po/ar/konversation.po

po/bg/konversation.po

po/ca/CMakeLists.txt

po/ca/konversation.po

po/da/konversation.po

po/de/konversation.po

po/el/konversation.po

po/en_GB/konversation.po

po/es/konversation.po

po/et/konversation.po

po/fr/konversation.po

po/gl/konversation.po

po/he/konversation.po

po/hu/CMakeLists.txt

po/hu/konversation.po

po/it/konversation.po

po/ja/konversation.po

po/ko/konversation.po

po/nds/CMakeLists.txt

po/nds/konversation.po

po/nl/konversation.po

po/pt/konversation.po

po/pt_BR/konversation.po

po/ru/konversation.po

po/sv/konversation.po

po/tr/konversation.po

po/uk/konversation.po

po/zh_CN/konversation.po

po/zh_TW/konversation.po

src/CMakeLists.txt

src/application.cpp

src/application.h

src/awaymanager.cpp

src/awaymanager.h

src/blowfish/BlowfishCbc.cpp

src/blowfish/BlowfishCbc.h

src/blowfish/README

src/blowfish/b64stuff.cpp

src/blowfish/b64stuff.h

src/blowfish/blowfish.cpp

src/blowfish/blowfish.h

src/blowfish/mc_blowfish.cpp

src/blowfish/mc_blowfish.h

src/blowfish/newblowfish.cpp

src/blowfish/newblowfish.h

src/blowfish/oldblowfish.cpp

src/blowfish/oldblowfish1.h

src/blowfish/oldblowfish2.h

src/bookmarkhandler.cpp

src/bookmarkhandler.h

src/config/alias_config.cpp

src/config/alias_config.h

src/config/autoreplace_config.cpp

src/config/autoreplace_configui.ui

src/config/chatwindowappearance_config.ui

src/config/chatwindowbehaviour_config.ui

src/config/configdialog.cpp

src/config/configdialog.h

src/config/connectionbehavior_config.ui

src/config/dcc_config.cpp

src/config/dcc_config.h

src/config/dcc_configui.ui

src/config/generalbehavior_config.ui

src/config/highlight_config.cpp

src/config/ignore_config.cpp

src/config/ignore_configui.ui

src/config/konversation.kcfg

src/config/nicklistbehavior_config.cpp

src/config/nicklistbehavior_config.h

src/config/osd_config.cpp

src/config/osd_config.h

src/config/preferences.cpp

src/config/preferences.h

src/config/quickbuttons_config.cpp

src/config/quickbuttons_config.h

src/config/settingsdialog.cpp

src/config/settingsdialog.h

src/config/tabs_config.cpp

src/config/tabs_configui.ui

src/config/theme_config.cpp

src/config/theme_config.h

src/config/valuelistviewitem.cpp

src/config/valuelistviewitem.h

src/config/warnings_config.cpp

src/config/warnings_config.h

src/config/watchednicknames_config.cpp

src/config/watchednicknames_config.h

src/config/watchednicknames_configui.ui

src/connectionmanager.cpp

src/connectionmanager.h

src/connectionsettings.h

src/dcc/chat.cpp

src/dcc/dcccommon.cpp

src/dcc/dcccommon.h

src/dcc/recipientdialog.cpp

src/dcc/recipientdialog.h

src/dcc/resumedialog.cpp

src/dcc/resumedialog.h

src/dcc/transfer.cpp

src/dcc/transfer.h

src/dcc/transferdetailedinfopanel.cpp

src/dcc/transferdetailedinfopanel.h

src/dcc/transfermanager.cpp

src/dcc/transfermanager.h

src/dcc/transferpanel.cpp

src/dcc/transferpanel.h

src/dcc/transferpanelitem.cpp

src/dcc/transferpanelitem.h

src/dcc/transferrecv.cpp

src/dcc/transferrecv.h

src/dcc/transfersend.cpp

src/dcc/transfersend.h

src/identity.cpp

src/identitydialog.cpp

src/irc/channel.cpp

src/irc/channel.h

src/irc/channeldialog.cpp

src/irc/channeldialog.h

src/irc/channeldialogui.ui

src/irc/channellistpanel.cpp

src/irc/channellistpanel.h

src/irc/channellistviewitem.h

src/irc/channelnick.cpp

src/irc/channeloptionsdialog.cpp

src/irc/channeloptionsdialog.h

src/irc/channeloptionsui.ui

src/irc/inputfilter.cpp

src/irc/inputfilter.h

src/irc/invitedialog.cpp

src/irc/invitedialog.h

src/irc/invitedialog.ui

src/irc/irccharsets.cpp

src/irc/irccharsets.h

src/irc/ircqueue.cpp

src/irc/joinchanneldialog.cpp

src/irc/modebutton.h

src/irc/nick.cpp

src/irc/nickinfo.cpp

src/irc/nickinfo.h

src/irc/nicklistview.cpp

src/irc/nicklistview.h

src/irc/nicksonline.cpp

src/irc/nicksonline.h

src/irc/nicksonlineitem.h

src/irc/outputfilter.cpp

src/irc/outputfilter.h

src/irc/query.cpp

src/irc/query.h

src/irc/server.cpp

src/irc/server.h

src/irc/serverdialog.cpp

src/irc/serverdialog.h

src/irc/serverdialogui.ui

src/irc/servergroupdialog.cpp

src/irc/servergroupdialog.h

src/irc/servergroupdialogui.ui

src/irc/servergroupsettings.cpp

src/irc/servergroupsettings.h

src/irc/serverison.cpp

src/irc/serverlistdialog.cpp

src/irc/serverlistdialog.h

src/irc/serverlistview.cpp

src/irc/serversettings.h

src/konsolepanel.cpp

src/linkaddressbook/addressbook.cpp

src/linkaddressbook/addressbook.h

src/linkaddressbook/addressbook_base.cpp

src/linkaddressbook/addressbook_base.h

src/linkaddressbook/addresseeitem.cpp

src/linkaddressbook/addresseeitem.h

src/linkaddressbook/kimiface.h

src/linkaddressbook/linkaddressbookui.cpp

src/linkaddressbook/linkaddressbookui.h

src/mainwindow.cpp

src/mainwindow.h

src/notificationhandler.cpp

src/notificationhandler.h

src/queuetuner.cpp

src/queuetuner.h

src/quickconnectdialog.cpp

src/quickconnectdialog.h

src/scriptlauncher.cpp

src/scriptlauncher.h

src/statusbar.cpp

src/statusbar.h

src/statuspanel.cpp

src/statuspanel.h

src/upnp/soap.cpp

src/upnp/soap.h

src/upnp/upnpdescriptionparser.cpp

src/upnp/upnpdescriptionparser.h

src/upnp/upnpmcastsocket.cpp

src/upnp/upnpmcastsocket.h

src/upnp/upnprouter.cpp

src/upnp/upnprouter.h

src/urlcatcher.cpp

src/viewer/chatwindow.cpp

src/viewer/chatwindow.h

src/viewer/editnotifydialog.cpp

src/viewer/editnotifydialog.h

src/viewer/highlight.h

src/viewer/ignore.h

src/viewer/ignorelistviewitem.cpp

src/viewer/ignorelistviewitem.h

src/viewer/images.cpp

src/viewer/images.h

src/viewer/insertchardialog.cpp

src/viewer/irccolorchooser.cpp

src/viewer/ircinput.cpp

src/viewer/ircinput.h

src/viewer/ircview.cpp

src/viewer/ircview.h

src/viewer/ircviewbox.cpp

src/viewer/logfilereader.cpp

src/viewer/logfilereader.h

src/viewer/osd.cpp

src/viewer/quickbutton.h

src/viewer/rawlog.cpp

src/viewer/searchbar.cpp

src/viewer/statuspanel.cpp

src/viewer/statuspanel.h

src/viewer/topiclabel.cpp

src/viewer/trayicon.cpp

src/viewer/trayicon.h

src/viewer/viewcontainer.cpp

src/viewer/viewcontainer.h

src/viewer/viewtree.cpp

src/viewer/viewtree.h

src/viewer/viewtreeitem.cpp

src/viewer/viewtreeitem.h

Older »