This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, next has been updated via 5c5fd846ac363475256679ad8b0ac94502d82686 (commit) via 81f77047dbe9f840977e59619720ae7823dd87ab (commit) via 9c27eca8e4b7b722fd86add8b6659633ac7c63bc (commit) from 3ced8695afbc62b95b52d53be4ca64086a700e39 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 5c5fd846ac363475256679ad8b0ac94502d82686 Merge: 3ced869 81f7704 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Jun 2 19:16:38 2011 +0200

Merge branch 'master' into next

-----------------------------------------------------------------------

Summary of changes: config/client175/site.conf | 12 +- config/rootfiles/packages/client175 | 3 + config/rootfiles/packages/sane | 593 +++++++++++++++++++---------------- lfs/client175 | 10 +- lfs/sane | 34 +-- 5 files changed, 337 insertions(+), 315 deletions(-)

Difference in files: diff --git a/config/client175/site.conf b/config/client175/site.conf index f98d8e8..9abe832 100644 --- a/config/client175/site.conf +++ b/config/client175/site.conf @@ -1,7 +1,4 @@ # Edit this file as needed and save it as: site.conf -# # and ; at the begining of lines indicate comments. Remove the ; to -# activate a setting. -# # The application will work without it but tag editing will not work # without saving this file as site.conf with the correct music_directory # set. @@ -12,6 +9,7 @@ # from this server via the music_directory option configured below. mpd_host: "localhost" mpd_port: 6600 +;server_root: "/client175"

# Location of the music directory, required for editing tags. This variable # is also used to identify the folder for a given file in local cover lookups. @@ -21,17 +19,17 @@ music_directory: "/var/mp3" # to limit which one it listens on. "0.0.0.0" listens on all interfaces. server.socket_host: "0.0.0.0"

-# Don't run this as root in order to use port 80! This app was not built +# Don't run this as root in order to use port 80! This app was not built # to be secure, it must be run with limited access. Default is port 8080. server.socket_port: 8800

# Setting the 'run_as' variable will allow you to start the process as root # and drop the privelages to a restricted user account during server startup. -# This feature is useful when starting client175 during the init process +# This feature is useful when starting client175 during the init process # and/or when starting as root to run on port 80. ;run_as: "user"

-# Setting environment to production removes the verbose console output +# Setting environment to production removes the verbose console output # and disables auto-reload on file changes. environment: "production"

@@ -41,7 +39,7 @@ environment: "production" include_playlist_counts: True

