Merge branch 'master' into next

diff --git a/config/rootfiles/packages/sane b/config/rootfiles/packages/sane
index 411243e39c9c19f9290c51e00465b08990376809..4fd9b98ed228d1f6b0ca8480513eb9de4bbe4389 100644 (file)
--- a/config/rootfiles/packages/sane
+++ b/config/rootfiles/packages/sane
@@ -36,6 +36,7 @@ etc/sane.d/hp5400.conf
 etc/sane.d/hs2p.conf
 etc/sane.d/ibm.conf
 etc/sane.d/kodak.conf
+etc/sane.d/kodakaio.conf
 etc/sane.d/leo.conf
 etc/sane.d/lexmark.conf
 etc/sane.d/ma1509.conf
@@ -79,427 +80,440 @@ usr/bin/gamma4scanimage
 usr/bin/sane-config
 usr/bin/sane-find-scanner
 usr/bin/scanimage
-usr/doc/sane-1.0.22
-usr/doc/sane-1.0.22/AUTHORS
-usr/doc/sane-1.0.22/COPYING
-usr/doc/sane-1.0.22/ChangeLog
-usr/doc/sane-1.0.22/LICENSE
-usr/doc/sane-1.0.22/NEWS
-usr/doc/sane-1.0.22/PROBLEMS
-usr/doc/sane-1.0.22/PROJECTS
-usr/doc/sane-1.0.22/README
-#usr/doc/sane-1.0.22/README.aix
-#usr/doc/sane-1.0.22/README.beos
-#usr/doc/sane-1.0.22/README.darwin
-usr/doc/sane-1.0.22/README.djpeg
-#usr/doc/sane-1.0.22/README.freebsd
-#usr/doc/sane-1.0.22/README.hp-ux
-usr/doc/sane-1.0.22/README.linux
-#usr/doc/sane-1.0.22/README.netbsd
-#usr/doc/sane-1.0.22/README.openbsd
-#usr/doc/sane-1.0.22/README.os2
-#usr/doc/sane-1.0.22/README.solaris
-#usr/doc/sane-1.0.22/README.unixware2
-#usr/doc/sane-1.0.22/README.unixware7
-#usr/doc/sane-1.0.22/README.windows
-#usr/doc/sane-1.0.22/README.zeta
-#usr/doc/sane-1.0.22/backend-writing.txt
-usr/doc/sane-1.0.22/canon
-usr/doc/sane-1.0.22/canon/canon.changes
-usr/doc/sane-1.0.22/canon/canon.install2700F.txt
-#usr/doc/sane-1.0.22/gt68xx
-usr/doc/sane-1.0.22/gt68xx/gt68xx.CHANGES
-usr/doc/sane-1.0.22/gt68xx/gt68xx.TODO
-#usr/doc/sane-1.0.22/leo
-usr/doc/sane-1.0.22/leo/leo.txt
-#usr/doc/sane-1.0.22/matsushita
-usr/doc/sane-1.0.22/matsushita/matsushita.txt
-#usr/doc/sane-1.0.22/mustek
-usr/doc/sane-1.0.22/mustek/mustek.CHANGES
-#usr/doc/sane-1.0.22/mustek_usb
-usr/doc/sane-1.0.22/mustek_usb/mustek_usb.CHANGES
-usr/doc/sane-1.0.22/mustek_usb/mustek_usb.TODO
-#usr/doc/sane-1.0.22/mustek_usb2
-usr/doc/sane-1.0.22/mustek_usb2/mustek_usb2.CHANGES
-usr/doc/sane-1.0.22/mustek_usb2/mustek_usb2.TODO
-#usr/doc/sane-1.0.22/niash
-usr/doc/sane-1.0.22/niash/niash.TODO
-#usr/doc/sane-1.0.22/plustek
-usr/doc/sane-1.0.22/plustek/FAQ
-usr/doc/sane-1.0.22/plustek/MakeModule.sh
-#usr/doc/sane-1.0.22/plustek/Makefile.kernel24
-usr/doc/sane-1.0.22/plustek/Makefile.kernel26
-usr/doc/sane-1.0.22/plustek/Plustek-PARPORT-TODO.txt
-usr/doc/sane-1.0.22/plustek/Plustek-PARPORT.changes
-usr/doc/sane-1.0.22/plustek/Plustek-PARPORT.txt
-usr/doc/sane-1.0.22/plustek/Plustek-USB-TODO.txt
-usr/doc/sane-1.0.22/plustek/Plustek-USB.changes
-usr/doc/sane-1.0.22/plustek/Plustek-USB.txt
-usr/doc/sane-1.0.22/sane-backends-external.html
-usr/doc/sane-1.0.22/sane-backends.html
-usr/doc/sane-1.0.22/sane-mfgs-external.html
-usr/doc/sane-1.0.22/sane-mfgs.html
-#usr/doc/sane-1.0.22/sceptre
-usr/doc/sane-1.0.22/sceptre/s1200.txt
-#usr/doc/sane-1.0.22/teco
-usr/doc/sane-1.0.22/teco/teco1.txt
-usr/doc/sane-1.0.22/teco/teco2.txt
-usr/doc/sane-1.0.22/teco/teco3.txt
-#usr/doc/sane-1.0.22/u12
-usr/doc/sane-1.0.22/u12/U12.changes
-usr/doc/sane-1.0.22/u12/U12.todo
-#usr/doc/sane-1.0.22/umax
-usr/doc/sane-1.0.22/umax/negative-types.txt
-usr/doc/sane-1.0.22/umax/sane-logo.jpg
-usr/doc/sane-1.0.22/umax/sane-umax-advanced-options-doc.html
-usr/doc/sane-1.0.22/umax/sane-umax-advanced.jpg
-usr/doc/sane-1.0.22/umax/sane-umax-astra-doc.html
-usr/doc/sane-1.0.22/umax/sane-umax-config-doc.html
-usr/doc/sane-1.0.22/umax/sane-umax-doc.html
-usr/doc/sane-1.0.22/umax/sane-umax-histogram.jpg
-usr/doc/sane-1.0.22/umax/sane-umax-mirage-doc.html
-usr/doc/sane-1.0.22/umax/sane-umax-not-listed-doc.html
-usr/doc/sane-1.0.22/umax/sane-umax-others-doc.html
-usr/doc/sane-1.0.22/umax/sane-umax-parport-doc.html
-usr/doc/sane-1.0.22/umax/sane-umax-powerlook-doc.html
-usr/doc/sane-1.0.22/umax/sane-umax-scanner-clones-doc.html
-usr/doc/sane-1.0.22/umax/sane-umax-speed-doc.html
-usr/doc/sane-1.0.22/umax/sane-umax-standard-options-doc.html
-usr/doc/sane-1.0.22/umax/sane-umax-standard.jpg
-usr/doc/sane-1.0.22/umax/sane-umax-text.jpg
-usr/doc/sane-1.0.22/umax/sane-umax-text2.jpg
-usr/doc/sane-1.0.22/umax/sane-umax-text4.jpg
-usr/doc/sane-1.0.22/umax/sane-umax-uc-doc.html
-usr/doc/sane-1.0.22/umax/sane-umax-vista-doc.html
-usr/doc/sane-1.0.22/umax/sane-umax.jpg
-usr/doc/sane-1.0.22/umax/umax.BUGS
-usr/doc/sane-1.0.22/umax/umax.CHANGES
-usr/doc/sane-1.0.22/umax/umax.FAQ
-usr/doc/sane-1.0.22/umax/umax.TODO
+usr/doc/sane-1.0.24
+#usr/doc/sane-1.0.24/AUTHORS
+#usr/doc/sane-1.0.24/COPYING
+#usr/doc/sane-1.0.24/ChangeLog
+#usr/doc/sane-1.0.24/LICENSE
+#usr/doc/sane-1.0.24/NEWS
+#usr/doc/sane-1.0.24/PROBLEMS
+#usr/doc/sane-1.0.24/PROJECTS
+#usr/doc/sane-1.0.24/README
+#usr/doc/sane-1.0.24/README.aix
+#usr/doc/sane-1.0.24/README.beos
+#usr/doc/sane-1.0.24/README.darwin
+#usr/doc/sane-1.0.24/README.djpeg
+#usr/doc/sane-1.0.24/README.freebsd
+#usr/doc/sane-1.0.24/README.hp-ux
+#usr/doc/sane-1.0.24/README.linux
+#usr/doc/sane-1.0.24/README.netbsd
+#usr/doc/sane-1.0.24/README.openbsd
+#usr/doc/sane-1.0.24/README.os2
+#usr/doc/sane-1.0.24/README.solaris
+#usr/doc/sane-1.0.24/README.unixware2
+#usr/doc/sane-1.0.24/README.unixware7
+#usr/doc/sane-1.0.24/README.windows
+#usr/doc/sane-1.0.24/README.zeta
+#usr/doc/sane-1.0.24/backend-writing.txt
+#usr/doc/sane-1.0.24/canon
+#usr/doc/sane-1.0.24/canon/canon.changes
+#usr/doc/sane-1.0.24/canon/canon.install2700F.txt
+#usr/doc/sane-1.0.24/gt68xx
+#usr/doc/sane-1.0.24/gt68xx/gt68xx.CHANGES
+#usr/doc/sane-1.0.24/gt68xx/gt68xx.TODO
+#usr/doc/sane-1.0.24/leo
+#usr/doc/sane-1.0.24/leo/leo.txt
+#usr/doc/sane-1.0.24/matsushita
+#usr/doc/sane-1.0.24/matsushita/matsushita.txt
+#usr/doc/sane-1.0.24/mustek
+#usr/doc/sane-1.0.24/mustek/mustek.CHANGES
+#usr/doc/sane-1.0.24/mustek_usb
+#usr/doc/sane-1.0.24/mustek_usb/mustek_usb.CHANGES
+#usr/doc/sane-1.0.24/mustek_usb/mustek_usb.TODO
+#usr/doc/sane-1.0.24/mustek_usb2
+#usr/doc/sane-1.0.24/mustek_usb2/mustek_usb2.CHANGES
+#usr/doc/sane-1.0.24/mustek_usb2/mustek_usb2.TODO
+#usr/doc/sane-1.0.24/niash
+#usr/doc/sane-1.0.24/niash/niash.TODO
+#usr/doc/sane-1.0.24/plustek
+#usr/doc/sane-1.0.24/plustek/FAQ
+#usr/doc/sane-1.0.24/plustek/MakeModule.sh
+#usr/doc/sane-1.0.24/plustek/Makefile.kernel24
+#usr/doc/sane-1.0.24/plustek/Makefile.kernel26
+#usr/doc/sane-1.0.24/plustek/Plustek-PARPORT-TODO.txt
+#usr/doc/sane-1.0.24/plustek/Plustek-PARPORT.changes
+#usr/doc/sane-1.0.24/plustek/Plustek-PARPORT.txt
+#usr/doc/sane-1.0.24/plustek/Plustek-USB-TODO.txt
+#usr/doc/sane-1.0.24/plustek/Plustek-USB.changes
+#usr/doc/sane-1.0.24/plustek/Plustek-USB.txt
+#usr/doc/sane-1.0.24/sane-backends-external.html
+#usr/doc/sane-1.0.24/sane-backends.html
+#usr/doc/sane-1.0.24/sane-mfgs-external.html
+#usr/doc/sane-1.0.24/sane-mfgs.html
+#usr/doc/sane-1.0.24/sceptre
+#usr/doc/sane-1.0.24/sceptre/s1200.txt
+#usr/doc/sane-1.0.24/teco
+#usr/doc/sane-1.0.24/teco/teco1.txt
+#usr/doc/sane-1.0.24/teco/teco2.txt
+#usr/doc/sane-1.0.24/teco/teco3.txt
+#usr/doc/sane-1.0.24/u12
+#usr/doc/sane-1.0.24/u12/U12.changes
+#usr/doc/sane-1.0.24/u12/U12.todo
+#usr/doc/sane-1.0.24/umax
+#usr/doc/sane-1.0.24/umax/negative-types.txt
+#usr/doc/sane-1.0.24/umax/sane-logo.jpg
+#usr/doc/sane-1.0.24/umax/sane-umax-advanced-options-doc.html
+#usr/doc/sane-1.0.24/umax/sane-umax-advanced.jpg
+#usr/doc/sane-1.0.24/umax/sane-umax-astra-doc.html
+#usr/doc/sane-1.0.24/umax/sane-umax-config-doc.html
+#usr/doc/sane-1.0.24/umax/sane-umax-doc.html
+#usr/doc/sane-1.0.24/umax/sane-umax-histogram.jpg
+#usr/doc/sane-1.0.24/umax/sane-umax-mirage-doc.html
+#usr/doc/sane-1.0.24/umax/sane-umax-not-listed-doc.html
+#usr/doc/sane-1.0.24/umax/sane-umax-others-doc.html
+#usr/doc/sane-1.0.24/umax/sane-umax-parport-doc.html
+#usr/doc/sane-1.0.24/umax/sane-umax-powerlook-doc.html
+#usr/doc/sane-1.0.24/umax/sane-umax-scanner-clones-doc.html
+#usr/doc/sane-1.0.24/umax/sane-umax-speed-doc.html
+#usr/doc/sane-1.0.24/umax/sane-umax-standard-options-doc.html
+#usr/doc/sane-1.0.24/umax/sane-umax-standard.jpg
+#usr/doc/sane-1.0.24/umax/sane-umax-text.jpg
+#usr/doc/sane-1.0.24/umax/sane-umax-text2.jpg
+#usr/doc/sane-1.0.24/umax/sane-umax-text4.jpg
+#usr/doc/sane-1.0.24/umax/sane-umax-uc-doc.html
+#usr/doc/sane-1.0.24/umax/sane-umax-vista-doc.html
+#usr/doc/sane-1.0.24/umax/sane-umax.jpg
+#usr/doc/sane-1.0.24/umax/umax.BUGS
+#usr/doc/sane-1.0.24/umax/umax.CHANGES
+#usr/doc/sane-1.0.24/umax/umax.FAQ
+#usr/doc/sane-1.0.24/umax/umax.TODO
 #usr/include/sane
 usr/include/sane/sane.h
 usr/include/sane/saneopts.h
 #usr/lib/libsane.la
 usr/lib/libsane.so
 usr/lib/libsane.so.1
