rev 15761 - in trunk/packages/kdemultimedia/debian: . patches

Ana Beatriz Guerrero López ana at alioth.debian.org
Sun Aug 23 12:21:26 UTC 2009


Author: ana
Date: 2009-08-23 12:21:26 +0000 (Sun, 23 Aug 2009)
New Revision: 15761

Modified:
   trunk/packages/kdemultimedia/debian/changelog
   trunk/packages/kdemultimedia/debian/patches/10_kfreebsd
Log:
really fix kfreebsd


Modified: trunk/packages/kdemultimedia/debian/changelog
===================================================================
--- trunk/packages/kdemultimedia/debian/changelog	2009-08-23 12:10:28 UTC (rev 15760)
+++ trunk/packages/kdemultimedia/debian/changelog	2009-08-23 12:21:26 UTC (rev 15761)
@@ -1,3 +1,10 @@
+kdemultimedia (4:4.3.0-3) unstable; urgency=low
+
+  * Add missing part to the kfreebsd patch.  Thanks to Petr Salinger again.
+   Really (Closes: #542639).
+
+ -- Ana Beatriz Guerrero Lopez <ana at henry.aurel32.net>  Sun, 23 Aug 2009 14:18:22 +0200
+
 kdemultimedia (4:4.3.0-2) unstable; urgency=low
 
   * Add patch to fix build in kfreebsd. Thanks to Petr Salinger. 

Modified: trunk/packages/kdemultimedia/debian/patches/10_kfreebsd
===================================================================
--- trunk/packages/kdemultimedia/debian/patches/10_kfreebsd	2009-08-23 12:10:28 UTC (rev 15760)
+++ trunk/packages/kdemultimedia/debian/patches/10_kfreebsd	2009-08-23 12:21:26 UTC (rev 15761)
@@ -1,7 +1,5 @@
-Index: kdemultimedia-4.3.0/libkcompactdisc/wmlib/include/wm_config.h
-===================================================================
---- kdemultimedia-4.3.0.orig/libkcompactdisc/wmlib/include/wm_config.h	2009-08-22 14:57:41.000000000 +0200
-+++ kdemultimedia-4.3.0/libkcompactdisc/wmlib/include/wm_config.h	2009-08-22 14:58:20.000000000 +0200
+--- kdemultimedia-4.3.0.orig/libkcompactdisc/wmlib/include/wm_config.h
++++ kdemultimedia-4.3.0/libkcompactdisc/wmlib/include/wm_config.h
 @@ -106,9 +106,9 @@
   ***  ******  **  **  ******  ******  **  ******  **  *  **********
   ***  ******  **  **      **      **     ****    ***    ***********
@@ -14,10 +12,8 @@
  #define DEFAULT_CD_DEVICE	"/dev/acd0"
  #else
  #define DEFAULT_CD_DEVICE	"/dev/acd0c"
-Index: kdemultimedia-4.3.0/libkcompactdisc/wmlib/plat_freebsd.c
-===================================================================
---- kdemultimedia-4.3.0.orig/libkcompactdisc/wmlib/plat_freebsd.c	2009-08-22 14:57:19.000000000 +0200
-+++ kdemultimedia-4.3.0/libkcompactdisc/wmlib/plat_freebsd.c	2009-08-22 14:57:37.000000000 +0200
+--- kdemultimedia-4.3.0.orig/libkcompactdisc/wmlib/plat_freebsd.c
++++ kdemultimedia-4.3.0/libkcompactdisc/wmlib/plat_freebsd.c
 @@ -26,7 +26,8 @@
   *
   */
@@ -28,3 +24,12 @@
  
  #include <errno.h>
  #include <stdio.h>
+@@ -70,7 +71,7 @@
+ 
+ # define LEFT_PORT 0
+ # define RIGHT_PORT 1
+-# if __FreeBSD_version < 300000
++# if (__FreeBSD_version < 300000) && (__FreeBSD_kernel_version < 300000) 
+ #  include <scsi.h>
+ # endif
+ 




More information about the pkg-kde-commits mailing list