# List of local locations to search for cover art. The server will check -# these locations for covers before using web services. The following +# these locations for covers before using web services. The following # variables are available fo substitution: # {folder} Folder a given file is in # {artist} Artist name diff --git a/config/rootfiles/packages/client175 b/config/rootfiles/packages/client175 index e659623..6e366c2 100644 --- a/config/rootfiles/packages/client175 +++ b/config/rootfiles/packages/client175 @@ -46,6 +46,7 @@ srv/client175/cherrypy/process/wspbus.py #srv/client175/cherrypy/wsgiserver srv/client175/cherrypy/wsgiserver/__init__.py srv/client175/covers.py +srv/client175/httpd.conf.example srv/client175/lyricwiki.py #srv/client175/metadata srv/client175/metadata/COPYING @@ -99,6 +100,7 @@ srv/client175/site.conf srv/client175/static/COPYING.txt srv/client175/static/Thumbs.db srv/client175/static/covers +srv/client175/static/covers/album_blank.png #srv/client175/static/ext srv/client175/static/ext/ext-all-debug.js srv/client175/static/ext/ext-all.js @@ -2844,6 +2846,7 @@ srv/client175/static/icons/fugue/folder-horizontal.png srv/client175/static/icons/fugue/folder-microphone.png srv/client175/static/icons/fugue/folder-open-document-music.png srv/client175/static/icons/fugue/folder-open.png +srv/client175/static/icons/fugue/gear.png srv/client175/static/icons/fugue/globe--plus.png srv/client175/static/icons/fugue/home.png srv/client175/static/icons/fugue/information-frame.png diff --git a/config/rootfiles/packages/sane b/config/rootfiles/packages/sane index 8e91815..411243e 100644 --- a/config/rootfiles/packages/sane +++ b/config/rootfiles/packages/sane @@ -1,104 +1,6 @@ -usr/bin/gamma4scanimage -usr/bin/sane-config -usr/bin/sane-find-scanner -usr/bin/scanimage -#usr/doc/sane-1.0.19 -usr/doc/sane-1.0.19/AUTHORS -usr/doc/sane-1.0.19/COPYING -usr/doc/sane-1.0.19/ChangeLog -usr/doc/sane-1.0.19/LICENSE -usr/doc/sane-1.0.19/NEWS -usr/doc/sane-1.0.19/PROBLEMS -usr/doc/sane-1.0.19/PROJECTS -usr/doc/sane-1.0.19/README -#usr/doc/sane-1.0.19/README.aix -#usr/doc/sane-1.0.19/README.beos -#usr/doc/sane-1.0.19/README.darwin -#usr/doc/sane-1.0.19/README.djpeg -#usr/doc/sane-1.0.19/README.freebsd -#usr/doc/sane-1.0.19/README.hp-ux -usr/doc/sane-1.0.19/README.linux -#usr/doc/sane-1.0.19/README.netbsd -#usr/doc/sane-1.0.19/README.openbsd -#usr/doc/sane-1.0.19/README.os2 -#usr/doc/sane-1.0.19/README.solaris -#usr/doc/sane-1.0.19/README.unixware2 -#usr/doc/sane-1.0.19/README.unixware7 -usr/doc/sane-1.0.19/README.windows -#usr/doc/sane-1.0.19/README.zeta -usr/doc/sane-1.0.19/backend-writing.txt -#usr/doc/sane-1.0.19/canon -usr/doc/sane-1.0.19/canon/canon.changes -usr/doc/sane-1.0.19/canon/canon.install2700F.txt -#usr/doc/sane-1.0.19/gt68xx -usr/doc/sane-1.0.19/gt68xx/gt68xx.CHANGES -usr/doc/sane-1.0.19/gt68xx/gt68xx.TODO -#usr/doc/sane-1.0.19/leo -usr/doc/sane-1.0.19/leo/leo.txt -#usr/doc/sane-1.0.19/matsushita -usr/doc/sane-1.0.19/matsushita/matsushita.txt -#usr/doc/sane-1.0.19/mustek -usr/doc/sane-1.0.19/mustek/mustek.CHANGES -#usr/doc/sane-1.0.19/mustek_usb -usr/doc/sane-1.0.19/mustek_usb/mustek_usb.CHANGES -usr/doc/sane-1.0.19/mustek_usb/mustek_usb.TODO -#usr/doc/sane-1.0.19/mustek_usb2 -usr/doc/sane-1.0.19/mustek_usb2/mustek_usb2.CHANGES -usr/doc/sane-1.0.19/mustek_usb2/mustek_usb2.TODO -#usr/doc/sane-1.0.19/niash -usr/doc/sane-1.0.19/niash/niash.TODO -#usr/doc/sane-1.0.19/plustek -usr/doc/sane-1.0.19/plustek/FAQ -usr/doc/sane-1.0.19/plustek/MakeModule.sh -#usr/doc/sane-1.0.19/plustek/Makefile.kernel24 -usr/doc/sane-1.0.19/plustek/Makefile.kernel26 -usr/doc/sane-1.0.19/plustek/Plustek-PARPORT-TODO.txt -usr/doc/sane-1.0.19/plustek/Plustek-PARPORT.changes -usr/doc/sane-1.0.19/plustek/Plustek-PARPORT.txt -usr/doc/sane-1.0.19/plustek/Plustek-USB-TODO.txt -usr/doc/sane-1.0.19/plustek/Plustek-USB.changes -usr/doc/sane-1.0.19/plustek/Plustek-USB.txt -usr/doc/sane-1.0.19/sane-backends-external.html -usr/doc/sane-1.0.19/sane-backends.html -usr/doc/sane-1.0.19/sane-mfgs-external.html -usr/doc/sane-1.0.19/sane-mfgs.html -#usr/doc/sane-1.0.19/sceptre -usr/doc/sane-1.0.19/sceptre/s1200.txt -#usr/doc/sane-1.0.19/teco -usr/doc/sane-1.0.19/teco/teco1.txt -usr/doc/sane-1.0.19/teco/teco2.txt -usr/doc/sane-1.0.19/teco/teco3.txt -#usr/doc/sane-1.0.19/u12 -usr/doc/sane-1.0.19/u12/U12.changes -usr/doc/sane-1.0.19/u12/U12.todo -#usr/doc/sane-1.0.19/umax -usr/doc/sane-1.0.19/umax/negative-types.txt -usr/doc/sane-1.0.19/umax/sane-logo.jpg -usr/doc/sane-1.0.19/umax/sane-umax-advanced-options-doc.html -usr/doc/sane-1.0.19/umax/sane-umax-advanced.jpg -usr/doc/sane-1.0.19/umax/sane-umax-astra-doc.html -usr/doc/sane-1.0.19/umax/sane-umax-config-doc.html -usr/doc/sane-1.0.19/umax/sane-umax-doc.html -usr/doc/sane-1.0.19/umax/sane-umax-histogram.jpg -usr/doc/sane-1.0.19/umax/sane-umax-mirage-doc.html -usr/doc/sane-1.0.19/umax/sane-umax-not-listed-doc.html -usr/doc/sane-1.0.19/umax/sane-umax-others-doc.html -usr/doc/sane-1.0.19/umax/sane-umax-parport-doc.html -usr/doc/sane-1.0.19/umax/sane-umax-powerlook-doc.html -usr/doc/sane-1.0.19/umax/sane-umax-scanner-clones-doc.html -usr/doc/sane-1.0.19/umax/sane-umax-speed-doc.html -usr/doc/sane-1.0.19/umax/sane-umax-standard-options-doc.html -usr/doc/sane-1.0.19/umax/sane-umax-standard.jpg -usr/doc/sane-1.0.19/umax/sane-umax-text.jpg -usr/doc/sane-1.0.19/umax/sane-umax-text2.jpg -usr/doc/sane-1.0.19/umax/sane-umax-text4.jpg -usr/doc/sane-1.0.19/umax/sane-umax-uc-doc.html -usr/doc/sane-1.0.19/umax/sane-umax-vista-doc.html -usr/doc/sane-1.0.19/umax/sane-umax.jpg -usr/doc/sane-1.0.19/umax/umax.BUGS -usr/doc/sane-1.0.19/umax/umax.CHANGES -usr/doc/sane-1.0.19/umax/umax.FAQ -usr/doc/sane-1.0.19/umax/umax.TODO +etc/rc.d/rc0.d/K10sane +etc/rc.d/rc3.d/S95sane +etc/rc.d/rc6.d/K10sane #etc/sane.d etc/sane.d/abaton.conf etc/sane.d/agfafocus.conf @@ -109,14 +11,17 @@ etc/sane.d/avision.conf etc/sane.d/bh.conf etc/sane.d/canon.conf etc/sane.d/canon630u.conf +etc/sane.d/canon_dr.conf etc/sane.d/cardscan.conf etc/sane.d/coolscan.conf etc/sane.d/coolscan2.conf +etc/sane.d/coolscan3.conf etc/sane.d/dc210.conf etc/sane.d/dc240.conf etc/sane.d/dc25.conf etc/sane.d/dell1600n_net.conf etc/sane.d/dll.conf +etc/sane.d/dll.d etc/sane.d/dmc.conf etc/sane.d/epjitsu.conf etc/sane.d/epson.conf @@ -130,21 +35,27 @@ etc/sane.d/hp4200.conf etc/sane.d/hp5400.conf etc/sane.d/hs2p.conf etc/sane.d/ibm.conf +etc/sane.d/kodak.conf etc/sane.d/leo.conf etc/sane.d/lexmark.conf etc/sane.d/ma1509.conf +etc/sane.d/magicolor.conf etc/sane.d/matsushita.conf etc/sane.d/microtek.conf etc/sane.d/microtek2.conf etc/sane.d/mustek.conf +etc/sane.d/mustek_pp.conf etc/sane.d/mustek_usb.conf etc/sane.d/nec.conf etc/sane.d/net.conf +etc/sane.d/p5.conf etc/sane.d/pie.conf +etc/sane.d/pixma.conf etc/sane.d/plustek.conf etc/sane.d/plustek_pp.conf etc/sane.d/qcam.conf etc/sane.d/ricoh.conf +etc/sane.d/rts8891.conf etc/sane.d/s9036.conf etc/sane.d/saned.conf etc/sane.d/sceptre.conf @@ -163,414 +74,546 @@ etc/sane.d/u12.conf etc/sane.d/umax.conf etc/sane.d/umax1220u.conf etc/sane.d/umax_pp.conf -etc/sane.d/v4l.conf +etc/sane.d/xerox_mfp.conf +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/include/sane usr/include/sane/sane.h usr/include/sane/saneopts.h -usr/lib/libsane.la +#usr/lib/libsane.la usr/lib/libsane.so usr/lib/libsane.so.1 -usr/lib/libsane.so.1.0.19 +usr/lib/libsane.so.1.0.22 #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.19 +usr/lib/sane/libsane-abaton.so.1.0.22 #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.19 +usr/lib/sane/libsane-agfafocus.so.1.0.22 #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.19 +usr/lib/sane/libsane-apple.so.1.0.22 #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.19 +usr/lib/sane/libsane-artec.so.1.0.22 #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.19 +usr/lib/sane/libsane-artec_eplus48u.so.1.0.22 #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.19 +usr/lib/sane/libsane-as6e.so.1.0.22 #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.19 +usr/lib/sane/libsane-avision.so.1.0.22 #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.19 +usr/lib/sane/libsane-bh.so.1.0.22 #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.19 +usr/lib/sane/libsane-canon.so.1.0.22 #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.19 +usr/lib/sane/libsane-canon630u.so.1.0.22 +#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-cardscan.la usr/lib/sane/libsane-cardscan.so usr/lib/sane/libsane-cardscan.so.1 -usr/lib/sane/libsane-cardscan.so.1.0.19 +usr/lib/sane/libsane-cardscan.so.1.0.22 #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.19 +usr/lib/sane/libsane-coolscan.so.1.0.22 #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.19 +usr/lib/sane/libsane-coolscan2.so.1.0.22 +#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-dc210.la usr/lib/sane/libsane-dc210.so usr/lib/sane/libsane-dc210.so.1 -usr/lib/sane/libsane-dc210.so.1.0.19 +usr/lib/sane/libsane-dc210.so.1.0.22 #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.19 +usr/lib/sane/libsane-dc240.so.1.0.22 #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.19 +usr/lib/sane/libsane-dc25.so.1.0.22 #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.19 +usr/lib/sane/libsane-dell1600n_net.so.1.0.22 #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.19 +usr/lib/sane/libsane-dll.so.1.0.22 #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.19 +usr/lib/sane/libsane-dmc.so.1.0.22 #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.19 +usr/lib/sane/libsane-epjitsu.so.1.0.22 #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.19 +usr/lib/sane/libsane-epson.so.1.0.22 #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.19 +usr/lib/sane/libsane-epson2.so.1.0.22 #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.19 +usr/lib/sane/libsane-fujitsu.so.1.0.22 #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.19 +usr/lib/sane/libsane-genesys.so.1.0.22 #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.19 +usr/lib/sane/libsane-gt68xx.so.1.0.22 #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.19 +usr/lib/sane/libsane-hp.so.1.0.22 #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.19 +usr/lib/sane/libsane-hp3500.so.1.0.22 #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.19 +usr/lib/sane/libsane-hp3900.so.1.0.22 #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.19 +usr/lib/sane/libsane-hp4200.so.1.0.22 #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.19 +usr/lib/sane/libsane-hp5400.so.1.0.22 #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.19 +usr/lib/sane/libsane-hp5590.so.1.0.22 #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.19 +usr/lib/sane/libsane-hpljm1005.so.1.0.22 #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.19 +usr/lib/sane/libsane-hs2p.so.1.0.22 #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.19 +usr/lib/sane/libsane-ibm.so.1.0.22 +#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-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-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-leo.la usr/lib/sane/libsane-leo.so usr/lib/sane/libsane-leo.so.1 -usr/lib/sane/libsane-leo.so.1.0.19 +usr/lib/sane/libsane-leo.so.1.0.22 #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.19 +usr/lib/sane/libsane-lexmark.so.1.0.22 #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.19 +usr/lib/sane/libsane-ma1509.so.1.0.22 +#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-matsushita.la usr/lib/sane/libsane-matsushita.so usr/lib/sane/libsane-matsushita.so.1 -usr/lib/sane/libsane-matsushita.so.1.0.19 +usr/lib/sane/libsane-matsushita.so.1.0.22 #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.19 +usr/lib/sane/libsane-microtek.so.1.0.22 #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.19 +usr/lib/sane/libsane-microtek2.so.1.0.22 #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.19 +usr/lib/sane/libsane-mustek.so.1.0.22 +#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_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.19 -#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.19 +usr/lib/sane/libsane-mustek_usb.so.1.0.22 #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.19 +usr/lib/sane/libsane-nec.so.1.0.22 #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.19 +usr/lib/sane/libsane-net.so.1.0.22 #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.19 +usr/lib/sane/libsane-niash.so.1.0.22 +#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-pie.la usr/lib/sane/libsane-pie.so usr/lib/sane/libsane-pie.so.1 -usr/lib/sane/libsane-pie.so.1.0.19 +usr/lib/sane/libsane-pie.so.1.0.22 #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.19 +usr/lib/sane/libsane-pixma.so.1.0.22 #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.19 +usr/lib/sane/libsane-plustek.so.1.0.22 #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.19 +usr/lib/sane/libsane-plustek_pp.so.1.0.22 #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.19 +usr/lib/sane/libsane-qcam.so.1.0.22 #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.19 +usr/lib/sane/libsane-ricoh.so.1.0.22 +#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-s9036.la usr/lib/sane/libsane-s9036.so usr/lib/sane/libsane-s9036.so.1 -usr/lib/sane/libsane-s9036.so.1.0.19 +usr/lib/sane/libsane-s9036.so.1.0.22 #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.19 +usr/lib/sane/libsane-sceptre.so.1.0.22 #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.19 +usr/lib/sane/libsane-sharp.so.1.0.22 #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.19 +usr/lib/sane/libsane-sm3600.so.1.0.22 #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.19 +usr/lib/sane/libsane-sm3840.so.1.0.22 #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.19 +usr/lib/sane/libsane-snapscan.so.1.0.22 #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.19 +usr/lib/sane/libsane-sp15c.so.1.0.22 #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.19 +usr/lib/sane/libsane-st400.so.1.0.22 #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.19 +usr/lib/sane/libsane-stv680.so.1.0.22 #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.19 +usr/lib/sane/libsane-tamarack.so.1.0.22 #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.19 +usr/lib/sane/libsane-teco1.so.1.0.22 #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.19 +usr/lib/sane/libsane-teco2.so.1.0.22 #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.19 +usr/lib/sane/libsane-teco3.so.1.0.22 #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.19 +usr/lib/sane/libsane-test.so.1.0.22 #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.19 +usr/lib/sane/libsane-u12.so.1.0.22 #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.19 +usr/lib/sane/libsane-umax.so.1.0.22 #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.19 +usr/lib/sane/libsane-umax1220u.so.1.0.22 #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.19 -#usr/lib/sane/libsane-v4l.la -usr/lib/sane/libsane-v4l.so -usr/lib/sane/libsane-v4l.so.1 -usr/lib/sane/libsane-v4l.so.1.0.19 +usr/lib/sane/libsane-umax_pp.so.1.0.22 +#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/sbin/saned #usr/share/locale/bg/LC_MESSAGES/sane-backends.mo #usr/share/locale/cs/LC_MESSAGES/sane-backends.mo #usr/share/locale/da/LC_MESSAGES/sane-backends.mo usr/share/locale/de/LC_MESSAGES/sane-backends.mo +#usr/share/locale/en_GB/LC_MESSAGES/sane-backends.mo #usr/share/locale/eo/LC_MESSAGES/sane-backends.mo #usr/share/locale/es/LC_MESSAGES/sane-backends.mo #usr/share/locale/fi/LC_MESSAGES/sane-backends.mo #usr/share/locale/fr/LC_MESSAGES/sane-backends.mo +#usr/share/locale/gl/LC_MESSAGES/sane-backends.mo #usr/share/locale/it/LC_MESSAGES/sane-backends.mo +#usr/share/locale/ja/LC_MESSAGES/sane-backends.mo #usr/share/locale/nb/LC_MESSAGES/sane-backends.mo #usr/share/locale/nl/LC_MESSAGES/sane-backends.mo #usr/share/locale/pl/LC_MESSAGES/sane-backends.mo #usr/share/locale/pt/LC_MESSAGES/sane-backends.mo #usr/share/locale/ru/LC_MESSAGES/sane-backends.mo #usr/share/locale/sv/LC_MESSAGES/sane-backends.mo -usr/share/man/man1/gamma4scanimage.1 -usr/share/man/man1/sane-config.1 -usr/share/man/man1/sane-find-scanner.1 -usr/share/man/man1/scanimage.1 -usr/share/man/man5/sane-abaton.5 -usr/share/man/man5/sane-agfafocus.5 -usr/share/man/man5/sane-apple.5 -usr/share/man/man5/sane-artec.5 -usr/share/man/man5/sane-artec_eplus48u.5 -usr/share/man/man5/sane-as6e.5 -usr/share/man/man5/sane-avision.5 -usr/share/man/man5/sane-bh.5 -usr/share/man/man5/sane-canon.5 -usr/share/man/man5/sane-canon630u.5 -usr/share/man/man5/sane-canon_pp.5 -usr/share/man/man5/sane-cardscan.5 -usr/share/man/man5/sane-coolscan.5 -usr/share/man/man5/sane-coolscan2.5 -usr/share/man/man5/sane-dc210.5 -usr/share/man/man5/sane-dc240.5 -usr/share/man/man5/sane-dc25.5 -usr/share/man/man5/sane-dll.5 -usr/share/man/man5/sane-dmc.5 -usr/share/man/man5/sane-epjitsu.5 -usr/share/man/man5/sane-epson.5 -usr/share/man/man5/sane-fujitsu.5 -usr/share/man/man5/sane-genesys.5 -usr/share/man/man5/sane-gphoto2.5 -usr/share/man/man5/sane-gt68xx.5 -usr/share/man/man5/sane-hp.5 -usr/share/man/man5/sane-hp3500.5 -usr/share/man/man5/sane-hp3900.5 -usr/share/man/man5/sane-hp4200.5 -usr/share/man/man5/sane-hp5400.5 -usr/share/man/man5/sane-hp5590.5 -usr/share/man/man5/sane-hpljm1005.5 -usr/share/man/man5/sane-hpsj5s.5 -usr/share/man/man5/sane-hs2p.5 -usr/share/man/man5/sane-ibm.5 -usr/share/man/man5/sane-leo.5 -usr/share/man/man5/sane-lexmark.5 -usr/share/man/man5/sane-ma1509.5 -usr/share/man/man5/sane-matsushita.5 -usr/share/man/man5/sane-microtek.5 -usr/share/man/man5/sane-microtek2.5 -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 -usr/share/man/man5/sane-pie.5 -usr/share/man/man5/sane-pint.5 -usr/share/man/man5/sane-pixma.5 -usr/share/man/man5/sane-plustek.5 -usr/share/man/man5/sane-plustek_pp.5 -usr/share/man/man5/sane-pnm.5 -usr/share/man/man5/sane-qcam.5 -usr/share/man/man5/sane-ricoh.5 -usr/share/man/man5/sane-s9036.5 -usr/share/man/man5/sane-sceptre.5 -usr/share/man/man5/sane-scsi.5 -usr/share/man/man5/sane-sharp.5 -usr/share/man/man5/sane-sm3600.5 -usr/share/man/man5/sane-sm3840.5 -usr/share/man/man5/sane-snapscan.5 -usr/share/man/man5/sane-sp15c.5 -usr/share/man/man5/sane-st400.5 -usr/share/man/man5/sane-stv680.5 -usr/share/man/man5/sane-tamarack.5 -usr/share/man/man5/sane-teco1.5 -usr/share/man/man5/sane-teco2.5 -usr/share/man/man5/sane-teco3.5 -usr/share/man/man5/sane-test.5 -usr/share/man/man5/sane-u12.5 -usr/share/man/man5/sane-umax.5 -usr/share/man/man5/sane-umax1220u.5 -usr/share/man/man5/sane-umax_pp.5 -usr/share/man/man5/sane-usb.5 -usr/share/man/man5/sane-v4l.5 -usr/share/man/man7/sane.7 -usr/share/man/man8/saned.8 +#usr/share/locale/uk/LC_MESSAGES/sane-backends.mo +#usr/share/man/man1/gamma4scanimage.1 +#usr/share/man/man1/sane-config.1 +#usr/share/man/man1/sane-find-scanner.1 +#usr/share/man/man1/scanimage.1 +#usr/share/man/man5/sane-abaton.5 +#usr/share/man/man5/sane-agfafocus.5 +#usr/share/man/man5/sane-apple.5 +#usr/share/man/man5/sane-artec.5 +#usr/share/man/man5/sane-artec_eplus48u.5 +#usr/share/man/man5/sane-as6e.5 +#usr/share/man/man5/sane-avision.5 +#usr/share/man/man5/sane-bh.5 +#usr/share/man/man5/sane-canon.5 +#usr/share/man/man5/sane-canon630u.5 +#usr/share/man/man5/sane-canon_dr.5 +#usr/share/man/man5/sane-cardscan.5 +#usr/share/man/man5/sane-coolscan.5 +#usr/share/man/man5/sane-coolscan2.5 +#usr/share/man/man5/sane-coolscan3.5 +#usr/share/man/man5/sane-dc210.5 +#usr/share/man/man5/sane-dc240.5 +#usr/share/man/man5/sane-dc25.5 +#usr/share/man/man5/sane-dll.5 +#usr/share/man/man5/sane-dmc.5 +#usr/share/man/man5/sane-epjitsu.5 +#usr/share/man/man5/sane-epson.5 +#usr/share/man/man5/sane-epson2.5 +#usr/share/man/man5/sane-fujitsu.5 +#usr/share/man/man5/sane-genesys.5 +#usr/share/man/man5/sane-gt68xx.5 +#usr/share/man/man5/sane-hp.5 +#usr/share/man/man5/sane-hp3500.5 +#usr/share/man/man5/sane-hp3900.5 +#usr/share/man/man5/sane-hp4200.5 +#usr/share/man/man5/sane-hp5400.5 +#usr/share/man/man5/sane-hp5590.5 +#usr/share/man/man5/sane-hpljm1005.5 +#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-kvs1025.5 +#usr/share/man/man5/sane-kvs20xx.5 +#usr/share/man/man5/sane-leo.5 +#usr/share/man/man5/sane-lexmark.5 +#usr/share/man/man5/sane-ma1509.5 +#usr/share/man/man5/sane-magicolor.5 +#usr/share/man/man5/sane-matsushita.5 +#usr/share/man/man5/sane-microtek.5 +#usr/share/man/man5/sane-microtek2.5 +#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-nec.5 +#usr/share/man/man5/sane-net.5 +#usr/share/man/man5/sane-niash.5 +#usr/share/man/man5/sane-p5.5 +#usr/share/man/man5/sane-pie.5 +#usr/share/man/man5/sane-pixma.5 +#usr/share/man/man5/sane-plustek.5 +#usr/share/man/man5/sane-plustek_pp.5 +#usr/share/man/man5/sane-qcam.5 +#usr/share/man/man5/sane-ricoh.5 +#usr/share/man/man5/sane-rts8891.5 +#usr/share/man/man5/sane-s9036.5 +#usr/share/man/man5/sane-sceptre.5 +#usr/share/man/man5/sane-scsi.5 +#usr/share/man/man5/sane-sharp.5 +#usr/share/man/man5/sane-sm3600.5 +#usr/share/man/man5/sane-sm3840.5 +#usr/share/man/man5/sane-snapscan.5 +#usr/share/man/man5/sane-sp15c.5 +#usr/share/man/man5/sane-st400.5 +#usr/share/man/man5/sane-stv680.5 +#usr/share/man/man5/sane-tamarack.5 +#usr/share/man/man5/sane-teco1.5 +#usr/share/man/man5/sane-teco2.5 +#usr/share/man/man5/sane-teco3.5 +#usr/share/man/man5/sane-test.5 +#usr/share/man/man5/sane-u12.5 +#usr/share/man/man5/sane-umax.5 +#usr/share/man/man5/sane-umax1220u.5 +#usr/share/man/man5/sane-umax_pp.5 +#usr/share/man/man5/sane-usb.5 +#usr/share/man/man5/sane-xerox_mfp.5 +#usr/share/man/man7/sane.7 +#usr/share/man/man8/saned.8 #usr/share/sane 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 -etc/sane.d/mustek_pp.conf -#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.19 +var/ipfire/backup/addons/includes/sane etc/rc.d/init.d/sane -etc/rc.d/rc3.d/S95sane -etc/rc.d/rc0.d/K10sane -etc/rc.d/rc6.d/K10sane usr/local/bin/sanedloop -var/ipfire/backup/addons/includes/sane -#usr/var -#usr/var/lock diff --git a/lfs/client175 b/lfs/client175 index 7f39508..ef2b487 100644 --- a/lfs/client175 +++ b/lfs/client175 @@ -24,7 +24,7 @@

