[Pkg-gtkpod-devel] r405 - in libgpod/trunk/debian: . patches

[Frank Lichtenheld]

Author: djpig
Date: 2009-10-26 20:36:06 +0000 (Mon, 26 Oct 2009)
New Revision: 405

Added:
   libgpod/trunk/debian/patches/10_hal-kfreebsd.dpatch
Modified:
   libgpod/trunk/debian/changelog
   libgpod/trunk/debian/control
   libgpod/trunk/debian/patches/00list
   libgpod/trunk/debian/rules
Log:
Apply patch by Petr Salinger to fix compilation on
kFreeBSD


Modified: libgpod/trunk/debian/changelog
===================================================================
--- libgpod/trunk/debian/changelog	2009-10-26 20:34:07 UTC (rev 404)
+++ libgpod/trunk/debian/changelog	2009-10-26 20:36:06 UTC (rev 405)
@@ -1,8 +1,10 @@
 libgpod (0.7.2-2) unstable; urgency=low
 
   * Acknowledge NMU
+  * Apply patch from Petr Salinger to make libgpod compile
+    on kfreebsd again. (Closes: #545952)
 
- -- Frank Lichtenheld <djpig at debian.org>  Mon, 26 Oct 2009 21:24:38 +0100
+ -- Frank Lichtenheld <djpig at debian.org>  Mon, 26 Oct 2009 21:31:18 +0100
 
 libgpod (0.7.2-1.1) unstable; urgency=low
 

Modified: libgpod/trunk/debian/control
===================================================================
--- libgpod/trunk/debian/control	2009-10-26 20:34:07 UTC (rev 404)
+++ libgpod/trunk/debian/control	2009-10-26 20:36:06 UTC (rev 405)
@@ -5,7 +5,7 @@
 Uploaders: Frank Lichtenheld <djpig at debian.org>
 Build-Depends: debhelper (>= 6.07), autotools-dev, dpatch, intltool, pkg-config,
  libglib2.0-dev (>= 2.16), libgtk2.0-dev, libxml2-dev,
- libhal-dev [!kfreebsd-i386 !kfreebsd-amd64], libsgutils2-dev,
+ libhal-dev [!hurd-i386], libsgutils2-dev,
  swig, python (>= 2.3.5-7), python-all-dev, python-central (>= 0.5), python-mutagen, python-gobject-dev,
  xsltproc, docbook-xml, gtk-doc-tools
 Homepage: http://www.gtkpod.org/libgpod.html

Modified: libgpod/trunk/debian/patches/00list
===================================================================
--- libgpod/trunk/debian/patches/00list	2009-10-26 20:34:07 UTC (rev 404)
+++ libgpod/trunk/debian/patches/00list	2009-10-26 20:36:06 UTC (rev 405)
@@ -1 +1,2 @@
+10_hal-kfreebsd
 25_xsltproc-nonet

Added: libgpod/trunk/debian/patches/10_hal-kfreebsd.dpatch
===================================================================
--- libgpod/trunk/debian/patches/10_hal-kfreebsd.dpatch	                        (rev 0)
+++ libgpod/trunk/debian/patches/10_hal-kfreebsd.dpatch	2009-10-26 20:36:06 UTC (rev 405)
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_hal-kfreebsd.dpatch by Frank Lichtenheld <djpig at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Allow compiling the hal callout on kFreeBSD
+
+ at DPATCH@
+diff -urNad trunk~/tools/hal-callout.c trunk/tools/hal-callout.c
+--- trunk~/tools/hal-callout.c	2009-10-26 21:27:32.000000000 +0100
++++ trunk/tools/hal-callout.c	2009-10-26 21:28:46.000000000 +0100
+@@ -43,6 +43,7 @@
+ 
+ static char *mount_ipod (const char *dev_path)
+ {
++#ifdef __linux__
+         char *filename;
+         char *tmpname;
+         const char *fstype;
+@@ -70,6 +71,10 @@
+         }
+ 
+         return tmpname;
++#else
++#warning mount wrapper for your OS is missing
++        return NULL;
++#endif                
+ }
+ 
+ static gboolean write_sysinfo_extended (const char *mountpoint, 


Property changes on: libgpod/trunk/debian/patches/10_hal-kfreebsd.dpatch
___________________________________________________________________
Added: svn:executable
   + *

Modified: libgpod/trunk/debian/rules
===================================================================
--- libgpod/trunk/debian/rules	2009-10-26 20:34:07 UTC (rev 404)
+++ libgpod/trunk/debian/rules	2009-10-26 20:36:06 UTC (rev 405)
@@ -19,7 +19,7 @@
   confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
 with_hal = yes
-ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
+ifeq ($(DEB_HOST_ARCH_OS),hurd)
   with_hal = no
   confflags += --without-hal
 endif