-usr/lib/libsane.so.1.0.22
+usr/lib/libsane.so.1.0.24
+#usr/lib/pkgconfig/sane-backends.pc
 #usr/lib/sane
 #usr/lib/sane/libsane-abaton.la
 usr/lib/sane/libsane-abaton.so
 usr/lib/sane/libsane-abaton.so.1
-usr/lib/sane/libsane-abaton.so.1.0.22
+usr/lib/sane/libsane-abaton.so.1.0.24
 #usr/lib/sane/libsane-agfafocus.la
 usr/lib/sane/libsane-agfafocus.so
 usr/lib/sane/libsane-agfafocus.so.1
-usr/lib/sane/libsane-agfafocus.so.1.0.22
+usr/lib/sane/libsane-agfafocus.so.1.0.24
 #usr/lib/sane/libsane-apple.la
 usr/lib/sane/libsane-apple.so
 usr/lib/sane/libsane-apple.so.1
-usr/lib/sane/libsane-apple.so.1.0.22
+usr/lib/sane/libsane-apple.so.1.0.24
 #usr/lib/sane/libsane-artec.la
 usr/lib/sane/libsane-artec.so
 usr/lib/sane/libsane-artec.so.1
-usr/lib/sane/libsane-artec.so.1.0.22
+usr/lib/sane/libsane-artec.so.1.0.24
 #usr/lib/sane/libsane-artec_eplus48u.la
 usr/lib/sane/libsane-artec_eplus48u.so
 usr/lib/sane/libsane-artec_eplus48u.so.1
