[Pkg-kde-commits] rev 1103 - in trunk/packages/kdenetwork/debian: . patches

[Adeodato Simó]

Author: dato-guest
Date: 2005-05-24 00:30:57 +0000 (Tue, 24 May 2005)
New Revision: 1103

Added:
   trunk/packages/kdenetwork/debian/patches/13_improve-libgadu-detection.diff
Modified:
   trunk/packages/kdenetwork/debian/changelog
Log:
kdenetwork 3.3.2-6:

  * 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.


Modified: trunk/packages/kdenetwork/debian/changelog
===================================================================
--- trunk/packages/kdenetwork/debian/changelog	2005-05-23 22:27:55 UTC (rev 1102)
+++ trunk/packages/kdenetwork/debian/changelog	2005-05-24 00:30:57 UTC (rev 1103)
@@ -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.

Added: trunk/packages/kdenetwork/debian/patches/13_improve-libgadu-detection.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/13_improve-libgadu-detection.diff	2005-05-23 22:27:55 UTC (rev 1102)
+++ trunk/packages/kdenetwork/debian/patches/13_improve-libgadu-detection.diff	2005-05-24 00:30:57 UTC (rev 1103)
@@ -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;
+ 		}