Hi,
Please find attached the diff of the NMU that have just been upload.
Bye,
Aurelien
--
.''`. Aurelien Jarno | GPG: 1024D/F1BCDB73
: :' : Debian GNU/Linux developer | Electrical Engineer
`. `' [EMAIL PROTECTED] | [EMAIL PROTECTED]
`- people.debian.org/~aurel32 | www.aurel32.net
diff -u gnome-vfs-1.0.5/debian/changelog gnome-vfs-1.0.5/debian/changelog
--- gnome-vfs-1.0.5/debian/changelog
+++ gnome-vfs-1.0.5/debian/changelog
@@ -1,3 +1,11 @@
+gnome-vfs (1.0.5-5.3) unreleased; urgency=low
+
+ * Non-maintainer upload.
+ * gcc-4.0 fixes (bug #263186).
+ * Added a patch for GNU/kFreeBSD.
+
+ -- Aurelien Jarno <[EMAIL PROTECTED]> Sat, 27 Aug 2005 19:24:02 +0200
+
gnome-vfs (1.0.5-5.2) unstable; urgency=high
* Non-Maintainer Upload
--- gnome-vfs-1.0.5.orig/modules/cdda-method.c
+++ gnome-vfs-1.0.5/modules/cdda-method.c
@@ -620,7 +620,11 @@
// Check and see if we already have opened and stashed this drive
if (!use_base) {
if (global_context != NULL) {
+#if defined(__linux__)
if (strcmp (drive->cdda_device_name,
global_context->drive->cdda_device_name) == 0) {
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ if (strcmp (drive->dev->device_path,
global_context->drive->dev->device_path) == 0) {
+#endif
use_cache = TRUE;
cdda_close (drive);
gnome_vfs_file_info_copy (file_info,
global_context->file_info);
@@ -705,7 +709,11 @@
if (!use_base) {
// Check for cache
if (global_context != NULL) {
+#if defined(__linux__)
if (strcmp (drive->cdda_device_name,
global_context->drive->cdda_device_name) != 0) {
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ if (strcmp (drive->dev->device_path,
global_context->drive->dev->device_path) != 0) {
+#endif
// Clear old cache
cdda_context_free (global_context);
global_context = cdda_context_new
(drive, uri);
--- gnome-vfs-1.0.5.orig/libgnomevfs/gnome-vfs-process.c
+++ gnome-vfs-1.0.5/libgnomevfs/gnome-vfs-process.c
@@ -258,7 +258,7 @@
*
* Return value: A numeric value reporting the result of the operation.
**/
-GnomeVFSProcessRunResult
+GnomeVFSProcessResult
gnome_vfs_process_signal (GnomeVFSProcess *process,
guint signal_number)
{
--- gnome-vfs-1.0.5.orig/libgnomevfs/gnome-vfs-private-utils.c
+++ gnome-vfs-1.0.5/libgnomevfs/gnome-vfs-private-utils.c
@@ -263,7 +263,7 @@
*
* Return value:
**/
-GnomeVFSProcessResult
+GnomeVFSProcessRunResult
gnome_vfs_process_run_cancellable (const gchar *file_name,
const gchar * const argv[],
GnomeVFSProcessOptions options,