-usr/lib/sane/libsane-artec_eplus48u.so.1.0.22
+usr/lib/sane/libsane-artec_eplus48u.so.1.0.24
 #usr/lib/sane/libsane-as6e.la
 usr/lib/sane/libsane-as6e.so
 usr/lib/sane/libsane-as6e.so.1
-usr/lib/sane/libsane-as6e.so.1.0.22
+usr/lib/sane/libsane-as6e.so.1.0.24
 #usr/lib/sane/libsane-avision.la
 usr/lib/sane/libsane-avision.so
 usr/lib/sane/libsane-avision.so.1
-usr/lib/sane/libsane-avision.so.1.0.22
+usr/lib/sane/libsane-avision.so.1.0.24
 #usr/lib/sane/libsane-bh.la
 usr/lib/sane/libsane-bh.so
 usr/lib/sane/libsane-bh.so.1
-usr/lib/sane/libsane-bh.so.1.0.22
+usr/lib/sane/libsane-bh.so.1.0.24
 #usr/lib/sane/libsane-canon.la
 usr/lib/sane/libsane-canon.so
 usr/lib/sane/libsane-canon.so.1
-usr/lib/sane/libsane-canon.so.1.0.22
+usr/lib/sane/libsane-canon.so.1.0.24
 #usr/lib/sane/libsane-canon630u.la
 usr/lib/sane/libsane-canon630u.so
 usr/lib/sane/libsane-canon630u.so.1
