--- kadu-0.6.5.4.orig/debian/control +++ kadu-0.6.5.4/debian/control @@ -10,7 +10,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, kadu-common (= ${source:Version}), libqca2-plugin-ossl Recommends: kadu-external-modules (>= 0.6.5-1) -Conflicts: kadu-external-modules (< 0.6.5-1), kadu-kde-modules, kadu-gtk-modules +Conflicts: kadu-external-modules (<< 0.6.5-1), kadu-kde-modules, kadu-gtk-modules Replaces: kadu-kde-modules, kadu-gtk-modules Suggests: kadu-themes Description: Gadu-Gadu client for X11 @@ -23,7 +23,7 @@ Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: kadu-external-modules (>= 0.6.5-1) -Conflicts: kadu (< 0.6.5-1) +Conflicts: kadu (<< 0.6.5-1) Suggests: kadu-themes Description: Gadu-Gadu client for X11 Gadu-Gadu is a Windows instant messenger, very popular in Poland. @@ -34,7 +34,7 @@ Package: kadu-external-modules Architecture: any Depends: kadu (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Conflicts: kadu (< 0.6.5-1) +Conflicts: kadu (<< 0.6.5-1) Description: Additional modules for Kadu Gadu-Gadu is a Windows instant messenger, very popular in Poland. Kadu is a Qt4 version for *nix systems. --- kadu-0.6.5.4.orig/debian/kadu-external-modules.install +++ kadu-0.6.5.4/debian/kadu-external-modules.install @@ -12,14 +12,17 @@ debian/tmp/usr/lib/kadu/modules/libmediaplayer.so debian/tmp/usr/lib/kadu/modules/libmime_tex.so debian/tmp/usr/lib/kadu/modules/libbmpx_mediaplayer.so +debian/tmp/usr/lib/kadu/modules/libmpris_mediaplayer.so debian/tmp/usr/lib/kadu/modules/libmx610_notify.so debian/tmp/usr/lib/kadu/modules/libnextinfo.so debian/tmp/usr/lib/kadu/modules/libosd_hints.so +debian/tmp/usr/lib/kadu/modules/libpajacyk.so debian/tmp/usr/lib/kadu/modules/libpanelkadu.so debian/tmp/usr/lib/kadu/modules/libplus_pl_sms.so debian/tmp/usr/lib/kadu/modules/libpowerkadu.so debian/tmp/usr/lib/kadu/modules/libqt4_docking_notify.so debian/tmp/usr/lib/kadu/modules/libsenthistory.so +debian/tmp/usr/lib/kadu/modules/libsingle_window.so debian/tmp/usr/lib/kadu/modules/libsplit_messages.so debian/tmp/usr/lib/kadu/modules/libvlc_mediaplayer.so debian/tmp/usr/lib/kadu/modules/libwater_notify.so @@ -32,12 +35,15 @@ debian/tmp/usr/share/kadu/modules/configuration/mail.ui debian/tmp/usr/share/kadu/modules/configuration/mediaplayer.ui debian/tmp/usr/share/kadu/modules/configuration/mime_tex.ui +debian/tmp/usr/share/kadu/modules/configuration/mpris_mediaplayer.ui debian/tmp/usr/share/kadu/modules/configuration/mx610_notify.ui debian/tmp/usr/share/kadu/modules/configuration/nextinfo.ui debian/tmp/usr/share/kadu/modules/configuration/osd_hints.ui +debian/tmp/usr/share/kadu/modules/configuration/pajacyk.ui debian/tmp/usr/share/kadu/modules/configuration/panelkadu.ui debian/tmp/usr/share/kadu/modules/configuration/plus_pl_sms.ui debian/tmp/usr/share/kadu/modules/configuration/powerkadu.ui +debian/tmp/usr/share/kadu/modules/configuration/single_window.ui debian/tmp/usr/share/kadu/modules/configuration/split_messages.ui debian/tmp/usr/share/kadu/modules/configuration/tabs.ui debian/tmp/usr/share/kadu/modules/configuration/senthistory.ui @@ -64,15 +70,18 @@ debian/tmp/usr/share/kadu/modules/mail.desc debian/tmp/usr/share/kadu/modules/mediaplayer.desc debian/tmp/usr/share/kadu/modules/mime_tex.desc +debian/tmp/usr/share/kadu/modules/mpris_mediaplayer.desc debian/tmp/usr/share/kadu/modules/mx610_notify.desc debian/tmp/usr/share/kadu/modules/nextinfo.desc debian/tmp/usr/share/kadu/modules/osd_hints.desc +debian/tmp/usr/share/kadu/modules/pajacyk.desc debian/tmp/usr/share/kadu/modules/panelkadu.desc debian/tmp/usr/share/kadu/modules/plus_pl_sms.desc debian/tmp/usr/share/kadu/modules/powerkadu.desc debian/tmp/usr/share/kadu/modules/qt4_docking_notify.desc debian/tmp/usr/share/kadu/modules/vlc_mediaplayer.desc debian/tmp/usr/share/kadu/modules/senthistory.desc +debian/tmp/usr/share/kadu/modules/single_window.desc debian/tmp/usr/share/kadu/modules/split_messages.desc debian/tmp/usr/share/kadu/modules/tabs.desc debian/tmp/usr/share/kadu/modules/water_notify.desc @@ -87,14 +96,17 @@ debian/tmp/usr/share/kadu/modules/translations/mail* debian/tmp/usr/share/kadu/modules/translations/mediaplayer* debian/tmp/usr/share/kadu/modules/translations/mime_tex* +debian/tmp/usr/share/kadu/modules/translations/mpris_mediaplayer* debian/tmp/usr/share/kadu/modules/translations/mx610_notify* debian/tmp/usr/share/kadu/modules/translations/nextinfo* debian/tmp/usr/share/kadu/modules/translations/osd_hints_pl* +debian/tmp/usr/share/kadu/modules/translations/pajacyk_* debian/tmp/usr/share/kadu/modules/translations/panelkadu* debian/tmp/usr/share/kadu/modules/translations/plus_pl_sms* debian/tmp/usr/share/kadu/modules/translations/powerkadu* debian/tmp/usr/share/kadu/modules/translations/qt4_docking_notify* debian/tmp/usr/share/kadu/modules/translations/senthistory* +debian/tmp/usr/share/kadu/modules/translations/single_window* debian/tmp/usr/share/kadu/modules/translations/split_messages_pl* debian/tmp/usr/share/kadu/modules/translations/tabs* debian/tmp/usr/share/kadu/modules/translations/water_notify* --- kadu-0.6.5.4.orig/debian/changelog +++ kadu-0.6.5.4/debian/changelog @@ -1,11 +1,17 @@ kadu (0.6.5.4-1) unstable; urgency=low * New upstream release - * Refreshed patches + * Refreshed patches in debian/patches to code changes since last stable + release of Kadu + * Added debian/patches/06-mail.patch -- updates external mail module + to new API in kadu-0.6.5.4. Patch maintained by Kadu Team. * Updated external modules to their newest versions + * Added dbus module to kadu package + * Added pajacyk, single_window and mpris_mediaplayer to + kadu-external-modules * Added kadu-pajacyk external module - -- Patryk Cisek Sun, 07 Feb 2010 18:06:16 +0000 + -- Patryk Cisek Mon, 08 Feb 2010 08:34:11 +0000 kadu (0.6.5.4~rc1-2) experimental; urgency=low --- kadu-0.6.5.4.orig/debian/kadu.install +++ kadu-0.6.5.4/debian/kadu.install @@ -11,6 +11,7 @@ debian/tmp/usr/lib/kadu/modules/libautostatus.so debian/tmp/usr/lib/kadu/modules/libcenzor.so debian/tmp/usr/lib/kadu/modules/libconfig_wizard.so +debian/tmp/usr/lib/kadu/modules/libdbus.so debian/tmp/usr/lib/kadu/modules/libdcc.so debian/tmp/usr/lib/kadu/modules/libdefault_sms.so debian/tmp/usr/lib/kadu/modules/libdesktop_docking.so --- kadu-0.6.5.4.orig/debian/kadu.install.noalsa +++ kadu-0.6.5.4/debian/kadu.install.noalsa @@ -11,6 +11,7 @@ debian/tmp/usr/lib/kadu/modules/libautostatus.so debian/tmp/usr/lib/kadu/modules/libcenzor.so debian/tmp/usr/lib/kadu/modules/libconfig_wizard.so +debian/tmp/usr/lib/kadu/modules/libdbus.so debian/tmp/usr/lib/kadu/modules/libdcc.so debian/tmp/usr/lib/kadu/modules/libdefault_sms.so debian/tmp/usr/lib/kadu/modules/libdesktop_docking.so --- kadu-0.6.5.4.orig/debian/kadu-common.install +++ kadu-0.6.5.4/debian/kadu-common.install @@ -39,6 +39,7 @@ debian/tmp/usr/share/kadu/modules/autoresponder.desc debian/tmp/usr/share/kadu/modules/autostatus.desc debian/tmp/usr/share/kadu/modules/config_wizard.desc +debian/tmp/usr/share/kadu/modules/dbus.desc debian/tmp/usr/share/kadu/modules/kde_notify.desc debian/tmp/usr/share/kadu/modules/data/antistring debian/tmp/usr/share/kadu/modules/data/cenzor --- kadu-0.6.5.4.orig/debian/patches/06-mail.patch +++ kadu-0.6.5.4/debian/patches/06-mail.patch @@ -0,0 +1,47 @@ +diff --git a/modules/mail/mail.cpp b/modules/mail/mail.cpp +index 19407b1..89bd117 100644 +--- a/modules/mail/mail.cpp ++++ b/modules/mail/mail.cpp +@@ -43,8 +43,8 @@ extern "C" KADU_EXPORT int mail_init(bool firstLoad) + qRegisterMetaType("QAbstractSocket::SocketError"); + + MainConfigurationWindow::registerUiFile(dataPath("kadu/modules/configuration/mail.ui"), mail); +- notification_manager->registerEvent("Mail", "New mail", CallbackNotRequired); +- notification_manager->registerEvent("MailError", "Connection error", CallbackNotRequired); ++ notification_manager->registerEvent("Mail", QT_TRANSLATE_NOOP("@default", "New mail"), CallbackNotRequired); ++ notification_manager->registerEvent("MailError", QT_TRANSLATE_NOOP("@default", "Mail connection error"), CallbackNotRequired); + return 0; + } + +diff --git a/modules/mail/mail.h b/modules/mail/mail.h +index 1618ea2..4036b3e 100644 +--- a/modules/mail/mail.h ++++ b/modules/mail/mail.h +@@ -13,6 +13,7 @@ + + #include + #include ++#include + + #include "main_configuration_window.h" + #include "../notify/notify.h" +diff --git a/modules/mail/translations/mail_pl.ts b/modules/mail/translations/mail_pl.ts +index 53ce629..4fa9a49 100644 +--- a/modules/mail/translations/mail_pl.ts ++++ b/modules/mail/translations/mail_pl.ts +@@ -244,4 +244,15 @@ + Jesteś pewny że chcesz kontynuować połączenie? + + ++ ++ @default ++ ++ New mail ++ Nowa poczta ++ ++ ++ Mail connection error ++ Błąd połączenia z pocztą ++ ++ +