sane-backends: update to 1.0.17

5 files changed, 11 insertions, 12 deletions

diff --git a/packages/sane-backends/sane-backends-1.0.15/.mtn2git_empty b/packages/sane-backends/sane-backends-1.0.17/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/sane-backends/sane-backends-1.0.15/.mtn2git_empty
+++ b/packages/sane-backends/sane-backends-1.0.17/.mtn2git_empty
diff --git a/packages/sane-backends/sane-backends-1.0.15/Makefile.in.patch b/packages/sane-backends/sane-backends-1.0.17/Makefile.in.patch
index d73a2f0fb5..d73a2f0fb5 100644
--- a/packages/sane-backends/sane-backends-1.0.15/Makefile.in.patch
+++ b/packages/sane-backends/sane-backends-1.0.17/Makefile.in.patch
diff --git a/packages/sane-backends/sane-backends-1.0.15/sane-plustek.patch b/packages/sane-backends/sane-backends-1.0.17/sane-plustek.patch
index f6920c6e22..f6920c6e22 100644
--- a/packages/sane-backends/sane-backends-1.0.15/sane-plustek.patch
+++ b/packages/sane-backends/sane-backends-1.0.17/sane-plustek.patch
diff --git a/packages/sane-backends/sane-backends-1.0.15/saned.xinetd b/packages/sane-backends/sane-backends-1.0.17/saned.xinetd
index f4e890fdbe..f4e890fdbe 100644
--- a/packages/sane-backends/sane-backends-1.0.15/saned.xinetd
+++ b/packages/sane-backends/sane-backends-1.0.17/saned.xinetd
diff --git a/packages/sane-backends/sane-backends_1.0.15.bb b/packages/sane-backends/sane-backends_1.0.17.bb
index 838a958a66..b4ef25486a 100644
--- a/packages/sane-backends/sane-backends_1.0.15.bb
+++ b/packages/sane-backends/sane-backends_1.0.17.bb
@@ -1,37 +1,36 @@
 DESCRIPTION = "Scanner drivers for SANE"
-PR = "r4"
 DEPENDS = "gphoto2 jpeg libusb"
 LICENSE = "LGPL"
 
+PR = "r0"
+
 SRC_URI = "ftp://ftp.sane-project.org/pub/sane/old-versions/sane-backends-${PV}/sane-backends-${PV}.tar.gz \
-	file://sane-plustek.patch;patch=1 \
 	file://Makefile.in.patch;patch=1 \
 	file://saned.xinetd \
 	"
 
-EXTRA_OECONF = "--disable-translations"
-
 inherit autotools
 
+EXTRA_OECONF = "--disable-translations"
+
 do_install_append() {
 	install -d "${D}/${sysconfdir}/xinetd.d"
 	install -m 755 "${S}/tools/.libs/sane-find-scanner" "${D}/${bindir}"
 	install -m 644 "${WORKDIR}/saned.xinetd" "${D}/${sysconfdir}/xinetd.d/saned"
 }
 
-PACKAGES = "libsane saned sane-utils"
+PACKAGES =+ "libsane libsane-dev saned sane-utils"
 
-FILES_libsane = "/usr/lib/sane/*.so.* /usr/lib/lib*.so.* /etc"
-PKG_libsane = "libsane"
-RCONFLICTS = "sane-backends"
+FILES_libsane = "${libdir}/sane/*.so.* ${libdir}/lib*.so.* /etc"
 RRECOMMENDS_libsane = "saned sane-utils"
+FILES_libsane-dev += "${libdir}/sane/*"
 
-RDEPENDS_saned = "libsane"
 RRECOMMENDS_saned = "xinetd"
-FILES_saned = "/usr/sbin/saned"
+FILES_saned = "i${sbindir}/saned"
+
+FILES_sane-utils = "${bindir}/*"
+FILES_${PN}-dbg += "${libdir}/sane/.debug"
 
-RDEPENDS_sane-utils = "libsane"
-FILES_sane-utils = "/usr/bin"
 
 CONFFILES_libsane = "${sysconfdir}/sane.d/abaton.conf ${sysconfdir}/sane.d/agfafocus.conf ${sysconfdir}/sane.d/apple.conf ${sysconfdir}/sane.d/artec.conf ${sysconfdir}/sane.d/avision.conf ${sysconfdir}/sane.d/bh.conf ${sysconfdir}/sane.d/canon.conf ${sysconfdir}/sane.d/canon630u.conf ${sysconfdir}/sane.d/coolscan.conf ${sysconfdir}/sane.d/coolscan2.conf ${sysconfdir}/sane.d/dc25.conf ${sysconfdir}/sane.d/dmc.conf ${sysconfdir}/sane.d/epson.conf ${sysconfdir}/sane.d/fujitsu.conf ${sysconfdir}/sane.d/gt68xx.conf ${sysconfdir}/sane.d/hp.conf  ${sysconfdir}/sane.d/leo.conf ${sysconfdir}/sane.d/matsushita.conf ${sysconfdir}/sane.d/microtek.conf ${sysconfdir}/sane.d/microtek2.conf ${sysconfdir}/sane.d/mustek.conf ${sysconfdir}/sane.d/mustek_usb.conf ${sysconfdir}/sane.d/nec.conf ${sysconfdir}/sane.d/pie.conf ${sysconfdir}/sane.d/plustek.conf ${sysconfdir}/sane.d/plustek_pp.conf ${sysconfdir}/sane.d/ricoh.conf ${sysconfdir}/sane.d/s9036.conf ${sysconfdir}/sane.d/sceptre.conf ${sysconfdir}/sane.d/sharp.conf ${sysconfdir}/sane.d/sp15c.conf ${sysconfdir}/sane.d/st400.conf ${sysconfdir}/sane.d/tamarack.conf ${sysconfdir}/sane.d/test.conf ${sysconfdir}/sane.d/teco1.conf ${sysconfdir}/sane.d/teco2.conf ${sysconfdir}/sane.d/teco3.conf ${sysconfdir}/sane.d/umax.conf ${sysconfdir}/sane.d/umax_pp.conf ${sysconfdir}/sane.d/umax1220u.conf ${sysconfdir}/sane.d/artec_eplus48u.conf ${sysconfdir}/sane.d/ma1509.conf ${sysconfdir}/sane.d/ibm.conf ${sysconfdir}/sane.d/hp5400.conf ${sysconfdir}/sane.d/u12.conf ${sysconfdir}/sane.d/snapscan.conf ${sysconfdir}/sane.d/dc210.conf ${sysconfdir}/sane.d/dc240.conf ${sysconfdir}/sane.d/gphoto2.conf ${sysconfdir}/sane.d/qcam.conf ${sysconfdir}/sane.d/v4l.conf ${sysconfdir}/sane.d/net.conf ${sysconfdir}/sane.d/dll.conf ${sysconfdir}/sane.d/saned.conf"