diff -u pidgin-2.5.2/debian/changelog pidgin-2.5.2/debian/changelog --- pidgin-2.5.2/debian/changelog +++ pidgin-2.5.2/debian/changelog @@ -1,3 +1,10 @@ +pidgin (1:2.5.2-0ubuntu1~hardy2) hardy-backports; urgency=low + + * Apply upstream patch to fix connection issue with new ICQ + protocol: debian/patches/80_fix_ICQ_new_protocol.patch (LP: #340151) + + -- Ilya Barygin Thu, 19 Mar 2009 22:35:16 +0300 + pidgin (1:2.5.2-0ubuntu1~hardy1) hardy-backports; urgency=low * Automated backport upload; no source changes. only in patch2: unchanged: --- pidgin-2.5.2.orig/debian/patches/80_fix_ICQ_new_protocol.patch +++ pidgin-2.5.2/debian/patches/80_fix_ICQ_new_protocol.patch @@ -0,0 +1,38 @@ +diff -Nur -x '*.orig' -x '*~' pidgin-2.4.1/libpurple/protocols/oscar/oscar.h pidgin-2.4.1.new/libpurple/protocols/oscar/oscar.h +--- pidgin-2.4.1/libpurple/protocols/oscar/oscar.h 2009-03-10 17:06:07.000000000 +0100 ++++ pidgin-2.4.1.new/libpurple/protocols/oscar/oscar.h 2009-03-10 17:07:08.000000000 +0100 +@@ -285,6 +285,15 @@ + "us", "en", \ + } + ++#define CLIENTINFO_ICQBASIC_14_34_3096 { \ ++ "ICQBasic", \ ++ 0x010a, \ ++ 0x0014, 0x0034, \ ++ 0x0000, 0x0c18, \ ++ 0x0000043d, \ ++ "us", "en", \ ++} ++ + #define CLIENTINFO_NETSCAPE_7_0_1 { \ + "Netscape 2000 an approved user of AOL Instant Messenger (SM)", \ + 0x1d0d, \ +@@ -311,14 +320,14 @@ + #define CLIENTINFO_PURPLE_ICQ { \ + "Purple/" VERSION, \ + 0x010a, \ +- 0x0006, 0x0000, \ +- 0x0000, 0x17ab, \ +- 0x00007535, \ ++ 0x0014, 0x0034, \ ++ 0x0000, 0x0c18, \ ++ 0x0000043d, \ + "us", "en", \ + } + + #define CLIENTINFO_AIM_KNOWNGOOD CLIENTINFO_AIM_5_1_3036 +-#define CLIENTINFO_ICQ_KNOWNGOOD CLIENTINFO_ICQBASIC_14_34_3000 ++#define CLIENTINFO_ICQ_KNOWNGOOD CLIENTINFO_ICQBASIC_14_34_3096 + + typedef enum + {