rev 11885 - in trunk/packages/kdenetwork/debian: . patches

[Ana Beatriz Guerrero López]

Author: ana
Date: 2008-08-09 01:08:37 +0000 (Sat, 09 Aug 2008)
New Revision: 11885

Added:
   trunk/packages/kdenetwork/debian/patches/26_kfreebsd_support.diff
Removed:
   trunk/packages/kdenetwork/debian/patches/26_kfreebsd.diff
Modified:
   trunk/packages/kdenetwork/debian/changelog
Log:
fix changelog


Modified: trunk/packages/kdenetwork/debian/changelog
===================================================================
--- trunk/packages/kdenetwork/debian/changelog	2008-08-08 21:01:46 UTC (rev 11884)
+++ trunk/packages/kdenetwork/debian/changelog	2008-08-09 01:08:37 UTC (rev 11885)
@@ -2,11 +2,15 @@
 
   +++ Changes by Aurelien Jarno:
 
-  * Add GNU/kFreeBSD patch:
-    - 26_kfreebsd.diff
+  * Add GNU/kFreeBSD support patch:
+    - 26_kfreebsd_support.diff
+ 
+  +++ Changes by Ana Beatriz Guerrero Lopez:
 
- -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Fri, 08 Aug 2008 02:18:31 +0200
+  * TODO: icq problem.
 
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 09 Aug 2008 03:13:17 +0200
+
 kdenetwork (4:3.5.9-3) unstable; urgency=low
   
   * KDE_3_5_BRANCH update (up to r825626):

Deleted: trunk/packages/kdenetwork/debian/patches/26_kfreebsd.diff

Copied: trunk/packages/kdenetwork/debian/patches/26_kfreebsd_support.diff (from rev 11884, trunk/packages/kdenetwork/debian/patches/26_kfreebsd.diff)
===================================================================
--- trunk/packages/kdenetwork/debian/patches/26_kfreebsd_support.diff	                        (rev 0)
+++ trunk/packages/kdenetwork/debian/patches/26_kfreebsd_support.diff	2008-08-09 01:08:37 UTC (rev 11885)
@@ -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;
+ };
+ 
+ }


Property changes on: trunk/packages/kdenetwork/debian/patches/26_kfreebsd_support.diff
___________________________________________________________________
Name: svn:mergeinfo
   +