include Config

-VER = 0.5a +VER = 0.7

THISAPP = client175_$(VER) DL_FILE = $(THISAPP).tar.xz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = client175 -PAK_VER = 2 +PAK_VER = 3

DEPS = "mpfire"

@@ -44,7 +44,8 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 578ad4ba1743f3b0801a806659f550c8 +$(DL_FILE)_MD5 = 975b69de79dc2649d8acba294cc0c5eb + install : $(TARGET)

check : $(patsubst %,$(DIR_CHK)/%,$(objects)) @@ -76,11 +77,12 @@ $(subst %,%_MD5,$(objects)) :

$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxvf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) @rm -rf /srv/client175 mkdir -pv /srv/client175

cd $(DIR_APP) && mv -vf * /srv/client175 + cp -vf $(DIR_SRC)/config/client175/site.conf /srv/client175/

install -v -m 644 $(DIR_SRC)/config/backup/includes/client175 \ diff --git a/lfs/sane b/lfs/sane index 742fc70..96341b6 100644 --- a/lfs/sane +++ b/lfs/sane @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 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,23 +24,16 @@

include Config

-VER = 1.0.19 +VER = 1.0.22

THISAPP = sane-$(VER) DL_FILE = sane-backends-$(VER).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/sane-backends-$(VER) -ifeq "$(KMOD)" "1" -ifeq "$(SMP)" "1" -TARGET = $(DIR_INFO)/$(THISAPP)-kmod-smp -else -TARGET = $(DIR_INFO)/$(THISAPP)-kmod -endif -else TARGET = $(DIR_INFO)/$(THISAPP) -endif + PROG = sane -PAK_VER = 1 +PAK_VER = 2