-usr/lib/sane/libsane-canon630u.so.1.0.22
+usr/lib/sane/libsane-canon630u.so.1.0.24
 #usr/lib/sane/libsane-canon_dr.la
 usr/lib/sane/libsane-canon_dr.so
 usr/lib/sane/libsane-canon_dr.so.1
-usr/lib/sane/libsane-canon_dr.so.1.0.22
+usr/lib/sane/libsane-canon_dr.so.1.0.24
 #usr/lib/sane/libsane-cardscan.la
 usr/lib/sane/libsane-cardscan.so
 usr/lib/sane/libsane-cardscan.so.1
-usr/lib/sane/libsane-cardscan.so.1.0.22
+usr/lib/sane/libsane-cardscan.so.1.0.24
 #usr/lib/sane/libsane-coolscan.la
 usr/lib/sane/libsane-coolscan.so
 usr/lib/sane/libsane-coolscan.so.1
-usr/lib/sane/libsane-coolscan.so.1.0.22
+usr/lib/sane/libsane-coolscan.so.1.0.24
 #usr/lib/sane/libsane-coolscan2.la
 usr/lib/sane/libsane-coolscan2.so
 usr/lib/sane/libsane-coolscan2.so.1
-usr/lib/sane/libsane-coolscan2.so.1.0.22
+usr/lib/sane/libsane-coolscan2.so.1.0.24
 #usr/lib/sane/libsane-coolscan3.la
 usr/lib/sane/libsane-coolscan3.so
 usr/lib/sane/libsane-coolscan3.so.1
-usr/lib/sane/libsane-coolscan3.so.1.0.22
+usr/lib/sane/libsane-coolscan3.so.1.0.24
 #usr/lib/sane/libsane-dc210.la
 usr/lib/sane/libsane-dc210.so
 usr/lib/sane/libsane-dc210.so.1
-usr/lib/sane/libsane-dc210.so.1.0.22
+usr/lib/sane/libsane-dc210.so.1.0.24
 #usr/lib/sane/libsane-dc240.la
 usr/lib/sane/libsane-dc240.so
 usr/lib/sane/libsane-dc240.so.1
-usr/lib/sane/libsane-dc240.so.1.0.22
+usr/lib/sane/libsane-dc240.so.1.0.24
 #usr/lib/sane/libsane-dc25.la
 usr/lib/sane/libsane-dc25.so
 usr/lib/sane/libsane-dc25.so.1
-usr/lib/sane/libsane-dc25.so.1.0.22
+usr/lib/sane/libsane-dc25.so.1.0.24
 #usr/lib/sane/libsane-dell1600n_net.la
 usr/lib/sane/libsane-dell1600n_net.so
 usr/lib/sane/libsane-dell1600n_net.so.1
-usr/lib/sane/libsane-dell1600n_net.so.1.0.22
+usr/lib/sane/libsane-dell1600n_net.so.1.0.24
 #usr/lib/sane/libsane-dll.la
 usr/lib/sane/libsane-dll.so
 usr/lib/sane/libsane-dll.so.1
