Package: bitpim
Severity: important
Tags: patch
Hi,
currently your package FTBFS on GNU/kFreeBSD with the following error:
> ==== src/native/av/bmp2avi
> Traceback (most recent call last):
> File "packaging/buildmodules.py", line 71, in ?
> fname={'linux2': 'bmp2avi.lbin',
> KeyError: 'gnukfreebsd6'
> make: *** [debian/stamp-built] Error 1
Full build logs are available at
<http://experimental.ftbfs.de/build.php?arch=kfreebsd-i386&pkg=bitpim>.
Please find attached a patch to fix this. That's the same kind of patch
that I proposed for Blender, and it allows the build on various FreeBSD
kernels (some months ago, 5.x series were used, nowadays, we have 6.x
and in experimental, 7.x is warming up), that's the reason for the use
of startswith().
It would also be fine if you could suggest upstream to add a check for
the second hunk, since here it defaults to GNU/kFreeBSD, but that could
be misleading for the porting on other platforms.
Cheers,
--
Cyril Brulebois
--- bitpim-0.9.12.dfsg.1/packaging/buildmodules.py 2007-03-10
16:16:37.235935000 +0100
+++ bitpim-0.9.12.dfsg.1/packaging/buildmodules.py 2007-03-10
16:39:11.000000000 +0100
@@ -35,7 +35,7 @@
if "usb" in args:
# USB
print "===== src/native/usb"
- if sys.platform in ('darwin', 'linux2'):
+ if sys.platform in ('darwin', 'linux2') or
sys.platform.startswith('gnukfreebsd'):
os.chdir("src/native/usb")
if os.path.exists("_libusb.so"):
os.remove("_libusb.so")
@@ -68,9 +68,13 @@
if "bmp2avi" in args:
# BMP2AVI convertor
print "==== src/native/av/bmp2avi"
- fname={'linux2': 'bmp2avi.lbin',
- 'darwin': 'bmp2avi.mbin',
- 'win32': 'bmp2avi.exe'}[sys.platform]
+ if fname in ('linux2', 'darwin', 'win32'):
+ fname={'linux2': 'bmp2avi.lbin',
+ 'darwin': 'bmp2avi.mbin',
+ 'win32': 'bmp2avi.exe'}[sys.platform]
+ else:
+ # GNU/kFreeBSD case, but a startswith() check could be interesting
+ fname='bmp2avi.lbin'
if os.path.exists(os.path.join("helpers", fname)):
os.remove(os.path.join("helpers", fname))
os.chdir("src/native/av/bmp2avi")
