Please approve kdenetwork 3.3.2-5 for sarge

[Adeodato Simó <asp16@alu.ua.es>]

Hello,

  please allow kdenetwork 3.3.2-5 into sarge, it fixes the recently
  discovered "kopete links against local copy of libgadu3" problem, and
  it was agreed on IRC that it was best to get this fixed for sarge.

  Interdiff attached. The fix should work for every arch, but
  nevertheless I will review the buildd logs as they are uploaded to
  make sure.

  Thanks in advance,

-- 
Adeodato Simó
    EM: asp16 [ykwim] alu.ua.es | PK: DA6AE621
    Listening to: Luis Eduardo Aute - Más de lo mismo
 
Old men are fond of giving good advice to console themselves for their
inability to set a bad example.
                -- La Rochefoucauld, "Maxims"

diff -u kdenetwork-3.3.2/debian/changelog kdenetwork-3.3.2/debian/changelog
--- kdenetwork-3.3.2/debian/changelog
+++ kdenetwork-3.3.2/debian/changelog
@@ -1,3 +1,16 @@
+kdenetwork (4:3.3.2-5) unstable; urgency=high
+
+  * High-urgency upload for sarge targetted RC bugfix.
+
+  +++ Changes by Adeodato Simó:
+
+  * Make kopete not link against a local copy of libgadu3 (closes: #310279).
+    Teached kopete/protocols/configure.in.in to behave well if the format used
+    by gg_libgadu_version() is "YYYYMMDD" instead of "MAJOR.MINOR.YYYYMMDD".
+    See Bug#310276 for reference.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 24 May 2005 02:25:01 +0200
+
 kdenetwork (4:3.3.2-4) unstable; urgency=high
 
   * Urgency high for sarge targetted fixes of bugs at severity important.
only in patch2:
unchanged:
--- kdenetwork-3.3.2.orig/debian/patches/13_improve-libgadu-detection.diff
+++ kdenetwork-3.3.2/debian/patches/13_improve-libgadu-detection.diff
@@ -0,0 +1,75 @@
+--- kdenetwork/kopete/protocols/configure.in.in
++++ kdenetwork/kopete/protocols/configure.in.in
+@@ -42,8 +42,20 @@
+ 	int main()
+ 	{
+ #if defined __GG_LIBGADU_HAVE_PTHREAD && defined GG_LOGIN60
+-		int maj, min, date;
+-		sscanf( gg_libgadu_version(), "%u.%u.%u", &maj,&min,&date );
++		int maj, min, date, items;
++		const char *libgadu_version = gg_libgadu_version();
++
++		items = sscanf( libgadu_version, "%u.%u.%u", &maj,&min,&date );
++
++		if ( items != 3 ) { /* version in YYYYDDMM format only */
++			sscanf( libgadu_version, "%u", &date );
++
++			if ( date < 20040520 )
++				return 1;
++			else
++				return 0;
++		}
++
+ 		if ( maj != 1 ) {
+ 			return 1;
+ 		}
+--- kdenetwork/configure
++++ kdenetwork/configure
+@@ -37366,8 +37366,20 @@
+ 	int main()
+ 	{
+ #if defined __GG_LIBGADU_HAVE_PTHREAD && defined GG_LOGIN60
+-		int maj, min, date;
+-		sscanf( gg_libgadu_version(), "%u.%u.%u", &maj,&min,&date );
++		int maj, min, date, items;
++		const char *libgadu_version = gg_libgadu_version();
++
++		items = sscanf( libgadu_version, "%u.%u.%u", &maj,&min,&date );
++
++		if ( items != 3 ) { /* version in YYYYDDMM format only */
++			sscanf( libgadu_version, "%u", &date );
++
++			if ( date < 20040520 )
++				return 1;
++			else
++				return 0;
++		}
++
+ 		if ( maj != 1 ) {
+ 			return 1;
+ 		}
+--- kdenetwork/configure.in
++++ kdenetwork/configure.in
+@@ -596,8 +596,20 @@
+ 	int main()
+ 	{
+ #if defined __GG_LIBGADU_HAVE_PTHREAD && defined GG_LOGIN60
+-		int maj, min, date;
+-		sscanf( gg_libgadu_version(), "%u.%u.%u", &maj,&min,&date );
++		int maj, min, date, items;
++		const char *libgadu_version = gg_libgadu_version();
++
++		items = sscanf( libgadu_version, "%u.%u.%u", &maj,&min,&date );
++
++		if ( items != 3 ) { /* version in YYYYDDMM format only */
++			sscanf( libgadu_version, "%u", &date );
++
++			if ( date < 20040520 )
++				return 1;
++			else
++				return 0;
++		}
++
+ 		if ( maj != 1 ) {
+ 			return 1;
+ 		}

Attachment: signature.asc
Description: Digital signature