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

[Sune Vuorela]

Author: pusling-guest
Date: 2007-07-06 22:41:26 +0000 (Fri, 06 Jul 2007)
New Revision: 6700

Added:
   trunk/packages/kdenetwork/debian/patches/01_branch_673108-673109_kopete_webcam_fix.diff
Modified:
   trunk/packages/kdenetwork/debian/changelog
Log:
fix kopete and webcams (from upstream)


Modified: trunk/packages/kdenetwork/debian/changelog
===================================================================
--- trunk/packages/kdenetwork/debian/changelog	2007-07-06 22:30:19 UTC (rev 6699)
+++ trunk/packages/kdenetwork/debian/changelog	2007-07-06 22:41:26 UTC (rev 6700)
@@ -7,6 +7,7 @@
   * Pull patch from upstream to fix issue with format toolbar (Closes: #392019)
   * Pull patch from upstream to fix webcam issues (Closes: #414424)
   * Remove libnss-mdns from kdnssd-depends. (Closes: 412084)
+  * Increase maximum count of lines in ksirc (Closes: 291968)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 06 Jul 2007 23:13:17 +0200
 

Added: trunk/packages/kdenetwork/debian/patches/01_branch_673108-673109_kopete_webcam_fix.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/01_branch_673108-673109_kopete_webcam_fix.diff	                        (rev 0)
+++ trunk/packages/kdenetwork/debian/patches/01_branch_673108-673109_kopete_webcam_fix.diff	2007-07-06 22:41:26 UTC (rev 6700)
@@ -0,0 +1,24 @@
+Index: kdenetwork/kopete/libkopete/avdevice/videodevice.cpp
+===================================================================
+--- kdenetwork/kopete/libkopete/avdevice/videodevice.cpp	(revision 673108)
++++ kdenetwork/kopete/libkopete/avdevice/videodevice.cpp	(revision 673109)
+@@ -1604,7 +1604,8 @@
+ 				case VIDEO_PALETTE_RGB32	: return PIXELFORMAT_RGB32;	break;
+ 				case VIDEO_PALETTE_YUYV		: return PIXELFORMAT_YUYV;	break;
+ 				case VIDEO_PALETTE_UYVY		: return PIXELFORMAT_UYVY;	break;
+-				case VIDEO_PALETTE_YUV420	: return PIXELFORMAT_YUV420P;	break;
++				case VIDEO_PALETTE_YUV420	:
++				case VIDEO_PALETTE_YUV420P	: return PIXELFORMAT_YUV420P;	break;
+ 				case VIDEO_PALETTE_YUV422P	: return PIXELFORMAT_YUV422P;	break;
+ 			}
+ 			break;
+@@ -1758,7 +1759,8 @@
+ 				case VIDEO_PALETTE_RGB32	: returnvalue = pixelFormatName(PIXELFORMAT_RGB32);	break;
+ 				case VIDEO_PALETTE_YUYV		: returnvalue = pixelFormatName(PIXELFORMAT_YUYV);	break;
+ 				case VIDEO_PALETTE_UYVY		: returnvalue = pixelFormatName(PIXELFORMAT_UYVY);	break;
+-				case VIDEO_PALETTE_YUV420	: returnvalue = pixelFormatName(PIXELFORMAT_YUV420P);	break;
++				case VIDEO_PALETTE_YUV420	:
++				case VIDEO_PALETTE_YUV420P	: returnvalue = pixelFormatName(PIXELFORMAT_YUV420P);	break;
+ 				case VIDEO_PALETTE_YUV422P	: returnvalue = pixelFormatName(PIXELFORMAT_YUV422P);	break;
+ 			}
+ 			break;