diff -Nru kdenetwork-4.9.4/debian/changelog kdenetwork-4.9.5/debian/changelog --- kdenetwork-4.9.4/debian/changelog 2012-12-29 19:29:01.000000000 +0000 +++ kdenetwork-4.9.5/debian/changelog 2013-02-24 22:35:16.000000000 +0000 @@ -1,3 +1,9 @@ +kdenetwork (4:4.9.5-0ubuntu0.1) quantal; urgency=low + + * New upstream bugfix release (LP: #1094523) + + -- Philip Muškovac Sun, 30 Dec 2012 21:32:55 +0100 + kdenetwork (4:4.9.4-0ubuntu0.1) quantal; urgency=low * New upstream bugfix release (LP: #1085516) diff -Nru kdenetwork-4.9.4/debian/control kdenetwork-4.9.5/debian/control --- kdenetwork-4.9.4/debian/control 2012-12-01 23:56:11.000000000 +0000 +++ kdenetwork-4.9.5/debian/control 2012-12-30 20:32:55.000000000 +0000 @@ -8,8 +8,8 @@ José Manuel Santamaría Lema Build-Depends: cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12), - kdelibs5-dev (>= 4:4.9.4), kdepimlibs5-dev (>= 4:4.9.4), libkonq5-dev (>= 4:4.9.4), - kde-workspace-dev (>= 4:4.9.4), + kdelibs5-dev (>= 4:4.9.5), kdepimlibs5-dev (>= 4:4.9.5), libkonq5-dev (>= 4:4.9.4), + kde-workspace-dev (>= 4:4.9.5), zlib1g-dev, libjpeg-dev, libxml2-dev, libxslt1-dev, libssl-dev, libxdamage-dev, libxss-dev, libslp-dev, libidn11-dev, libxtst-dev, libvncserver-dev (>= 0.9.8.1), libqca2-dev (>= 2.0.0), Binary files /tmp/cqnZyk5g2V/kdenetwork-4.9.4/doc/kget/index.cache.bz2 and /tmp/MMsZ8dBfJ2/kdenetwork-4.9.5/doc/kget/index.cache.bz2 differ Binary files /tmp/cqnZyk5g2V/kdenetwork-4.9.4/doc/kopete/index.cache.bz2 and /tmp/MMsZ8dBfJ2/kdenetwork-4.9.5/doc/kopete/index.cache.bz2 differ Binary files /tmp/cqnZyk5g2V/kdenetwork-4.9.4/doc/kppp/index.cache.bz2 and /tmp/MMsZ8dBfJ2/kdenetwork-4.9.5/doc/kppp/index.cache.bz2 differ Binary files /tmp/cqnZyk5g2V/kdenetwork-4.9.4/doc/krdc/index.cache.bz2 and /tmp/MMsZ8dBfJ2/kdenetwork-4.9.5/doc/krdc/index.cache.bz2 differ Binary files /tmp/cqnZyk5g2V/kdenetwork-4.9.4/doc/krfb/index.cache.bz2 and /tmp/MMsZ8dBfJ2/kdenetwork-4.9.5/doc/krfb/index.cache.bz2 differ diff -Nru kdenetwork-4.9.4/kget/CMakeLists.txt kdenetwork-4.9.5/kget/CMakeLists.txt --- kdenetwork-4.9.4/kget/CMakeLists.txt 2012-11-30 00:33:23.000000000 +0000 +++ kdenetwork-4.9.5/kget/CMakeLists.txt 2012-12-27 17:42:19.300152639 +0000 @@ -17,9 +17,9 @@ if (NEPOMUK_FOUND) set(SDO_MIN_VERSION 0.4) find_package(SharedDesktopOntologies ${SDO_MIN_VERSION}) - STRING (COMPARE GREATER "${SHAREDDESKTOPONTOLOGIES_VERSION}" "${SDO_MIN_VERSION}" HAVE_NEPOMUK) endif (NEPOMUK_FOUND) -if(HAVE_NEPOMUK) +if(SharedDesktopOntologies_FOUND) + set(HAVE_NEPOMUK SharedDesktopOntologies_FOUND) include_directories( ${SOPRANO_INCLUDE_DIR} ${NEPOMUK_INCLUDE_DIR} @@ -27,7 +27,7 @@ add_definitions(-DHAVE_NEPOMUK) add_definitions(-DDISABLE_NEPOMUK_LEGACY) include(NepomukAddOntologyClasses) -endif(HAVE_NEPOMUK) +endif(SharedDesktopOntologies_FOUND) if(QCA2_FOUND) add_definitions(-DHAVE_QCA2) diff -Nru kdenetwork-4.9.4/kget/transfer-plugins/multisegmentkio/transfermultisegkiofactory.cpp kdenetwork-4.9.5/kget/transfer-plugins/multisegmentkio/transfermultisegkiofactory.cpp --- kdenetwork-4.9.4/kget/transfer-plugins/multisegmentkio/transfermultisegkiofactory.cpp 2012-11-30 00:33:21.000000000 +0000 +++ kdenetwork-4.9.5/kget/transfer-plugins/multisegmentkio/transfermultisegkiofactory.cpp 2012-12-27 17:42:19.284152839 +0000 @@ -39,7 +39,7 @@ { kDebug(5001); - if (isSupported(srcUrl)) + if (isSupported(srcUrl) && (!e || !e->firstChildElement("factories").isNull())) { return new TransferMultiSegKio(parent, this, scheduler, srcUrl, destUrl, e); } diff -Nru kdenetwork-4.9.4/kopete/kopete/kopete.desktop kdenetwork-4.9.5/kopete/kopete/kopete.desktop --- kdenetwork-4.9.4/kopete/kopete/kopete.desktop 2012-11-30 00:33:08.000000000 +0000 +++ kdenetwork-4.9.5/kopete/kopete/kopete.desktop 2012-12-27 17:42:19.180154131 +0000 @@ -95,7 +95,7 @@ GenericName[et]=Kiirsuhtlemisrakendus GenericName[eu]=Berehalako mezularitza GenericName[fa]=پیام‌رسان فوری -GenericName[fi]=Pikaviestinohjelma +GenericName[fi]=Pikaviestiohjelma GenericName[fr]=Messagerie instantanée GenericName[ga]=Clár teachtaireachtaí meandaracha GenericName[gl]=Mensaxería instantánea diff -Nru kdenetwork-4.9.4/kopete/kopete/kopete.notifyrc kdenetwork-4.9.5/kopete/kopete/kopete.notifyrc --- kdenetwork-4.9.4/kopete/kopete/kopete.notifyrc 2012-11-30 00:33:06.000000000 +0000 +++ kdenetwork-4.9.5/kopete/kopete/kopete.notifyrc 2012-12-27 17:42:19.176154181 +0000 @@ -583,7 +583,7 @@ Name[de]=Eingehende Nachricht in aktivem Chat Name[el]=Εισερχόμενο μήνυμα στην ενεργή συνομιλία Name[en_GB]=Incoming Message in Active Chat -Name[es]=Mensaje entrante en la conversación activa. +Name[es]=Mensaje entrante en la conversación activa Name[et]=Sisenev sõnum aktiivses vestluss Name[eu]=Sarrerako mezua berriketa aktiboan Name[fi]=Saapuva viesti aktiivisessa keskustelussa diff -Nru kdenetwork-4.9.4/kopete/libkopete/kopeteversion.h kdenetwork-4.9.5/kopete/libkopete/kopeteversion.h --- kdenetwork-4.9.4/kopete/libkopete/kopeteversion.h 2012-11-30 08:25:13.000000000 +0000 +++ kdenetwork-4.9.5/kopete/libkopete/kopeteversion.h 2012-12-28 07:05:40.191984676 +0000 @@ -14,10 +14,10 @@ #ifndef _KOPETE_VERSION_H_ #define _KOPETE_VERSION_H_ -#define KOPETE_VERSION_STRING "1.3.4" +#define KOPETE_VERSION_STRING "1.3.5" #define KOPETE_VERSION_MAJOR 1 #define KOPETE_VERSION_MINOR 3 -#define KOPETE_VERSION_RELEASE 4 +#define KOPETE_VERSION_RELEASE 5 #define KOPETE_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c)) #define KOPETE_VERSION \ diff -Nru kdenetwork-4.9.4/kopete/plugins/history/historylogger.cpp kdenetwork-4.9.5/kopete/plugins/history/historylogger.cpp --- kdenetwork-4.9.4/kopete/plugins/history/historylogger.cpp 2012-11-30 00:32:38.000000000 +0000 +++ kdenetwork-4.9.5/kopete/plugins/history/historylogger.cpp 2012-12-27 17:42:19.000156369 +0000 @@ -298,7 +298,7 @@ if ( msg.format() != Qt::PlainText ) msgNode = doc.createTextNode( msg.escapedBody() ); else - msgNode = doc.createTextNode( Qt::escape(msg.plainBody()) ); + msgNode = doc.createTextNode( Qt::escape(msg.plainBody()).replace('\n', "
") ); docElem.appendChild( msgElem ); msgElem.appendChild( msgNode ); @@ -405,16 +405,8 @@ Kopete::Message msg(from, to); - QString message; - if ( Qt::mightBeRichText(msgElem2.text()) ) { - message = msgElem2.text(); - } else { - msg.setPlainBody( msgElem2.text() ); - message = msg.escapedBody(); - } - msg.setHtmlBody( QString::fromLatin1("%2") - .arg( dt.toString(Qt::LocalDate), message )); + .arg( dt.toString(Qt::LocalDate), msgElem2.text() )); msg.setTimestamp( dt ); msg.setDirection( dir ); @@ -643,25 +635,17 @@ msg.setTimestamp( timestamp ); msg.setDirection( dir ); - QString message; - if ( Qt::mightBeRichText(msgElem.text()) ) { - message = msgElem.text(); - } else { - msg.setPlainBody( msgElem.text() ); - message = msg.escapedBody(); - } - if (colorize) { msg.setHtmlBody( QString::fromLatin1("%3") - .arg( fgColor.name(), timestamp.toString(Qt::LocalDate), message )); + .arg( fgColor.name(), timestamp.toString(Qt::LocalDate), msgElem.text() )); msg.setForegroundColor( fgColor ); msg.addClass( "history" ); } else { msg.setHtmlBody( QString::fromLatin1("%2") - .arg( timestamp.toString(Qt::LocalDate), message )); + .arg( timestamp.toString(Qt::LocalDate), msgElem.text() )); } if(reverseOrder) diff -Nru kdenetwork-4.9.4/kopete/plugins/pipes/kopete_pipes.desktop kdenetwork-4.9.5/kopete/plugins/pipes/kopete_pipes.desktop --- kdenetwork-4.9.4/kopete/plugins/pipes/kopete_pipes.desktop 2012-11-30 00:32:36.000000000 +0000 +++ kdenetwork-4.9.5/kopete/plugins/pipes/kopete_pipes.desktop 2012-12-27 17:42:18.804158813 +0000 @@ -78,7 +78,7 @@ Comment[de]=Mitteilungen durch ein externes Programm/Skript leiten Comment[el]=Διασωλήνωση μηνύματος μέσω εξωτερικού προγράμματος ή σεναρίου κελύφους Comment[en_GB]=Pipe messages through an external program or script -Comment[es]=Mensaje de redirección a un programa externo o script. +Comment[es]=Mensaje de redirección a un programa externo o script Comment[et]=Sõnumite suunamine läbi välise programmi või skripti Comment[eu]=Kanalizatu mezuak kanpoko programa edo script batetan zehar Comment[fi]=Putkita viestit ulkoiseen ohjelmaan tai skriptiin diff -Nru kdenetwork-4.9.4/kopete/plugins/pipes/kopete_pipes_config.desktop kdenetwork-4.9.5/kopete/plugins/pipes/kopete_pipes_config.desktop --- kdenetwork-4.9.4/kopete/plugins/pipes/kopete_pipes_config.desktop 2012-11-30 00:32:36.000000000 +0000 +++ kdenetwork-4.9.5/kopete/plugins/pipes/kopete_pipes_config.desktop 2012-12-27 17:42:18.952156966 +0000 @@ -73,7 +73,7 @@ Comment[de]=Mitteilungen durch ein externes Programm/Skript leiten Comment[el]=Διασωλήνωση μηνύματος μέσω εξωτερικού προγράμματος ή σεναρίου κελύφους Comment[en_GB]=Pipe messages through an external program or script -Comment[es]=Mensaje de redirección a un programa externo o script. +Comment[es]=Mensaje de redirección a un programa externo o script Comment[et]=Sõnumite suunamine läbi välise programmi või skripti Comment[eu]=Kanalizatu mezuak kanpoko programa edo script batetan zehar Comment[fi]=Putkita viestit ulkoiseen ohjelmaan tai skriptiin diff -Nru kdenetwork-4.9.4/kopete/plugins/translator/kopete_translator_config.desktop kdenetwork-4.9.5/kopete/plugins/translator/kopete_translator_config.desktop --- kdenetwork-4.9.4/kopete/plugins/translator/kopete_translator_config.desktop 2012-11-30 00:32:37.000000000 +0000 +++ kdenetwork-4.9.5/kopete/plugins/translator/kopete_translator_config.desktop 2012-12-27 17:42:18.976156667 +0000 @@ -101,7 +101,7 @@ Comment[el]=Μεταφράζει μηνύματα από τη μητρική σας γλώσσα σε μια άλλη Comment[en_GB]=Translates messages from your native language to another language Comment[eo]=Tradukadas mesaĝojn el via denaska lingvo al alia -Comment[es]=Traduce mensajes de su idioma materno a otro idioma. +Comment[es]=Traduce mensajes de su idioma materno a otro idioma Comment[et]=Tõlgib sõnumid sinu emakeelest mingisse muusse keelde Comment[eu]=Mezuak zure ama-hizkuntzatik beste hizkuntzara itzultzen ditu Comment[fa]=ترجمه پیامهایی با زبان مادری شما به زبانهای دیگر diff -Nru kdenetwork-4.9.4/kopete/protocols/jabber/jabberclient.cpp kdenetwork-4.9.5/kopete/protocols/jabber/jabberclient.cpp --- kdenetwork-4.9.4/kopete/protocols/jabber/jabberclient.cpp 2012-11-30 00:32:57.000000000 +0000 +++ kdenetwork-4.9.5/kopete/protocols/jabber/jabberclient.cpp 2012-12-27 17:42:19.116154924 +0000 @@ -784,7 +784,17 @@ d->jabberClient->setTimeZone ( timeZoneName (), timeZoneOffset () ); // Additional features - d->jabberClient->setFeatures(Features("http://jabber.org/protocol/xhtml-im")); + XMPP::Features features; + features.addFeature("http://jabber.org/protocol/chatstates"); + features.addFeature("http://jabber.org/protocol/mood"); + features.addFeature("http://jabber.org/protocol/muc"); + features.addFeature("http://jabber.org/protocol/pubsub"); + features.addFeature("http://jabber.org/protocol/xhtml-im"); + features.addFeature("jabber:iq:version"); + features.addFeature("jabber:x:data"); + features.addFeature("jabber:x:encrypted"); + features.addFeature("urn:xmpp:receipts"); + d->jabberClient->setFeatures(features); d->jabberClient->connectToServer ( d->jabberClientStream, jid, auth ); diff -Nru kdenetwork-4.9.4/kopete/protocols/jabber/kioslave/jabberdisco.protocol kdenetwork-4.9.5/kopete/protocols/jabber/kioslave/jabberdisco.protocol --- kdenetwork-4.9.4/kopete/protocols/jabber/kioslave/jabberdisco.protocol 2012-11-30 00:32:54.000000000 +0000 +++ kdenetwork-4.9.5/kopete/protocols/jabber/kioslave/jabberdisco.protocol 2012-12-27 17:42:19.096155169 +0000 @@ -22,7 +22,7 @@ Description[el]=Ένα kioslave για την ανίχνευση υπηρεσίας Jabber Description[en_GB]=A KIO slave for Jabber Service Discovery Description[eo]=KIO-sklavo por malkovri ĵaberajn servojn -Description[es]=Un esclavo KIO para el servicio de descubrimiento jabber +Description[es]=Un KIO slave para el servicio de descubrimiento jabber Description[et]=Jabberi teenuste tuvastamise KIO-moodul Description[eu]=Jabber aurkikuntza zerbitzuaren KIO morroi bat Description[fa]=یک پیرو KIO برای خدمت اکتشافی Jabber diff -Nru kdenetwork-4.9.4/krfb/kcm_krfb/kcmkrfb.desktop kdenetwork-4.9.5/krfb/kcm_krfb/kcmkrfb.desktop --- kdenetwork-4.9.4/krfb/kcm_krfb/kcmkrfb.desktop 2012-11-30 00:32:34.000000000 +0000 +++ kdenetwork-4.9.5/krfb/kcm_krfb/kcmkrfb.desktop 2012-12-27 17:42:19.240153385 +0000 @@ -159,6 +159,7 @@ Comment[zh_HK]=設定桌面分享 Comment[zh_TW]=設定桌面分享 X-KDE-Keywords=desktop sharing,krfb,vnc,sharing,krdc,remote desktop connection,invitation,port,slp,uninvited +X-KDE-Keywords[bs]=desktop sharing,krfb,vnc,sharing,krdc,remote desktop connection,invitation,port,slp,uninvited,dijeljenje desktopa,udaljeni desktop,nepozvan X-KDE-Keywords[ca]=compartició d'escriptori,krfb,vnc,compartició,krdc,connexió d'escriptori remot,invitació,port,slp,no invitat X-KDE-Keywords[ca@valencia]=compartició d'escriptori,krfb,vnc,compartició,krdc,connexió d'escriptori remot,invitació,port,slp,no invitat X-KDE-Keywords[da]=skrivebordsdeling,krfb,vnc,deling,krdc,remote desktop,fjernskrivebord,invitation,port,slp,uinviteret