[oe-commits] org.oe.dev merge of '914da41cd2443e235ef11802d112b1bf24220639'

[oe commit]

merge of '914da41cd2443e235ef11802d112b1bf24220639'
     and 'd0274d4f33072ca9b28a7df0196b83a43eab6609'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: dad32ca1397c74f997dc9f4dc4602adbc841f296
ViewMTN: http://monotone.openembedded.org/revision.psp?id=dad32ca1397c74f997dc9f4dc4602adbc841f296
Files:
1
packages/sane-backends
packages/sane
packages/sane/sane-frontends_1.0.13.bb
packages/sane/sane-backends_1.0.17.bb
packages/libnetfilter-queue
packages/libnetfilter-queue/libnetfilter-queue_0.0.13.bb
Diffs:

#
# mt diff -r914da41cd2443e235ef11802d112b1bf24220639 -rdad32ca1397c74f997dc9f4dc4602adbc841f296
#
# 
# 
# rename "packages/sane-backends"
#     to "packages/sane"
# 
# add_file "packages/sane/sane-frontends_1.0.13.bb"
#  content [5388e62703a19444fc54e8d0037a6d2ed1476728]
# 
# patch "packages/sane/sane-backends_1.0.17.bb"
#  from [07b6cc439e8848fef052730e4a858171c6bda4ae]
#    to [da2359e6844078fb17b8c43ac97237b291394592]
# 
============================================================
--- packages/sane/sane-frontends_1.0.13.bb	5388e62703a19444fc54e8d0037a6d2ed1476728
+++ packages/sane/sane-frontends_1.0.13.bb	5388e62703a19444fc54e8d0037a6d2ed1476728
@@ -0,0 +1,20 @@
+DESCRIPTION = "Frontends for SANE"
+DEPENDS = "virtual/libx11 gimp sane-backends"
+LICENSE = "LGPL"
+
+PR = "r0"
+
+SRC_URI = "ftp://ftp.sane-project.org/pub/sane/old-versions/sane-frontends-${PV}/sane-frontends-${PV}.tar.gz \
+	"
+
+inherit autotools
+
+EXTRA_OECONF = "--disable-translations"
+
+PACKAGES =+ "scanadf  xcam  xscanimage"
+
+FILES_scanadf = "${bindir}/scanadf"
+FILES_xcam = "${bindir}/xcam"
+FILES_xscanimage = "${bindir}/xscanimage ${datadir}/sane"
+
+
============================================================
--- packages/sane/sane-backends_1.0.17.bb	07b6cc439e8848fef052730e4a858171c6bda4ae
+++ packages/sane/sane-backends_1.0.17.bb	da2359e6844078fb17b8c43ac97237b291394592
@@ -1,15 +1,15 @@ LICENSE = "LGPL"
 DESCRIPTION = "Scanner drivers for SANE"
 DEPENDS = "gphoto2 jpeg libusb"
 LICENSE = "LGPL"
 
-PR = "r0"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.sane-project.org/pub/sane/old-versions/sane-backends-${PV}/sane-backends-${PV}.tar.gz \
 	file://Makefile.in.patch;patch=1 \
 	file://saned.xinetd \
 	"
 
-inherit autotools
+inherit autotools pkgconfig binconfig
 
 EXTRA_OECONF = "--disable-translations"
 
@@ -26,7 +26,7 @@ RRECOMMENDS_saned = "xinetd"
 FILES_libsane-dev += "${libdir}/sane/*"
 
 RRECOMMENDS_saned = "xinetd"
-FILES_saned = "i${sbindir}/saned"
+FILES_saned = "${sbindir}/saned"
 
 FILES_sane-utils = "${bindir}/*"
 FILES_${PN}-dbg += "${libdir}/sane/.debug"
@@ -34,3 +34,9 @@ CONFFILES_libsane = "${sysconfdir}/sane.
 
 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"
 
+do_stage() {
+        autotools_stage_all    
+}
+
+
+


#
# mt diff -rd0274d4f33072ca9b28a7df0196b83a43eab6609 -rdad32ca1397c74f997dc9f4dc4602adbc841f296
#
# 
# 
# add_dir "packages/libnetfilter-queue"
# 
# add_file "packages/libnetfilter-queue/libnetfilter-queue_0.0.13.bb"
#  content [04a37192b82f73eec2eb554a8eaea7576453863a]
# 
============================================================
--- packages/libnetfilter-queue/libnetfilter-queue_0.0.13.bb	04a37192b82f73eec2eb554a8eaea7576453863a
+++ packages/libnetfilter-queue/libnetfilter-queue_0.0.13.bb	04a37192b82f73eec2eb554a8eaea7576453863a
@@ -0,0 +1,30 @@
+DESCRIPTION = "libnetfilter_queue is a userspace library providing an API to \
+packets that have been queued by the kernel packet filter. It is is part of a \
+system that deprecates the old ip_queue / libipq mechanism."
+
+SECTION = "devel/libs"
+LICENSE = "GPL"
+HOMEPAGE = "http://www.netfilter.org/projects/libnetfilter_queue/index.html"
+PR = "r0"
+
+
+# This package requires libtool-cross-1.5.24 which is not the default libtool
+# used by OE (25AUG2007)
+DEPENDS = "libnfnetlink"
+
+SRC_URI = "http://www.netfilter.org/projects/libnetfilter_queue/files/libnetfilter_queue-${PV}.tar.bz2"
+
+S = "${WORKDIR}/libnetfilter_queue-${PV}"
+
+inherit autotools pkgconfig
+
+do_configure() {
+	gnu-configize
+	libtoolize --force
+	oe_runconf
+}
+
+do_stage() {
+	autotools_stage_all
+}
+