DEPS = "libtiff"

@@ -52,7 +45,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 8c0936272dcfd4e98c51512699f1c06f +$(DL_FILE)_MD5 = fadf56a60f4776bfb24491f66b617cf5

install : $(TARGET)

@@ -85,21 +78,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) -ifeq "$(KMOD)" "1" - cd $(DIR_APP)/doc/plustek && cp -vf Makefile.kernel26 \ - $(DIR_APP)/backend/Makefile -ifeq "$(SMP)" "1" - cd $(DIR_APP)/backend && make -C /lib/modules/$(KVER)-ipfire-smp/build/ \ - SUBDIRS=$(DIR_APP)/backend modules - cd $(DIR_APP)/backend && install -m 644 pt_drv.ko \ - /lib/modules/$(KVER)-ipfire-smp/kernel/drivers/parport/ -else - cd $(DIR_APP)/backend && make -C /lib/modules/$(KVER)-ipfire/build/ \ - SUBDIRS=$(DIR_APP)/backend modules - cd $(DIR_APP)/backend && install -m 644 pt_drv.ko \ - /lib/modules/$(KVER)-ipfire/kernel/drivers/parport/ -endif -else cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \ --disable-ipv6 \ --enable-parport-directio @@ -112,7 +90,5 @@ else ln -sf ../init.d/sane /etc/rc.d/rc6.d/K10sane install -v -m 644 $(DIR_SRC)/config/backup/includes/sane \ /var/ipfire/backup/addons/includes/sane -endif @rm -rf $(DIR_APP) @$(POSTBUILD) - \ No newline at end of file

hooks/post-receive -- IPFire 2.x development tree