diff -u pidgin-2.4.2/debian/changelog pidgin-2.4.2/debian/changelog --- pidgin-2.4.2/debian/changelog +++ pidgin-2.4.2/debian/changelog @@ -1,3 +1,10 @@ +pidgin (1:2.4.2-2ubuntu3) intrepid; urgency=low + + * debian/patches/30_fix_icq_clientinfo.patch: Cherrypick patch from + upstream mtn repository to fix ICQ logging in failure (LP: #244591) + + -- Iain Lane Wed, 02 Jul 2008 02:10:57 +0100 + pidgin (1:2.4.2-2ubuntu2) intrepid; urgency=low * Add 75_occured-occurred.patch (LP: #217916) only in patch2: unchanged: --- pidgin-2.4.2.orig/debian/patches/30_fix_icq_clientinfo.patch +++ pidgin-2.4.2/debian/patches/30_fix_icq_clientinfo.patch @@ -0,0 +1,32 @@ +diff -Nur -x '*.orig' -x '*~' pidgin-2.4.2/libpurple/protocols/oscar/oscar.h pidgin-2.4.2.new/libpurple/protocols/oscar/oscar.h +--- pidgin-2.4.2/libpurple/protocols/oscar/oscar.h 2008-05-12 20:07:44.000000000 +0100 ++++ pidgin-2.4.2.new/libpurple/protocols/oscar/oscar.h 2008-07-02 02:10:39.000000000 +0100 +@@ -258,6 +258,15 @@ + "us", "en", \ + } + ++#define CLIENTINFO_ICQ6_6_0_6059 { \ ++ "ICQ Client", \ ++ 0x010a, \ ++ 0x0006, 0x0000, \ ++ 0x0000, 0x17ab, \ ++ 0x00007535, \ ++ "us", "en", \ ++} ++ + #define CLIENTINFO_ICQBASIC_14_3_1068 { \ + "ICQBasic", \ + 0x010a, \ +@@ -302,9 +311,9 @@ + #define CLIENTINFO_PURPLE_ICQ { \ + "Purple/" VERSION, \ + 0x010a, \ +- 0x0014, 0x0034, \ +- 0x0000, 0x0bb8, \ +- 0x0000043d, \ ++ 0x0006, 0x0000, \ ++ 0x0000, 0x17ab, \ ++ 0x00007535, \ + "us", "en", \ + } +