-usr/lib/sane/libsane-dll.so.1.0.22
+usr/lib/sane/libsane-dll.so.1.0.24
 #usr/lib/sane/libsane-dmc.la
 usr/lib/sane/libsane-dmc.so
 usr/lib/sane/libsane-dmc.so.1
-usr/lib/sane/libsane-dmc.so.1.0.22
+usr/lib/sane/libsane-dmc.so.1.0.24
 #usr/lib/sane/libsane-epjitsu.la
 usr/lib/sane/libsane-epjitsu.so
 usr/lib/sane/libsane-epjitsu.so.1
-usr/lib/sane/libsane-epjitsu.so.1.0.22
+usr/lib/sane/libsane-epjitsu.so.1.0.24
 #usr/lib/sane/libsane-epson.la
 usr/lib/sane/libsane-epson.so
 usr/lib/sane/libsane-epson.so.1
-usr/lib/sane/libsane-epson.so.1.0.22
+usr/lib/sane/libsane-epson.so.1.0.24
 #usr/lib/sane/libsane-epson2.la
 usr/lib/sane/libsane-epson2.so
 usr/lib/sane/libsane-epson2.so.1
-usr/lib/sane/libsane-epson2.so.1.0.22
+usr/lib/sane/libsane-epson2.so.1.0.24
 #usr/lib/sane/libsane-fujitsu.la
 usr/lib/sane/libsane-fujitsu.so
 usr/lib/sane/libsane-fujitsu.so.1
-usr/lib/sane/libsane-fujitsu.so.1.0.22
+usr/lib/sane/libsane-fujitsu.so.1.0.24
 #usr/lib/sane/libsane-genesys.la
 usr/lib/sane/libsane-genesys.so
 usr/lib/sane/libsane-genesys.so.1
-usr/lib/sane/libsane-genesys.so.1.0.22
+usr/lib/sane/libsane-genesys.so.1.0.24
 #usr/lib/sane/libsane-gt68xx.la
 usr/lib/sane/libsane-gt68xx.so
 usr/lib/sane/libsane-gt68xx.so.1
-usr/lib/sane/libsane-gt68xx.so.1.0.22
+usr/lib/sane/libsane-gt68xx.so.1.0.24
 #usr/lib/sane/libsane-hp.la
 usr/lib/sane/libsane-hp.so
 usr/lib/sane/libsane-hp.so.1
-usr/lib/sane/libsane-hp.so.1.0.22
+usr/lib/sane/libsane-hp.so.1.0.24
 #usr/lib/sane/libsane-hp3500.la
 usr/lib/sane/libsane-hp3500.so
 usr/lib/sane/libsane-hp3500.so.1
-usr/lib/sane/libsane-hp3500.so.1.0.22
+usr/lib/sane/libsane-hp3500.so.1.0.24
 #usr/lib/sane/libsane-hp3900.la
 usr/lib/sane/libsane-hp3900.so
 usr/lib/sane/libsane-hp3900.so.1
-usr/lib/sane/libsane-hp3900.so.1.0.22
+usr/lib/sane/libsane-hp3900.so.1.0.24
 #usr/lib/sane/libsane-hp4200.la
 usr/lib/sane/libsane-hp4200.so
 usr/lib/sane/libsane-hp4200.so.1
-usr/lib/sane/libsane-hp4200.so.1.0.22
+usr/lib/sane/libsane-hp4200.so.1.0.24
 #usr/lib/sane/libsane-hp5400.la
 usr/lib/sane/libsane-hp5400.so
 usr/lib/sane/libsane-hp5400.so.1
-usr/lib/sane/libsane-hp5400.so.1.0.22
+usr/lib/sane/libsane-hp5400.so.1.0.24
 #usr/lib/sane/libsane-hp5590.la
 usr/lib/sane/libsane-hp5590.so
 usr/lib/sane/libsane-hp5590.so.1
-usr/lib/sane/libsane-hp5590.so.1.0.22
+usr/lib/sane/libsane-hp5590.so.1.0.24
 #usr/lib/sane/libsane-hpljm1005.la
 usr/lib/sane/libsane-hpljm1005.so
 usr/lib/sane/libsane-hpljm1005.so.1
-usr/lib/sane/libsane-hpljm1005.so.1.0.22
+usr/lib/sane/libsane-hpljm1005.so.1.0.24
 #usr/lib/sane/libsane-hs2p.la
 usr/lib/sane/libsane-hs2p.so
 usr/lib/sane/libsane-hs2p.so.1
-usr/lib/sane/libsane-hs2p.so.1.0.22
+usr/lib/sane/libsane-hs2p.so.1.0.24
 #usr/lib/sane/libsane-ibm.la
 usr/lib/sane/libsane-ibm.so
 usr/lib/sane/libsane-ibm.so.1
-usr/lib/sane/libsane-ibm.so.1.0.22
+usr/lib/sane/libsane-ibm.so.1.0.24
 #usr/lib/sane/libsane-kodak.la
 usr/lib/sane/libsane-kodak.so
 usr/lib/sane/libsane-kodak.so.1
