Package: sane-backends
Version: 1.0.20-3
Severity: important
Tags: patch upstream fixed-upstream
User: glibc-bsd-de...@lists.alioth.debian.org
Usertags: kfreebsd
sane-backends fails to build on GNU/kFreeBSD due to a known upstream
problem. Please find below a patch, backported from upstream. Could you
please add it to the next upload ? Thanks in advance.
diff -u sane-backends-1.0.20/debian/patches/00list
sane-backends-1.0.20/debian/patches/00list
--- sane-backends-1.0.20/debian/patches/00list
+++ sane-backends-1.0.20/debian/patches/00list
@@ -11 +11 @@
-
+25_kfreebsd.dpatch
only in patch2:
unchanged:
--- sane-backends-1.0.20.orig/debian/patches/25_kfreebsd.dpatch
+++ sane-backends-1.0.20/debian/patches/25_kfreebsd.dpatch
@@ -0,0 +1,49 @@
+#!/bin/sh -e
+## 25_kfreebsd.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix linkage on GNU/kFreeBSD (from upstream)
+
+if [ $# -ne 1 ]; then
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+ -patch) patch $patch_opts -p1 < $0;;
+ -unpatch) patch $patch_opts -p1 -R < $0;;
+ *)
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as
argument"
+ exit 1;;
+esac
+
+exit 0
+
+...@dpatch@
+diff -Nurd sane-backends-1.0.20.orig/tools/Makefile.am
sane-backends-1.0.20/tools/Makefile.am
+--- sane-backends-1.0.20.orig/tools/Makefile.am 2009-02-20 17:51:09
+0100
++++ sane-backends-1.0.20/tools/Makefile.am 2009-05-14 00:08:26 +0200
+@@ -32,7 +32,7 @@
+ sane_find_scanner_SOURCES = sane-find-scanner.c check-usb-chip.c \
+ ../backend/sane_strstatus.c
+ sane_find_scanner_LDADD = ../sanei/libsanei.la ../lib/liblib.la \
+- @USB_LIBS@ @IEEE1284_LIBS@
++ @USB_LIBS@ @IEEE1284_LIBS@ @SCSI_LIBS@
+
+ gamma4scanimage_SOURCES = gamma4scanimage.c
+ gamma4scanimage_LDADD = @MATH_LIB@
+diff -Nurd sane-backends-1.0.20.orig/tools/Makefile.in
sane-backends-1.0.20/tools/Makefile.in
+--- sane-backends-1.0.20.orig/tools/Makefile.in 2009-04-30 15:41:19
+0200
++++ sane-backends-1.0.20/tools/Makefile.in 2009-05-14 00:08:55 +0200
+@@ -270,7 +270,7 @@
+ ../backend/sane_strstatus.c
+
+ sane_find_scanner_LDADD = ../sanei/libsanei.la ../lib/liblib.la \
+- @USB_LIBS@ @IEEE1284_LIBS@
++ @USB_LIBS@ @IEEE1284_LIBS@ @SCSI_LIBS@
+
+ gamma4scanimage_SOURCES = gamma4scanimage.c
+ gamma4scanimage_LDADD = @MATH_LIB@
-- System Information:
Debian Release: squeeze/sid
Architecture: kfreebsd-i386 (i686)
Kernel: kFreeBSD 7.1-1-686
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
