← Back to branch summary

~ubuntu-branches/ubuntu/lucid/kmess/lucid

~ubuntu-branches/ubuntu/lucid/kmess/lucid

Viewing all changes in revision 12.

Committer: Bazaar Package Importer
Author(s): Alessandro Ghersi
Date: 2009-05-26 21:24:23 UTC
mfrom: (1.1.5 upstream) (0.1.5 squeeze)
Revision ID: james.westby@ubuntu.com-20090526212423-fiu27qnivr4tkt4w

Tags: 2.0~beta2-1ubuntu1

https://launchpad.net/bugs/380717

* Merge with debian unstable (LP: #380717), remaining changes:
  - Replaced libphonon-dev by libqt4-phonon-dev (>= 4.5.1)
  - debian/rules: change '/usr/share/cdbs/1/class/kde4.mk' to
    '/usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk'
  - add quilt to build-deps
  - debian/watch: we don't need run debian svn-upgrade

files added:
cmake/giflib_hack.cmake

doc/en/chatwindow.png

doc/en/contactlist.png

doc/en/settings-account-chat-behavior.png

doc/en/settings-account-chat-text.png

doc/en/settings-account-chat.png

doc/en/settings-account-contactlist.png

doc/en/settings-account-emoticons-custom-add.png

doc/en/settings-account-emoticons-custom.png

doc/en/settings-account-emoticons.png

doc/en/settings-account-logging.png

doc/en/settings-account.png

doc/en/settings-contact.png

doc/en/settings-kmess-accounts.png

doc/en/settings-kmess-notifications.png

doc/en/settings-kmess-settings-email.png

doc/en/settings-kmess-settings-filetransfers.png

doc/en/settings-kmess-settings-web.png

kmess.supp

po/sr@latin.po

files removed:
doc/en/chatwindow-withsidebar.png

doc/en/general-settings-dialog-settings.png

doc/en/mainwindow.png

doc/en/settings-dialog-account.png

doc/en/settings-dialog-chatlogs.png

doc/en/settings-dialog-chatting.png

doc/en/settings-dialog-emoticons-custom-add.png

doc/en/settings-dialog-emoticons-custom.png

doc/en/settings-dialog-emoticons.png

po/sr.po

src/network/msnsocketnull.cpp

src/network/msnsocketnull.h

files modified:
AUTHORS

CMakeLists.txt

ChangeLog

Doxyfile

INSTALL

NEWS

README

TODO

autopackage/default.apspec

cmake/config-kmess.h.in

cmake/get-svn-version.sh

configure

data/chatstyles/Classic-compact/Classic-compact.xsl

data/chatstyles/Classic/Classic.xsl

data/chatstyles/Colourful-Enclosed/Colourful-Enclosed.css

data/chatstyles/Colourful-Enclosed/Colourful-Enclosed.xsl

data/chatstyles/Dim/Dim.css

data/chatstyles/Dim/Dim.xsl

data/chatstyles/Efficient/Efficient.css

data/chatstyles/Efficient/Efficient.xsl

data/chatstyles/Fresh-dark/Fresh-dark.css

data/chatstyles/Fresh-dark/Fresh-dark.xsl

data/chatstyles/Fresh/Fresh.css

data/chatstyles/Fresh/Fresh.xsl

data/chatstyles/Pure/Pure.css

data/chatstyles/Pure/Pure.xsl

data/emoticons/KMess2-new/gameconsole.png *

data/kmess.desktop

debian/changelog

debian/control

debian/rules

debian/watch

doc/en/index.docbook

kmess.lsm

kmess.spec

po/ar.po

po/ca.po

po/da.po

po/de.po

po/el.po

po/es.po

po/et.po

po/fi.po

po/fr.po

po/hu.po

po/it.po

po/kmess.pot

po/ko.po

po/maketrans

po/nb.po

po/nl.po

po/pt_BR.po

po/sk.po

po/sl.po

po/sv.po

po/th.po

po/tr.po

po/zh_CN.po

po/zh_TW.po

src/CMakeLists.txt

src/account.cpp

src/account.h

src/accountsmanager.cpp

src/accountsmanager.h

src/chat/chat.cpp

src/chat/chat.h

src/chat/chatmaster.cpp

src/chat/chatmessagestyle.cpp

src/chat/chatmessagestyle.h

src/chat/chatmessageview.cpp

src/chat/chatview.cpp

src/chat/chatwindow.cpp

src/chat/chatwindow.h

src/chat/chatwindow.ui

src/chat/contactframe.cpp

src/chat/contactframe.h

src/chat/contactframe.ui

src/chat/contactswidget.cpp

src/chat/contactswidget.h

src/chat/contactswidget.ui

src/chat/emoticonswidget.cpp

src/chat/inkedit.cpp

src/chat/inkedit.h

src/chat/inkedit.ui

src/chat/winkswidget.cpp

src/chat/winkswidget.h

src/chat/xsltransformation.cpp

src/chat/xsltransformation.h

src/contact/contact.cpp

src/contact/contact.h

src/contact/contactbase.cpp

src/contact/contactbase.h

src/contact/contactextension.cpp

src/contact/contactextension.h

src/contact/group.cpp

src/contact/group.h

src/contact/invitedcontact.cpp

src/contact/invitedcontact.h

src/contact/msnobject.cpp

src/contact/msnobject.h

src/contact/msnstatus.cpp

src/contact/msnstatus.h

src/currentaccount.cpp

src/currentaccount.h

src/dialogs/addcontactdialog.cpp

src/dialogs/addemoticondialog.cpp

src/dialogs/chathistorydialog.cpp

src/dialogs/chathistorydialog.h

src/dialogs/chathistorydialog.ui

src/dialogs/contactaddeduserdialog.cpp

src/dialogs/contactaddeduserdialog.ui

src/dialogs/contactentry.cpp

src/dialogs/contactentry.h

src/dialogs/contactentry.ui

src/dialogs/contactpropertiesdialog.cpp

src/dialogs/contactpropertiesdialog.h

src/dialogs/contactpropertiesdialog.ui

src/dialogs/invitedialog.cpp

src/dialogs/invitedialog.ui

src/dialogs/networkwindow.cpp

src/dialogs/transferentry.ui

src/dialogs/transferwindow.cpp

src/dialogs/transferwindow.h

src/dialogs/transferwindow.ui

src/dialogs/userpicturesdialog.cpp

src/emoticon.cpp

src/emoticon.h

src/emoticonmanager.cpp

src/emoticonmanager.h

src/emoticontheme.cpp

src/emoticontheme.h

src/initialview.cpp

src/initialview.ui

src/kmess.cpp

src/kmess.h

src/kmessapplication.cpp

src/kmessdebug.h

src/kmessinterface.cpp

src/kmessinterface.h

src/kmessinterfaceui.rc

src/kmesstest.cpp

src/kmesstest.h

src/kmessview.cpp

src/kmessview.h

src/kmessview.ui

src/main.cpp

src/model/contactlist.cpp

src/model/contactlist.h

src/model/contactlistmodelfilter.cpp

src/model/contactlistmodelitem.cpp

src/model/contactlistmodelitem.h

src/network/applications/application.cpp

src/network/applications/application.h

src/network/applications/applicationlist.cpp

src/network/applications/filetransfer.cpp

src/network/applications/filetransferp2p.cpp

src/network/applications/inktransferp2p.cpp

src/network/applications/inktransferp2p.h

src/network/applications/mimeapplication.cpp

src/network/applications/msnobjecttransferp2p.cpp

src/network/applications/msnobjecttransferp2p.h

src/network/applications/msnremotedesktop.cpp

src/network/applications/p2papplication.cpp

src/network/applications/p2papplicationbase.cpp

src/network/applications/voiceconversation.cpp

src/network/applications/webcamtransferp2p.cpp

src/network/chatmessage.h

src/network/extra/directconnectionbase.cpp

src/network/extra/directconnectionpool.cpp

src/network/extra/msnftpconnection.cpp

src/network/mimemessage.cpp

src/network/msnconnection.cpp

src/network/msnconnection.h

src/network/msnnotificationconnection.cpp

src/network/msnsockethttp.cpp

src/network/msnsockettcp.cpp

src/network/msnswitchboardconnection.cpp

src/network/msnswitchboardconnection.h

src/network/multipacketmessage.cpp

src/network/soap/addressbookservice.cpp

src/network/soap/addressbookservice.h

src/network/soap/httpsoapconnection.cpp

src/network/soap/httpsoapconnection.h

src/network/soap/offlineimservice.cpp

src/network/soap/offlineimservice.h

src/network/soap/passportloginservice.cpp

src/network/soap/passportloginservice.h

src/network/soap/soapmessage.cpp

src/notification/chatnotification.cpp

src/notification/contactstatusnotification.cpp

src/notification/contactstatusnotification.h

src/notification/newemailnotification.cpp

src/notification/notificationmanager.cpp

src/settings/accountpage.cpp

src/settings/accountpage.h

src/settings/accountpage.ui

src/settings/accountsettingsdialog.cpp

src/settings/accountsmanagerpage.cpp

src/settings/accountsmanagerpage.ui

src/settings/chatloggingpage.cpp

src/settings/chatloggingpage.ui

src/settings/chatstylepage.cpp

src/settings/chatstylepage.ui

src/settings/contactlistpage.ui

src/settings/emoticonspage.cpp

src/settings/emoticonspage.h

src/settings/emoticonspage.ui

src/settings/globalsettingsdialog.cpp

src/settings/miscellaneouspage.cpp

src/settings/miscellaneouspage.ui

src/utils/crashhandler.cpp

src/utils/kmess-send/kmesssendplugin.cpp

src/utils/kmess-send/kmesssendplugin.desktop

src/utils/kmessconfig.cpp

src/utils/kmessdbusadaptor.h

src/utils/kmessshared.cpp

src/utils/likeback/likeback.cpp

src/utils/likeback/likeback.h

src/utils/likeback/likeback_p.h

src/utils/likeback/likebackbar.cpp

src/utils/likeback/likebackbar.h

src/utils/likeback/likebackbar.ui

src/utils/likeback/likebackdialog.cpp

src/utils/likeback/likebackdialog.ui

src/utils/nowlisteningclient.cpp

src/utils/richtextparser.cpp

src/utils/xautolock.cpp

tests/CMakeLists.txt

Show diffs side-by-side

added added

removed removed

autopackage/default.apspec

cmake/config-kmess.h.in

cmake/get-svn-version.sh

cmake/giflib_hack.cmake

data/chatstyles/Classic-compact/Classic-compact.xsl

data/chatstyles/Classic/Classic.xsl

data/chatstyles/Colourful-Enclosed/Colourful-Enclosed.css

data/chatstyles/Colourful-Enclosed/Colourful-Enclosed.xsl

data/chatstyles/Dim/Dim.css

data/chatstyles/Dim/Dim.xsl

data/chatstyles/Efficient/Efficient.css

data/chatstyles/Efficient/Efficient.xsl

data/chatstyles/Fresh-dark/Fresh-dark.css

data/chatstyles/Fresh-dark/Fresh-dark.xsl

data/chatstyles/Fresh/Fresh.css

data/chatstyles/Fresh/Fresh.xsl

data/chatstyles/Pure/Pure.css

data/chatstyles/Pure/Pure.xsl

data/kmess.desktop

debian/changelog

doc/en/chatwindow-withsidebar.png

doc/en/chatwindow.png

doc/en/contactlist.png

doc/en/general-settings-dialog-settings.png

doc/en/index.docbook

doc/en/mainwindow.png

doc/en/settings-account-chat-behavior.png

doc/en/settings-account-chat-text.png

doc/en/settings-account-chat.png

doc/en/settings-account-contactlist.png

doc/en/settings-account-emoticons-custom-add.png

doc/en/settings-account-emoticons-custom.png

doc/en/settings-account-emoticons.png

doc/en/settings-account-logging.png

doc/en/settings-account.png

doc/en/settings-contact.png

doc/en/settings-dialog-account.png

doc/en/settings-dialog-chatlogs.png

doc/en/settings-dialog-chatting.png

doc/en/settings-dialog-emoticons-custom-add.png

doc/en/settings-dialog-emoticons-custom.png

doc/en/settings-dialog-emoticons.png

doc/en/settings-kmess-accounts.png

doc/en/settings-kmess-notifications.png

doc/en/settings-kmess-settings-email.png

doc/en/settings-kmess-settings-filetransfers.png

doc/en/settings-kmess-settings-web.png

src/CMakeLists.txt

src/account.cpp

src/accountsmanager.cpp

src/accountsmanager.h

src/chat/chat.cpp

src/chat/chat.h

src/chat/chatmaster.cpp

src/chat/chatmessagestyle.cpp

src/chat/chatmessagestyle.h

src/chat/chatmessageview.cpp

src/chat/chatview.cpp

src/chat/chatwindow.cpp

src/chat/chatwindow.h

src/chat/chatwindow.ui

src/chat/contactframe.cpp

src/chat/contactframe.h

src/chat/contactframe.ui

src/chat/contactswidget.cpp

src/chat/contactswidget.h

src/chat/contactswidget.ui

src/chat/emoticonswidget.cpp

src/chat/inkedit.cpp

src/chat/inkedit.h

src/chat/inkedit.ui

src/chat/winkswidget.cpp

src/chat/winkswidget.h

src/chat/xsltransformation.cpp

src/chat/xsltransformation.h

src/contact/contact.cpp

src/contact/contact.h

src/contact/contactbase.cpp

src/contact/contactbase.h

src/contact/contactextension.cpp

src/contact/contactextension.h

src/contact/group.cpp

src/contact/group.h

src/contact/invitedcontact.cpp

src/contact/invitedcontact.h

src/contact/msnobject.cpp

src/contact/msnobject.h

src/contact/msnstatus.cpp

src/contact/msnstatus.h

src/currentaccount.cpp

src/currentaccount.h

src/dialogs/addcontactdialog.cpp

src/dialogs/addemoticondialog.cpp

src/dialogs/chathistorydialog.cpp

src/dialogs/chathistorydialog.h

src/dialogs/chathistorydialog.ui

src/dialogs/contactaddeduserdialog.cpp

src/dialogs/contactaddeduserdialog.ui

src/dialogs/contactentry.cpp

src/dialogs/contactentry.h

src/dialogs/contactentry.ui

src/dialogs/contactpropertiesdialog.cpp

src/dialogs/contactpropertiesdialog.h

src/dialogs/contactpropertiesdialog.ui

src/dialogs/invitedialog.cpp

src/dialogs/invitedialog.ui

src/dialogs/networkwindow.cpp

src/dialogs/transferentry.ui

src/dialogs/transferwindow.cpp

src/dialogs/transferwindow.h

src/dialogs/transferwindow.ui

src/dialogs/userpicturesdialog.cpp

src/emoticon.cpp

src/emoticonmanager.cpp

src/emoticonmanager.h

src/emoticontheme.cpp

src/emoticontheme.h

src/initialview.cpp

src/initialview.ui

src/kmessapplication.cpp

src/kmessdebug.h

src/kmessinterface.cpp

src/kmessinterface.h

src/kmessinterfaceui.rc

src/kmesstest.cpp

src/kmesstest.h

src/kmessview.cpp

src/kmessview.h

src/kmessview.ui

src/model/contactlist.cpp

src/model/contactlist.h

src/model/contactlistmodelfilter.cpp

src/model/contactlistmodelitem.cpp

src/model/contactlistmodelitem.h

src/network/applications/application.cpp

src/network/applications/application.h

src/network/applications/applicationlist.cpp

src/network/applications/filetransfer.cpp

src/network/applications/filetransferp2p.cpp

src/network/applications/inktransferp2p.cpp

src/network/applications/inktransferp2p.h

src/network/applications/mimeapplication.cpp

src/network/applications/msnobjecttransferp2p.cpp

src/network/applications/msnobjecttransferp2p.h

src/network/applications/msnremotedesktop.cpp

src/network/applications/p2papplication.cpp

src/network/applications/p2papplicationbase.cpp

src/network/applications/voiceconversation.cpp

src/network/applications/webcamtransferp2p.cpp

src/network/chatmessage.h

src/network/extra/directconnectionbase.cpp

src/network/extra/directconnectionpool.cpp

src/network/extra/msnftpconnection.cpp

src/network/mimemessage.cpp

src/network/msnconnection.cpp

src/network/msnconnection.h

src/network/msnnotificationconnection.cpp

src/network/msnsockethttp.cpp

src/network/msnsocketnull.cpp

src/network/msnsocketnull.h

src/network/msnsockettcp.cpp

src/network/msnswitchboardconnection.cpp

src/network/msnswitchboardconnection.h

src/network/multipacketmessage.cpp

src/network/soap/addressbookservice.cpp

src/network/soap/addressbookservice.h

src/network/soap/httpsoapconnection.cpp

src/network/soap/httpsoapconnection.h

src/network/soap/offlineimservice.cpp

src/network/soap/offlineimservice.h

src/network/soap/passportloginservice.cpp

src/network/soap/passportloginservice.h

src/network/soap/soapmessage.cpp

src/notification/chatnotification.cpp

src/notification/contactstatusnotification.cpp

src/notification/contactstatusnotification.h

src/notification/newemailnotification.cpp

src/notification/notificationmanager.cpp

src/settings/accountpage.cpp

src/settings/accountpage.h

src/settings/accountpage.ui

src/settings/accountsettingsdialog.cpp

src/settings/accountsmanagerpage.cpp

src/settings/accountsmanagerpage.ui

src/settings/chatloggingpage.cpp

src/settings/chatloggingpage.ui

src/settings/chatstylepage.cpp

src/settings/chatstylepage.ui

src/settings/contactlistpage.ui

src/settings/emoticonspage.cpp

src/settings/emoticonspage.h

src/settings/emoticonspage.ui

src/settings/globalsettingsdialog.cpp

src/settings/miscellaneouspage.cpp

src/settings/miscellaneouspage.ui

src/utils/crashhandler.cpp

src/utils/kmess-send/kmesssendplugin.cpp

src/utils/kmess-send/kmesssendplugin.desktop

src/utils/kmessconfig.cpp

src/utils/kmessdbusadaptor.h

src/utils/kmessshared.cpp

src/utils/likeback/likeback.cpp

src/utils/likeback/likeback.h

src/utils/likeback/likeback_p.h

src/utils/likeback/likebackbar.cpp

src/utils/likeback/likebackbar.h

src/utils/likeback/likebackbar.ui

src/utils/likeback/likebackdialog.cpp

src/utils/likeback/likebackdialog.ui

src/utils/nowlisteningclient.cpp

src/utils/richtextparser.cpp

src/utils/xautolock.cpp

tests/CMakeLists.txt

Older »