diff -Nru kdenetwork-4.5.1/debian/changelog kdenetwork-4.5.1/debian/changelog --- kdenetwork-4.5.1/debian/changelog 2010-09-03 20:24:47.000000000 +0200 +++ kdenetwork-4.5.1/debian/changelog 2010-11-17 21:57:27.000000000 +0100 @@ -1,3 +1,10 @@ +kdenetwork (4:4.5.1-0ubuntu2.1) maverick-proposed; urgency=low + + * Add kubuntu_05_fix_icq.diff transiting from old login.oscar.aol.com to new + login server login.icq.com (LP: #676663) + + -- Harald Sitter Wed, 17 Nov 2010 21:56:16 +0100 + kdenetwork (4:4.5.1-0ubuntu2) maverick; urgency=low * Add kubuntu_04_googletalk_no_errormsg_and_knh_support.patch to: diff -Nru kdenetwork-4.5.1/debian/kopete.install kdenetwork-4.5.1/debian/kopete.install --- kdenetwork-4.5.1/debian/kopete.install 2010-09-03 20:24:47.000000000 +0200 +++ kdenetwork-4.5.1/debian/kopete.install 2010-11-17 21:55:21.000000000 +0100 @@ -173,6 +173,8 @@ usr/share/kde4/apps/kconf_update/kopete-pluginloader2.upd usr/share/kde4/apps/kconf_update/kopete-update_yahoo_server.pl usr/share/kde4/apps/kconf_update/kopete-update_yahoo_server.upd +usr/share/kde4/apps/kconf_update/kopete-update_icq_server.pl +usr/share/kde4/apps/kconf_update/kopete-update_icq_server.upd usr/share/kde4/apps/kopete/CompactContactListLayouts.xml usr/share/kde4/apps/kopete/DefaultContactListLayouts.xml usr/share/kde4/apps/kopete/icons/crystalsvg/16x16/actions/aim_connecting.mng diff -Nru kdenetwork-4.5.1/debian/patches/kubuntu_05_fix_icq.diff kdenetwork-4.5.1/debian/patches/kubuntu_05_fix_icq.diff --- kdenetwork-4.5.1/debian/patches/kubuntu_05_fix_icq.diff 1970-01-01 01:00:00.000000000 +0100 +++ kdenetwork-4.5.1/debian/patches/kubuntu_05_fix_icq.diff 2010-11-17 22:28:29.000000000 +0100 @@ -0,0 +1,88 @@ +Index: kdenetwork-4.5.1/kopete/protocols/oscar/icq/icqaccount.cpp +=================================================================== +--- kdenetwork-4.5.1.orig/kopete/protocols/oscar/icq/icqaccount.cpp 2010-11-17 21:51:20.675943998 +0100 ++++ kdenetwork-4.5.1/kopete/protocols/oscar/icq/icqaccount.cpp 2010-11-17 21:51:22.419944001 +0100 +@@ -236,7 +236,7 @@ + myself()->setOnlineStatus( protocol()->statusManager()->connectingStatus() ); + QString icqNumber = accountId(); + kDebug(14153) << "Logging in as " << icqNumber; +- QString server = configGroup()->readEntry( "Server", QString::fromLatin1( "login.oscar.aol.com" ) ); ++ QString server = configGroup()->readEntry( "Server", QString::fromLatin1( "login.icq.com" ) ); + uint port = configGroup()->readEntry( "Port", 5190 ); + + //set up the settings for the account +Index: kdenetwork-4.5.1/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp +=================================================================== +--- kdenetwork-4.5.1.orig/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp 2010-11-17 21:51:20.683944000 +0100 ++++ kdenetwork-4.5.1/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp 2010-11-17 21:51:22.419944001 +0100 +@@ -80,9 +80,9 @@ + mAccountSettings->mPasswordWidget->load(&mAccount->password()); + mAccountSettings->chkAutoLogin->setChecked(mAccount->excludeConnect()); + +- QString serverEntry = mAccount->configGroup()->readEntry("Server", "login.oscar.aol.com"); ++ QString serverEntry = mAccount->configGroup()->readEntry("Server", "login.icq.com"); + int portEntry = mAccount->configGroup()->readEntry("Port", 5190); +- mAccountSettings->optionOverrideServer->setChecked( serverEntry != "login.oscar.aol.com" || ( portEntry != 5190) ); ++ mAccountSettings->optionOverrideServer->setChecked( serverEntry != "login.icq.com" || ( portEntry != 5190) ); + + mAccountSettings->edtServerAddress->setText( serverEntry ); + mAccountSettings->edtServerPort->setValue( portEntry ); +@@ -253,7 +253,7 @@ + } + else + { +- mAccount->setServerAddress("login.oscar.aol.com"); ++ mAccount->setServerAddress("login.icq.com"); + mAccount->setServerPort(5190); + } + +Index: kdenetwork-4.5.1/kopete/kopete/kconf_update/kopete-update_icq_server.pl +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ kdenetwork-4.5.1/kopete/kopete/kconf_update/kopete-update_icq_server.pl 2010-11-17 21:53:56.923944000 +0100 +@@ -0,0 +1,20 @@ ++#!/usr/bin/perl ++ ++# AOL sold ICQ; change the default server to login.icq.com ++ ++my $inICQ = 0; ++foreach (<>) { ++ $inICQ = 1 if (/^\[Account_ICQProtocol_.*$/); ++ if ($inICQ) { ++ if (/^Server\=(.*)/) { ++ my $oldServer = $1; ++ if ($oldServer =~ m/\.aol\.com$/) { ++ print "Server=login.icq.com\n"; ++ $inICQ = 0; ++ next; ++ } ++ } ++ } ++ ++ print $_; ++} +Index: kdenetwork-4.5.1/kopete/kopete/kconf_update/kopete-update_icq_server.upd +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ kdenetwork-4.5.1/kopete/kopete/kconf_update/kopete-update_icq_server.upd 2010-11-17 21:53:52.099944001 +0100 +@@ -0,0 +1,4 @@ ++Id=kopete-update-icq-server/r1 ++File=kopeterc ++Options=overwrite ++Script=kopete-update_icq_server.pl,perl +Index: kdenetwork-4.5.1/kopete/kopete/kconf_update/CMakeLists.txt +=================================================================== +--- kdenetwork-4.5.1.orig/kopete/kopete/kconf_update/CMakeLists.txt 2010-11-17 21:51:31.739943998 +0100 ++++ kdenetwork-4.5.1/kopete/kopete/kconf_update/CMakeLists.txt 2010-11-17 21:53:12.995944000 +0100 +@@ -4,9 +4,9 @@ + endif(NOT WIN32) + + +-install( FILES kopete-pluginloader.upd kopete-nameTracking.upd kopete-initialstatus.upd kopete-gaim_to_pidgin_style.upd kopete-update_yahoo_server.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR}) ++install( FILES kopete-pluginloader.upd kopete-nameTracking.upd kopete-initialstatus.upd kopete-gaim_to_pidgin_style.upd kopete-update_yahoo_server.upd kopete-update_icq_server.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR}) + +-install( PROGRAMS kopete-pluginloader.pl kopete-update_yahoo_server.pl ++install( PROGRAMS kopete-pluginloader.pl kopete-update_yahoo_server.pl kopete-update_icq_server.pl + kopete-account-0.10.pl kopete-initialstatus.pl kopete-gaim_to_pidgin_style.pl + DESTINATION ${KCONF_UPDATE_INSTALL_DIR}) + diff -Nru kdenetwork-4.5.1/debian/patches/series kdenetwork-4.5.1/debian/patches/series --- kdenetwork-4.5.1/debian/patches/series 2010-09-03 20:24:47.000000000 +0200 +++ kdenetwork-4.5.1/debian/patches/series 2010-11-17 21:48:51.000000000 +0100 @@ -2,3 +2,4 @@ kubuntu_02_kopete-smaller-config-dialog.diff kubuntu_03_no_mediastreamer_in_wlm.diff kubuntu_04_googletalk_no_errormsg_and_knh_support.patch +kubuntu_05_fix_icq.diff