Hola,

kdenetwork/4:3.5.9-4 includes fixed for 2 important bugs #488871, makes icq
usable again in kopete and #444475 remove a bashim that made kopete hang
sometimes.
There is as well a patch for GNU/kFreeBSD support that is innofensive.

Thanks,
Ana


diff -u kdenetwork-3.5.9/debian/changelog kdenetwork-3.5.9/debian/changelog
--- kdenetwork-3.5.9/debian/changelog
+++ kdenetwork-3.5.9/debian/changelog
@@ -1,3 +1,18 @@
+kdenetwork (4:3.5.9-4) unstable; urgency=low
+
+  +++ Changes by Aurelien Jarno:
+
+  * Add GNU/kFreeBSD support patch:
+    - 26_kfreebsd_support.diff
+ 
+  +++ Changes by Ana Beatriz Guerrero Lopez:
+
+  * Update ICQ default version settings in kopete to get it working after ICQ
+    network update. Patch 27. (Closes: #488871)
+  * Remove bashism in /usr/bin/kopete_latexconvert.sh. (Closes: #444475)
+
+ -- Debian Qt/KDE Maintainers <[EMAIL PROTECTED]>  Sat, 09 Aug 2008 17:04:57 
+0200
+
 kdenetwork (4:3.5.9-3) unstable; urgency=low
   
   * KDE_3_5_BRANCH update (up to r825626):
--- kdenetwork-3.5.9.orig/debian/patches/27_kopete_icq_update.diff
+++ kdenetwork-3.5.9/debian/patches/27_kopete_icq_update.diff
@@ -0,0 +1,22 @@
+diff -Naur 
kdenetwork-3.5.9.orig/kopete/protocols/oscar/oscarversionupdater.cpp 
kdenetwork-3.5.9/kopete/protocols/oscar/oscarversionupdater.cpp
+--- kdenetwork-3.5.9.orig/kopete/protocols/oscar/oscarversionupdater.cpp       
2008-02-14 01:11:52.000000000 +0100
++++ kdenetwork-3.5.9/kopete/protocols/oscar/oscarversionupdater.cpp    
2008-07-01 20:06:00.000000000 +0200
+@@ -89,13 +89,13 @@
+       kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << endl;
+       KConfigGroup config( KGlobal::config(), "ICQVersion" );
+       
+-      mICQVersion.clientString = config.readEntry( "ClientString", "ICQBasic" 
);
++      mICQVersion.clientString = config.readEntry( "ClientString", "ICQ 
Client" );
+       mICQVersion.clientId = config.readEntry( "ClientId", "0x010A" 
).toUShort( 0, 0 );
+-      mICQVersion.major = config.readEntry( "Major", "0x0014" ).toUShort( 0, 
0 );
+-      mICQVersion.minor = config.readEntry( "Minor", "0x0034" ).toUShort( 0, 
0 );
++      mICQVersion.major = config.readEntry( "Major", "0x0006" ).toUShort( 0, 
0 );
++      mICQVersion.minor = config.readEntry( "Minor", "0x0000" ).toUShort( 0, 
0 );
+       mICQVersion.point = config.readEntry( "Point", "0x0000" ).toUShort( 0, 
0 );
+-      mICQVersion.build = config.readEntry( "Build", "0x0BB8" ).toUShort( 0, 
0 );
+-      mICQVersion.other = config.readEntry( "Other", "0x0000043D" ).toUInt( 
0, 0 );
++      mICQVersion.build = config.readEntry( "Build", "0x17AB" ).toUShort( 0, 
0 );
++      mICQVersion.other = config.readEntry( "Other", "0x00007535" ).toUInt( 
0, 0 );
+       mICQVersion.country = config.readEntry( "Country", "us" );
+       mICQVersion.lang = config.readEntry( "Lang", "en" );
+ }
only in patch2:
unchanged:
--- kdenetwork-3.5.9.orig/debian/patches/26_kfreebsd_support.diff
+++ kdenetwork-3.5.9/debian/patches/26_kfreebsd_support.diff
@@ -0,0 +1,40 @@
+--- kdenetwork-3.5.9.orig/kopete/libkopete/avdevice/videocontrol.h
++++ kdenetwork-3.5.9/kopete/libkopete/avdevice/videocontrol.h
+@@ -20,15 +20,7 @@
+ #ifndef KOPETE_AVVIDEOCONTROL_H
+ #define KOPETE_AVVIDEOCONTROL_H
+ 
+-#include <asm/types.h>
+-#undef __STRICT_ANSI__
+-#ifndef __u64 //required by videodev.h
+-#define __u64 unsigned long long
+-#endif // __u64
+-
+-#ifndef __s64 //required by videodev.h
+-#define __s64 long long
+-#endif // __s64
++#include <stdint.h>
+ 
+ #include <qstring.h>
+ #include <kdebug.h>
+@@ -65,14 +57,14 @@
+       ~VideoControl();
+ 
+ protected:
+-      __u32 m_id;
++      uint32_t m_id;
+       control_type m_type;
+       QString m_name;
+-      __s32 m_minimum;
+-      __s32 m_maximum;
+-      __s32 m_step;
+-      __s32 m_default;
+-      __u32 m_flags;
++      int32_t m_minimum;
++      int32_t m_maximum;
++      int32_t m_step;
++      int32_t m_default;
++      uint32_t m_flags;
+ };
+ 
+ }
--- kdenetwork-3.5.9.orig/debian/patches/28_kopete_latexconvert_patch.diff
+++ kdenetwork-3.5.9/debian/patches/28_kopete_latexconvert_patch.diff
@@ -0,0 +1,12 @@
+diff -Nru kdenetwork-3.5.8/kopete/plugins/latex/kopete_latexconvert.sh 
kdenetwork-3.5.8.new/kopete/plugins/latex/kopete_latexconvert.sh
+--- kdenetwork-3.5.8/kopete/plugins/latex/kopete_latexconvert.sh       
2005-09-10 10:20:16.000000000 +0200
++++ kdenetwork-3.5.8.new/kopete/plugins/latex/kopete_latexconvert.sh   
2007-12-18 14:02:58.000000000 +0100
+@@ -222,7 +222,7 @@
+       mv $tmpdir/out.$format.0 $outfile
+ fi
+ 
+-let OPTIND=$OPTIND+1
++OPTIND=$(($OPTIND+1))
+ outfile=""
+ done
+ 


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to