-usr/lib/sane/libsane-kodak.so.1.0.22
+usr/lib/sane/libsane-kodak.so.1.0.24
+#usr/lib/sane/libsane-kodakaio.la
+usr/lib/sane/libsane-kodakaio.so
+usr/lib/sane/libsane-kodakaio.so.1
+usr/lib/sane/libsane-kodakaio.so.1.0.24
 #usr/lib/sane/libsane-kvs1025.la
 usr/lib/sane/libsane-kvs1025.so
 usr/lib/sane/libsane-kvs1025.so.1
-usr/lib/sane/libsane-kvs1025.so.1.0.22
+usr/lib/sane/libsane-kvs1025.so.1.0.24
 #usr/lib/sane/libsane-kvs20xx.la
 usr/lib/sane/libsane-kvs20xx.so
 usr/lib/sane/libsane-kvs20xx.so.1
-usr/lib/sane/libsane-kvs20xx.so.1.0.22
+usr/lib/sane/libsane-kvs20xx.so.1.0.24
+#usr/lib/sane/libsane-kvs40xx.la
+usr/lib/sane/libsane-kvs40xx.so
+usr/lib/sane/libsane-kvs40xx.so.1
+usr/lib/sane/libsane-kvs40xx.so.1.0.24
 #usr/lib/sane/libsane-leo.la
 usr/lib/sane/libsane-leo.so
 usr/lib/sane/libsane-leo.so.1
-usr/lib/sane/libsane-leo.so.1.0.22
+usr/lib/sane/libsane-leo.so.1.0.24
 #usr/lib/sane/libsane-lexmark.la
 usr/lib/sane/libsane-lexmark.so
 usr/lib/sane/libsane-lexmark.so.1
-usr/lib/sane/libsane-lexmark.so.1.0.22
+usr/lib/sane/libsane-lexmark.so.1.0.24
 #usr/lib/sane/libsane-ma1509.la
 usr/lib/sane/libsane-ma1509.so
 usr/lib/sane/libsane-ma1509.so.1
-usr/lib/sane/libsane-ma1509.so.1.0.22
+usr/lib/sane/libsane-ma1509.so.1.0.24
 #usr/lib/sane/libsane-magicolor.la
 usr/lib/sane/libsane-magicolor.so
 usr/lib/sane/libsane-magicolor.so.1
-usr/lib/sane/libsane-magicolor.so.1.0.22
+usr/lib/sane/libsane-magicolor.so.1.0.24
 #usr/lib/sane/libsane-matsushita.la
 usr/lib/sane/libsane-matsushita.so
 usr/lib/sane/libsane-matsushita.so.1
-usr/lib/sane/libsane-matsushita.so.1.0.22
+usr/lib/sane/libsane-matsushita.so.1.0.24
 #usr/lib/sane/libsane-microtek.la
 usr/lib/sane/libsane-microtek.so
 usr/lib/sane/libsane-microtek.so.1
-usr/lib/sane/libsane-microtek.so.1.0.22
+usr/lib/sane/libsane-microtek.so.1.0.24
 #usr/lib/sane/libsane-microtek2.la
 usr/lib/sane/libsane-microtek2.so
 usr/lib/sane/libsane-microtek2.so.1
-usr/lib/sane/libsane-microtek2.so.1.0.22
+usr/lib/sane/libsane-microtek2.so.1.0.24
 #usr/lib/sane/libsane-mustek.la
 usr/lib/sane/libsane-mustek.so
 usr/lib/sane/libsane-mustek.so.1
-usr/lib/sane/libsane-mustek.so.1.0.22
+usr/lib/sane/libsane-mustek.so.1.0.24
 #usr/lib/sane/libsane-mustek_pp.la
 usr/lib/sane/libsane-mustek_pp.so
 usr/lib/sane/libsane-mustek_pp.so.1
-usr/lib/sane/libsane-mustek_pp.so.1.0.22
+usr/lib/sane/libsane-mustek_pp.so.1.0.24
 #usr/lib/sane/libsane-mustek_usb.la
 usr/lib/sane/libsane-mustek_usb.so
 usr/lib/sane/libsane-mustek_usb.so.1
-usr/lib/sane/libsane-mustek_usb.so.1.0.22
+usr/lib/sane/libsane-mustek_usb.so.1.0.24
+#usr/lib/sane/libsane-mustek_usb2.la
+usr/lib/sane/libsane-mustek_usb2.so
+usr/lib/sane/libsane-mustek_usb2.so.1
+usr/lib/sane/libsane-mustek_usb2.so.1.0.24
 #usr/lib/sane/libsane-nec.la
 usr/lib/sane/libsane-nec.so
 usr/lib/sane/libsane-nec.so.1
-usr/lib/sane/libsane-nec.so.1.0.22
+usr/lib/sane/libsane-nec.so.1.0.24
 #usr/lib/sane/libsane-net.la
 usr/lib/sane/libsane-net.so
 usr/lib/sane/libsane-net.so.1
-usr/lib/sane/libsane-net.so.1.0.22
+usr/lib/sane/libsane-net.so.1.0.24
 #usr/lib/sane/libsane-niash.la
 usr/lib/sane/libsane-niash.so
 usr/lib/sane/libsane-niash.so.1
-usr/lib/sane/libsane-niash.so.1.0.22
+usr/lib/sane/libsane-niash.so.1.0.24
 #usr/lib/sane/libsane-p5.la
 usr/lib/sane/libsane-p5.so
 usr/lib/sane/libsane-p5.so.1
