[pkg-freevo-commits] r236 - in packages/kaa-metadata/trunk/debian: . patches

[Andrea Mennucci]

Author: mennucc1
Date: 2012-01-06 20:53:14 +0000 (Fri, 06 Jan 2012)
New Revision: 236

Added:
   packages/kaa-metadata/trunk/debian/patches/02_kfreebsd.diff
Modified:
   packages/kaa-metadata/trunk/debian/changelog
   packages/kaa-metadata/trunk/debian/patches/series
Log:
kaa-metadata 0.7.7+svn4596-3

Modified: packages/kaa-metadata/trunk/debian/changelog
===================================================================
--- packages/kaa-metadata/trunk/debian/changelog	2012-01-06 19:53:30 UTC (rev 235)
+++ packages/kaa-metadata/trunk/debian/changelog	2012-01-06 20:53:14 UTC (rev 236)
@@ -1,3 +1,9 @@
+kaa-metadata (0.7.7+svn4596-3) unstable; urgency=low
+
+  * use patch 02_kfreebsd.diff from python-cddb
+
+ -- A Mennucc1 <mennucc1 at debian.org>  Fri, 06 Jan 2012 21:41:51 +0100
+
 kaa-metadata (0.7.7+svn4596-2) unstable; urgency=low
 
   * bump build-dependencies to avoid FTBFS

Added: packages/kaa-metadata/trunk/debian/patches/02_kfreebsd.diff
===================================================================
--- packages/kaa-metadata/trunk/debian/patches/02_kfreebsd.diff	                        (rev 0)
+++ packages/kaa-metadata/trunk/debian/patches/02_kfreebsd.diff	2012-01-06 20:53:14 UTC (rev 236)
@@ -0,0 +1,29 @@
+--- x/src/disc/cdrommodule.c
++++ x/src/disc/cdrommodule.c
+@@ -28,7 +28,7 @@
+ #include <linux/cdrom.h>
+ #endif
+ 
+-#if defined(sun) || defined(__FreeBSD__) || defined(__OpenBSD__)
++#if defined(sun) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
+ #include <sys/cdio.h>
+ #endif
+ 
+@@ -38,7 +38,7 @@
+  * so that we don't have to repeat the code.
+  */
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ 
+ #define CDDB_TOC_HEADER_STRUCT ioc_toc_header 
+ #define CDDB_STARTING_TRACK_FIELD starting_track 
+@@ -92,7 +92,7 @@
+ 
+ #define CDDB_DEFAULT_CDROM_FLAGS O_RDONLY | O_NONBLOCK
+ 
+-#endif /* __FreeBSD__ */
++#endif /* __FreeBSD__ || __FreeBSD_kernel__ */
+ 
+ static PyObject *cdrom_error;
+ 

Modified: packages/kaa-metadata/trunk/debian/patches/series
===================================================================
--- packages/kaa-metadata/trunk/debian/patches/series	2012-01-06 19:53:30 UTC (rev 235)
+++ packages/kaa-metadata/trunk/debian/patches/series	2012-01-06 20:53:14 UTC (rev 236)
@@ -1,2 +1,2 @@
 001_remove-shebangs.patch
-
+02_kfreebsd.diff