-usr/lib/sane/libsane-p5.so.1.0.22
+usr/lib/sane/libsane-p5.so.1.0.24
 #usr/lib/sane/libsane-pie.la
 usr/lib/sane/libsane-pie.so
 usr/lib/sane/libsane-pie.so.1
-usr/lib/sane/libsane-pie.so.1.0.22
+usr/lib/sane/libsane-pie.so.1.0.24
 #usr/lib/sane/libsane-pixma.la
 usr/lib/sane/libsane-pixma.so
 usr/lib/sane/libsane-pixma.so.1
-usr/lib/sane/libsane-pixma.so.1.0.22
+usr/lib/sane/libsane-pixma.so.1.0.24
 #usr/lib/sane/libsane-plustek.la
 usr/lib/sane/libsane-plustek.so
 usr/lib/sane/libsane-plustek.so.1
-usr/lib/sane/libsane-plustek.so.1.0.22
+usr/lib/sane/libsane-plustek.so.1.0.24
 #usr/lib/sane/libsane-plustek_pp.la
 usr/lib/sane/libsane-plustek_pp.so
 usr/lib/sane/libsane-plustek_pp.so.1
-usr/lib/sane/libsane-plustek_pp.so.1.0.22
+usr/lib/sane/libsane-plustek_pp.so.1.0.24
 #usr/lib/sane/libsane-qcam.la
 usr/lib/sane/libsane-qcam.so
 usr/lib/sane/libsane-qcam.so.1
-usr/lib/sane/libsane-qcam.so.1.0.22
+usr/lib/sane/libsane-qcam.so.1.0.24
 #usr/lib/sane/libsane-ricoh.la
 usr/lib/sane/libsane-ricoh.so
 usr/lib/sane/libsane-ricoh.so.1
-usr/lib/sane/libsane-ricoh.so.1.0.22
+usr/lib/sane/libsane-ricoh.so.1.0.24
 #usr/lib/sane/libsane-rts8891.la
 usr/lib/sane/libsane-rts8891.so
 usr/lib/sane/libsane-rts8891.so.1
-usr/lib/sane/libsane-rts8891.so.1.0.22
+usr/lib/sane/libsane-rts8891.so.1.0.24
 #usr/lib/sane/libsane-s9036.la
 usr/lib/sane/libsane-s9036.so
 usr/lib/sane/libsane-s9036.so.1
-usr/lib/sane/libsane-s9036.so.1.0.22
+usr/lib/sane/libsane-s9036.so.1.0.24
 #usr/lib/sane/libsane-sceptre.la
 usr/lib/sane/libsane-sceptre.so
 usr/lib/sane/libsane-sceptre.so.1
-usr/lib/sane/libsane-sceptre.so.1.0.22
+usr/lib/sane/libsane-sceptre.so.1.0.24
 #usr/lib/sane/libsane-sharp.la
 usr/lib/sane/libsane-sharp.so
 usr/lib/sane/libsane-sharp.so.1
-usr/lib/sane/libsane-sharp.so.1.0.22
+usr/lib/sane/libsane-sharp.so.1.0.24
 #usr/lib/sane/libsane-sm3600.la
 usr/lib/sane/libsane-sm3600.so
 usr/lib/sane/libsane-sm3600.so.1
-usr/lib/sane/libsane-sm3600.so.1.0.22
+usr/lib/sane/libsane-sm3600.so.1.0.24
 #usr/lib/sane/libsane-sm3840.la
 usr/lib/sane/libsane-sm3840.so
 usr/lib/sane/libsane-sm3840.so.1
-usr/lib/sane/libsane-sm3840.so.1.0.22
+usr/lib/sane/libsane-sm3840.so.1.0.24
 #usr/lib/sane/libsane-snapscan.la
 usr/lib/sane/libsane-snapscan.so
 usr/lib/sane/libsane-snapscan.so.1
-usr/lib/sane/libsane-snapscan.so.1.0.22
+usr/lib/sane/libsane-snapscan.so.1.0.24
 #usr/lib/sane/libsane-sp15c.la
 usr/lib/sane/libsane-sp15c.so
 usr/lib/sane/libsane-sp15c.so.1
-usr/lib/sane/libsane-sp15c.so.1.0.22
+usr/lib/sane/libsane-sp15c.so.1.0.24
 #usr/lib/sane/libsane-st400.la
 usr/lib/sane/libsane-st400.so
 usr/lib/sane/libsane-st400.so.1
-usr/lib/sane/libsane-st400.so.1.0.22
+usr/lib/sane/libsane-st400.so.1.0.24
 #usr/lib/sane/libsane-stv680.la
 usr/lib/sane/libsane-stv680.so
 usr/lib/sane/libsane-stv680.so.1
-usr/lib/sane/libsane-stv680.so.1.0.22
+usr/lib/sane/libsane-stv680.so.1.0.24
 #usr/lib/sane/libsane-tamarack.la
 usr/lib/sane/libsane-tamarack.so
 usr/lib/sane/libsane-tamarack.so.1
-usr/lib/sane/libsane-tamarack.so.1.0.22
+usr/lib/sane/libsane-tamarack.so.1.0.24
 #usr/lib/sane/libsane-teco1.la
 usr/lib/sane/libsane-teco1.so
 usr/lib/sane/libsane-teco1.so.1
-usr/lib/sane/libsane-teco1.so.1.0.22
+usr/lib/sane/libsane-teco1.so.1.0.24
 #usr/lib/sane/libsane-teco2.la
 usr/lib/sane/libsane-teco2.so
 usr/lib/sane/libsane-teco2.so.1
-usr/lib/sane/libsane-teco2.so.1.0.22
+usr/lib/sane/libsane-teco2.so.1.0.24
 #usr/lib/sane/libsane-teco3.la
 usr/lib/sane/libsane-teco3.so
 usr/lib/sane/libsane-teco3.so.1
-usr/lib/sane/libsane-teco3.so.1.0.22
+usr/lib/sane/libsane-teco3.so.1.0.24
 #usr/lib/sane/libsane-test.la
 usr/lib/sane/libsane-test.so
 usr/lib/sane/libsane-test.so.1
-usr/lib/sane/libsane-test.so.1.0.22
+usr/lib/sane/libsane-test.so.1.0.24
 #usr/lib/sane/libsane-u12.la
 usr/lib/sane/libsane-u12.so
 usr/lib/sane/libsane-u12.so.1
-usr/lib/sane/libsane-u12.so.1.0.22
+usr/lib/sane/libsane-u12.so.1.0.24
 #usr/lib/sane/libsane-umax.la
 usr/lib/sane/libsane-umax.so
 usr/lib/sane/libsane-umax.so.1
-usr/lib/sane/libsane-umax.so.1.0.22
+usr/lib/sane/libsane-umax.so.1.0.24
 #usr/lib/sane/libsane-umax1220u.la
 usr/lib/sane/libsane-umax1220u.so
 usr/lib/sane/libsane-umax1220u.so.1
-usr/lib/sane/libsane-umax1220u.so.1.0.22
+usr/lib/sane/libsane-umax1220u.so.1.0.24
 #usr/lib/sane/libsane-umax_pp.la
 usr/lib/sane/libsane-umax_pp.so
 usr/lib/sane/libsane-umax_pp.so.1
-usr/lib/sane/libsane-umax_pp.so.1.0.22
+usr/lib/sane/libsane-umax_pp.so.1.0.24
 #usr/lib/sane/libsane-xerox_mfp.la
 usr/lib/sane/libsane-xerox_mfp.so
 usr/lib/sane/libsane-xerox_mfp.so.1
-usr/lib/sane/libsane-xerox_mfp.so.1.0.22
+usr/lib/sane/libsane-xerox_mfp.so.1.0.24
 usr/sbin/saned
 #usr/share/locale/bg/LC_MESSAGES/sane-backends.mo
 #usr/share/locale/cs/LC_MESSAGES/sane-backends.mo
@@ -560,8 +574,10 @@ usr/share/locale/de/LC_MESSAGES/sane-backends.mo
 #usr/share/man/man5/sane-hs2p.5
 #usr/share/man/man5/sane-ibm.5
 #usr/share/man/man5/sane-kodak.5
+#usr/share/man/man5/sane-kodakaio.5
 #usr/share/man/man5/sane-kvs1025.5
 #usr/share/man/man5/sane-kvs20xx.5
+#usr/share/man/man5/sane-kvs40xx.5
 #usr/share/man/man5/sane-leo.5
 #usr/share/man/man5/sane-lexmark.5
 #usr/share/man/man5/sane-ma1509.5
@@ -572,6 +588,7 @@ usr/share/locale/de/LC_MESSAGES/sane-backends.mo
 #usr/share/man/man5/sane-mustek.5
 #usr/share/man/man5/sane-mustek_pp.5
 #usr/share/man/man5/sane-mustek_usb.5
+#usr/share/man/man5/sane-mustek_usb2.5
 #usr/share/man/man5/sane-nec.5
 #usr/share/man/man5/sane-net.5
 #usr/share/man/man5/sane-niash.5
@@ -611,7 +628,6 @@ usr/share/sane/artec_eplus48u
 usr/share/sane/epjitsu
 usr/share/sane/gt68xx
 usr/share/sane/snapscan
-#usr/var
 #usr/var/lock
 usr/var/lock/sane
 var/ipfire/backup/addons/includes/sane

diff --git a/lfs/sane b/lfs/sane
index 96341b6e0cce6f9bc4a561051a5f89263582d5b7..842b5484610ae9013a4275a0efd17a900084f9ce 100644 (file)
--- a/lfs/sane
+++ b/lfs/sane
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2014  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.0.22
+VER        = 1.0.24
 
 THISAPP    = sane-$(VER)
 DL_FILE    = sane-backends-$(VER).tar.gz
@@ -33,7 +33,7 @@ DIR_APP    = $(DIR_SRC)/sane-backends-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 PROG       = sane
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = "libtiff"
 
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = fadf56a60f4776bfb24491f66b617cf5
+$(DL_FILE)_MD5 = 1ca68e536cd7c1852322822f5f6ac3a4
 
 install : $(TARGET)