Ubuntu
sane-backends package

Merge lp://staging/~jfbcable/ubuntu/wily/sane-backends/fix-pixma into lp://staging/ubuntu/wily/sane-backends

  1. Wily (15.10)
  2. fix-pixma
  3. Merge into wily
Proposed by Julian Cable
Status: Needs review
Proposed branch: lp://staging/~jfbcable/ubuntu/wily/sane-backends/fix-pixma
Merge into: lp://staging/ubuntu/wily/sane-backends
Diff against target: 1141205 lines (+1134985/-0) (has conflicts)
1201 files modified
.gitignore (+14/-0)
.pc/.quilt_patches (+1/-0)
.pc/.quilt_series (+1/-0)
.pc/.version (+1/-0)
.pc/0005-mk_reproducible_results.patch/tools/sane-desc.c (+4059/-0)
.pc/001-scanimage_manpage.patch/doc/scanimage.man (+482/-0)
.pc/0105-fuj-126a.patch/backend/fujitsu.c (+10102/-0)
.pc/0105-fuj-126a.patch/backend/fujitsu.h (+862/-0)
.pc/0500-systemd_configure.patch/configure.in (+875/-0)
.pc/0510-disable-html-tests.patch/testsuite/tools/Makefile.am (+43/-0)
.pc/0510-disable-html-tests.patch/testsuite/tools/Makefile.in (+518/-0)
.pc/applied-patches (+23/-0)
.pc/disable_v4l.patch/backend/v4l.conf.in (+10/-0)
.pc/dll_backend_conf.patch/backend/dll.conf.in (+88/-0)
.pc/fix_avahi_error_paths.patch/backend/net.c (+2378/-0)
.pc/frontend_libs.patch/frontend/Makefile.am (+34/-0)
.pc/frontend_libs.patch/frontend/Makefile.in (+772/-0)
.pc/hp3900.patch/backend/hp3900_sane.c (+2734/-0)
.pc/kfreebsd.patch/backend/umax_pp_low.c (+13195/-0)
.pc/libsane_deps.patch/backend/Makefile.am (+1139/-0)
.pc/libsane_deps.patch/backend/Makefile.in (+5514/-0)
.pc/license_typo.patch/po/fr.po (+5703/-0)
.pc/man_typo.patch/doc/sane-mustek_usb.man (+205/-0)
.pc/multiarch_dll_search_path.patch/backend/Makefile.am (+1139/-0)
.pc/multiarch_dll_search_path.patch/backend/Makefile.in (+5514/-0)
.pc/multiarch_dll_search_path.patch/backend/dll.c (+1305/-0)
.pc/multiarch_manpages_libdir.patch/doc/Makefile.in (+1009/-0)
.pc/nousbtest.patch/testsuite/sanei/Makefile.am (+43/-0)
.pc/nousbtest.patch/testsuite/sanei/Makefile.in (+1108/-0)
.pc/ppc64el.patch/configure (+21239/-0)
.pc/ppc64el.patch/m4/libtool.m4 (+7986/-0)
.pc/sane-desc.c_debian_mods.patch/testsuite/tools/data/html-backends-split.ref (+16502/-0)
.pc/sane-desc.c_debian_mods.patch/testsuite/tools/data/html-mfgs.ref (+23916/-0)
.pc/sane-desc.c_debian_mods.patch/tools/sane-desc.c (+4061/-0)
.pc/trim-libraries-in-sane-backends.pc.in.patch/tools/sane-backends.pc.in (+14/-0)
.pc/typo.patch/backend/genesys.conf.in (+134/-0)
.pc/unneeded_doc.patch/Makefile.in (+989/-0)
.pc/unneeded_doc.patch/doc/Makefile.am (+316/-0)
.pc/unneeded_doc.patch/doc/Makefile.in (+1009/-0)
.pc/usb3_timing_fix.patch/backend/genesys_low.c (+1996/-0)
AUTHORS (+253/-0)
COPYING (+340/-0)
ChangeLog (+387/-0)
ChangeLog-1.0.0 (+4309/-0)
ChangeLog-1.0.1 (+449/-0)
ChangeLog-1.0.10 (+890/-0)
ChangeLog-1.0.12 (+960/-0)
ChangeLog-1.0.13 (+1349/-0)
ChangeLog-1.0.14 (+899/-0)
ChangeLog-1.0.15 (+1027/-0)
ChangeLog-1.0.16 (+944/-0)
ChangeLog-1.0.17 (+1011/-0)
ChangeLog-1.0.18 (+973/-0)
ChangeLog-1.0.19 (+1161/-0)
ChangeLog-1.0.2 (+563/-0)
ChangeLog-1.0.20 (+2087/-0)
ChangeLog-1.0.21 (+887/-0)
ChangeLog-1.0.22 (+536/-0)
ChangeLog-1.0.23 (+694/-0)
ChangeLog-1.0.24 (+602/-0)
ChangeLog-1.0.3 (+791/-0)
ChangeLog-1.0.4 (+729/-0)
ChangeLog-1.0.5 (+1194/-0)
ChangeLog-1.0.6 (+667/-0)
ChangeLog-1.0.7 (+856/-0)
ChangeLog-1.0.8 (+1060/-0)
ChangeLog-1.0.9 (+1148/-0)
INSTALL (+370/-0)
LICENSE (+48/-0)
Makefile.am (+94/-0)
Makefile.in (+985/-0)
NEWS (+1104/-0)
PROBLEMS (+22/-0)
PROJECTS (+30/-0)
README (+199/-0)
README.aix (+13/-0)
README.beos (+29/-0)
README.darwin (+49/-0)
README.djpeg (+390/-0)
README.freebsd (+44/-0)
README.hp-ux (+101/-0)
README.linux (+287/-0)
README.netbsd (+59/-0)
README.openbsd (+56/-0)
README.os2 (+261/-0)
README.solaris (+190/-0)
README.unixware2 (+103/-0)
README.unixware7 (+79/-0)
README.windows (+65/-0)
README.zeta (+26/-0)
acinclude.m4 (+764/-0)
aclocal.m4 (+1312/-0)
backend/.gitignore (+5/-0)
backend/Makefile.am (+1139/-0)
backend/Makefile.in (+5513/-0)
backend/abaton.c (+1491/-0)
backend/abaton.conf.in (+2/-0)
backend/abaton.h (+133/-0)
backend/agfafocus.c (+2083/-0)
backend/agfafocus.conf.in (+2/-0)
backend/agfafocus.h (+132/-0)
backend/apple.c (+2690/-0)
backend/apple.conf.in (+2/-0)
backend/apple.h (+270/-0)
backend/artec.c (+3754/-0)
backend/artec.conf.in (+3/-0)
backend/artec.h (+272/-0)
backend/artec_eplus48u.c (+4568/-0)
backend/artec_eplus48u.conf.in (+119/-0)
backend/artec_eplus48u.h (+596/-0)
backend/as6e.c (+942/-0)
backend/as6e.h (+124/-0)
backend/avision.c (+8627/-0)
backend/avision.conf.in (+23/-0)
backend/avision.h (+799/-0)
backend/bh.c (+3883/-0)
backend/bh.conf.in (+2/-0)
backend/bh.h (+1036/-0)
backend/canon-sane.c (+2229/-0)
backend/canon-scsi.c (+733/-0)
backend/canon.c (+1881/-0)
backend/canon.conf.in (+2/-0)
backend/canon.h (+408/-0)
backend/canon630u-common.c (+1656/-0)
backend/canon630u.c (+1044/-0)
backend/canon630u.conf.in (+8/-0)
backend/canon_dr-cmd.h (+578/-0)
backend/canon_dr.c (+8624/-0)
backend/canon_dr.conf.in (+207/-0)
backend/canon_dr.h (+609/-0)
backend/canon_pp-dev.c (+1368/-0)
backend/canon_pp-dev.h (+185/-0)
backend/canon_pp-io.c (+618/-0)
backend/canon_pp-io.h (+65/-0)
backend/canon_pp.c (+2039/-0)
backend/canon_pp.conf.in (+36/-0)
backend/canon_pp.h (+125/-0)
backend/cardscan.c (+1686/-0)
backend/cardscan.conf.in (+17/-0)
backend/cardscan.h (+197/-0)
backend/coolscan-scsidef.h (+839/-0)
backend/coolscan.c (+4195/-0)
backend/coolscan.conf.in (+2/-0)
backend/coolscan.h (+324/-0)
backend/coolscan2.c (+3092/-0)
backend/coolscan2.conf.in (+20/-0)
backend/coolscan3.c (+3188/-0)
backend/coolscan3.conf.in (+20/-0)
backend/dc210.c (+1531/-0)
backend/dc210.conf.in (+29/-0)
backend/dc210.h (+279/-0)
backend/dc240.c (+2150/-0)
backend/dc240.conf.in (+29/-0)
backend/dc240.h (+278/-0)
backend/dc25.c (+2760/-0)
backend/dc25.conf.in (+23/-0)
backend/dc25.h (+276/-0)
backend/dell1600n_net.c (+2065/-0)
backend/dell1600n_net.conf.in (+14/-0)
backend/dll.aliases (+6/-0)
backend/dll.c (+1304/-0)
backend/dll.conf.in (+95/-0)
backend/dmc.c (+1404/-0)
backend/dmc.conf.in (+1/-0)
backend/dmc.h (+125/-0)
backend/epjitsu-cmd.h (+709/-0)
backend/epjitsu.c (+4921/-0)
backend/epjitsu.conf.in (+74/-0)
backend/epjitsu.h (+399/-0)
backend/epson.c (+6417/-0)
backend/epson.conf.in (+27/-0)
backend/epson.h (+262/-0)
backend/epson2-cct.c (+613/-0)
backend/epson2-commands.c (+1091/-0)
backend/epson2-commands.h (+63/-0)
backend/epson2-io.c (+393/-0)
backend/epson2-io.h (+50/-0)
backend/epson2-ops.c (+2222/-0)
backend/epson2-ops.h (+53/-0)
backend/epson2.c (+2375/-0)
backend/epson2.conf.in (+27/-0)
backend/epson2.h (+425/-0)
backend/epson2_net.c (+234/-0)
backend/epson2_net.h (+15/-0)
backend/epson2_scsi.c (+103/-0)
backend/epson2_scsi.h (+24/-0)
backend/epson_scsi.c (+114/-0)
backend/epson_scsi.h (+24/-0)
backend/epson_usb.c (+163/-0)
backend/epson_usb.h (+10/-0)
backend/epsonds-cmd.c (+901/-0)
backend/epsonds-cmd.h (+29/-0)
backend/epsonds-io.c (+177/-0)
backend/epsonds-io.h (+33/-0)
backend/epsonds-jpeg.c (+221/-0)
backend/epsonds-jpeg.h (+19/-0)
backend/epsonds-ops.c (+474/-0)
backend/epsonds-ops.h (+41/-0)
backend/epsonds-usb.c (+33/-0)
backend/epsonds-usb.h (+24/-0)
backend/epsonds.c (+1363/-0)
backend/epsonds.conf.in (+12/-0)
backend/epsonds.h (+199/-0)
backend/fujitsu-scsi.h (+1154/-0)
backend/fujitsu.c (+10110/-0)
backend/fujitsu.conf.in (+155/-0)
backend/fujitsu.h (+863/-0)
backend/genesys.c (+8041/-0)
backend/genesys.conf.in (+134/-0)
backend/genesys.h (+165/-0)
backend/genesys_conv.c (+478/-0)
backend/genesys_conv_hlp.c (+345/-0)
backend/genesys_devices.c (+3670/-0)
backend/genesys_gl124.c (+3823/-0)
backend/genesys_gl124.h (+728/-0)
backend/genesys_gl646.c (+5798/-0)
backend/genesys_gl646.h (+696/-0)
backend/genesys_gl841.c (+6377/-0)
backend/genesys_gl841.h (+456/-0)
backend/genesys_gl843.c (+4476/-0)
backend/genesys_gl843.h (+700/-0)
backend/genesys_gl846.c (+3710/-0)
backend/genesys_gl846.h (+705/-0)
backend/genesys_gl847.c (+3783/-0)
backend/genesys_gl847.h (+695/-0)
backend/genesys_low.c (+2005/-0)
backend/genesys_low.h (+1242/-0)
backend/gphoto2.c (+1995/-0)
backend/gphoto2.conf.in (+32/-0)
backend/gphoto2.h (+200/-0)
backend/gt68xx.c (+2389/-0)
backend/gt68xx.conf.in (+255/-0)
backend/gt68xx.h (+56/-0)
backend/gt68xx_devices.c (+1947/-0)
backend/gt68xx_generic.c (+679/-0)
backend/gt68xx_generic.h (+75/-0)
backend/gt68xx_gt6801.c (+278/-0)
backend/gt68xx_gt6801.h (+71/-0)
backend/gt68xx_gt6816.c (+263/-0)
backend/gt68xx_gt6816.h (+72/-0)
backend/gt68xx_high.c (+2744/-0)
backend/gt68xx_high.h (+374/-0)
backend/gt68xx_low.c (+1034/-0)
backend/gt68xx_low.h (+1099/-0)
backend/gt68xx_mid.c (+1185/-0)
backend/gt68xx_mid.h (+154/-0)
backend/gt68xx_shm_channel.c (+673/-0)
backend/gt68xx_shm_channel.h (+106/-0)
backend/hp-accessor.c (+902/-0)
backend/hp-accessor.h (+88/-0)
backend/hp-device.c (+476/-0)
backend/hp-device.h (+94/-0)
backend/hp-handle.c (+790/-0)
backend/hp-handle.h (+65/-0)
backend/hp-hpmem.c (+151/-0)
backend/hp-option.c (+4087/-0)
backend/hp-option.h (+294/-0)
backend/hp-scl.c (+2118/-0)
backend/hp-scl.h (+166/-0)
backend/hp-scsi.h (+78/-0)
backend/hp.README (+70/-0)
backend/hp.TODO (+52/-0)
backend/hp.c (+1013/-0)
backend/hp.conf.in (+21/-0)
backend/hp.h (+226/-0)
backend/hp3500.c (+3506/-0)
backend/hp3900.c (+61/-0)
backend/hp3900.conf.in (+31/-0)
backend/hp3900_config.c (+6055/-0)
backend/hp3900_debug.c (+1581/-0)
backend/hp3900_rts8822.c (+15123/-0)
backend/hp3900_sane.c (+2734/-0)
backend/hp3900_types.c (+783/-0)
backend/hp3900_usb.c (+509/-0)
backend/hp4200.c (+2979/-0)
backend/hp4200.conf.in (+6/-0)
backend/hp4200.h (+266/-0)
backend/hp4200_lm9830.c (+219/-0)
backend/hp4200_lm9830.h (+184/-0)
backend/hp5400.c (+82/-0)
backend/hp5400.conf.in (+14/-0)
backend/hp5400.h (+143/-0)
backend/hp5400_debug.c (+73/-0)
backend/hp5400_debug.h (+81/-0)
backend/hp5400_internal.c (+1455/-0)
backend/hp5400_internal.h (+276/-0)
backend/hp5400_sane.c (+1022/-0)
backend/hp5400_sanei.c (+387/-0)
backend/hp5400_sanei.h (+108/-0)
backend/hp5400_xfer.h (+77/-0)
backend/hp5590.c (+1389/-0)
backend/hp5590_cmds.c (+2274/-0)
backend/hp5590_cmds.h (+202/-0)
backend/hp5590_low.c (+965/-0)
backend/hp5590_low.h (+89/-0)
backend/hpljm1005.c (+1104/-0)
backend/hpsj5s.c (+1568/-0)
backend/hpsj5s.conf.in (+2/-0)
backend/hpsj5s.h (+102/-0)
backend/hs2p-saneopts.h (+365/-0)
backend/hs2p-scsi.c (+2198/-0)
backend/hs2p-scsi.h (+1290/-0)
backend/hs2p.c (+3332/-0)
backend/hs2p.conf.in (+2/-0)
backend/hs2p.h (+516/-0)
backend/ibm-scsi.c (+439/-0)
backend/ibm.c (+1183/-0)
backend/ibm.conf.in (+3/-0)
backend/ibm.h (+386/-0)
backend/kodak-cmd.h (+645/-0)
backend/kodak.c (+2913/-0)
backend/kodak.conf.in (+14/-0)
backend/kodak.h (+272/-0)
backend/kodakaio.c (+3542/-0)
backend/kodakaio.conf.in (+80/-0)
backend/kodakaio.h (+201/-0)
backend/kvs1025.c (+456/-0)
backend/kvs1025.conf.in (+2/-0)
backend/kvs1025.h (+127/-0)
backend/kvs1025_cmds.h (+74/-0)
backend/kvs1025_low.c (+1178/-0)
backend/kvs1025_low.h (+290/-0)
backend/kvs1025_opt.c (+1581/-0)
backend/kvs1025_usb.c (+370/-0)
backend/kvs1025_usb.h (+28/-0)
backend/kvs20xx.c (+535/-0)
backend/kvs20xx.h (+211/-0)
backend/kvs20xx_cmd.c (+379/-0)
backend/kvs20xx_cmd.h (+128/-0)
backend/kvs20xx_opt.c (+801/-0)
backend/kvs40xx.c (+748/-0)
backend/kvs40xx.h (+275/-0)
backend/kvs40xx_cmd.c (+601/-0)
backend/kvs40xx_opt.c (+1414/-0)
backend/leo.c (+2014/-0)
backend/leo.conf.in (+8/-0)
backend/leo.h (+554/-0)
backend/lexmark.c (+1348/-0)
backend/lexmark.conf.in (+8/-0)
backend/lexmark.h (+281/-0)
backend/lexmark_low.c (+6106/-0)
backend/lexmark_models.c (+116/-0)
backend/lexmark_sensors.c (+134/-0)
backend/lm9830.h (+58/-0)
backend/ma1509.c (+2020/-0)
backend/ma1509.conf.in (+10/-0)
backend/ma1509.h (+177/-0)
backend/magicolor.c (+3006/-0)
backend/magicolor.conf.in (+42/-0)
backend/magicolor.h (+233/-0)
backend/matsushita.c (+2512/-0)
backend/matsushita.conf.in (+23/-0)
backend/matsushita.h (+369/-0)
backend/microtek.c (+4187/-0)
backend/microtek.conf.in (+7/-0)
backend/microtek.h (+379/-0)
backend/microtek2.c (+8409/-0)
backend/microtek2.conf.in (+11/-0)
backend/microtek2.h (+1384/-0)
backend/mustek.c (+6776/-0)
backend/mustek.conf.in (+41/-0)
backend/mustek.h (+303/-0)
backend/mustek_pp.c (+1958/-0)
backend/mustek_pp.conf.in (+103/-0)
backend/mustek_pp.h (+286/-0)
backend/mustek_pp_ccd300.c (+2061/-0)
backend/mustek_pp_ccd300.h (+102/-0)
backend/mustek_pp_cis.c (+2854/-0)
backend/mustek_pp_cis.h (+273/-0)
backend/mustek_pp_decl.h (+83/-0)
backend/mustek_pp_drivers.h (+72/-0)
backend/mustek_pp_null.c (+153/-0)
backend/mustek_scsi_pp.c (+1086/-0)
backend/mustek_scsi_pp.h (+123/-0)
backend/mustek_usb.c (+1610/-0)
backend/mustek_usb.conf.in (+39/-0)
backend/mustek_usb.h (+62/-0)
backend/mustek_usb2.c (+2696/-0)
backend/mustek_usb2.h (+158/-0)
backend/mustek_usb2_asic.c (+5264/-0)
backend/mustek_usb2_asic.h (+1421/-0)
backend/mustek_usb2_high.c (+3240/-0)
backend/mustek_usb2_high.h (+263/-0)
backend/mustek_usb2_reflective.c (+1943/-0)
backend/mustek_usb2_transparent.c (+1745/-0)
backend/mustek_usb_high.c (+2751/-0)
backend/mustek_usb_high.h (+591/-0)
backend/mustek_usb_low.c (+2914/-0)
backend/mustek_usb_low.h (+450/-0)
backend/mustek_usb_mid.c (+2688/-0)
backend/mustek_usb_mid.h (+390/-0)
backend/nec.c (+3717/-0)
backend/nec.conf.in (+1/-0)
backend/nec.h (+447/-0)
backend/net.c (+2378/-0)
backend/net.conf.in (+14/-0)
backend/net.h (+88/-0)
backend/niash.c (+1486/-0)
backend/niash_core.c (+1362/-0)
backend/niash_core.h (+136/-0)
backend/niash_xfer.c (+330/-0)
backend/niash_xfer.h (+95/-0)
backend/p5.c (+2048/-0)
backend/p5.conf.in (+10/-0)
backend/p5.h (+205/-0)
backend/p5_device.c (+1611/-0)
backend/p5_device.h (+304/-0)
backend/pie-scsidef.h (+433/-0)
backend/pie.c (+3828/-0)
backend/pie.conf.in (+4/-0)
backend/pint.c (+987/-0)
backend/pint.h (+105/-0)
backend/pixma.c (+1825/-0)
backend/pixma.conf.in (+14/-0)
backend/pixma.h (+490/-0)
backend/pixma_bjnp.c (+2486/-0)
backend/pixma_bjnp.h (+202/-0)
backend/pixma_bjnp_private.h (+383/-0)
backend/pixma_common.c (+1177/-0)
backend/pixma_common.h (+231/-0)
backend/pixma_imageclass.c (+820/-0)
backend/pixma_io.h (+186/-0)
backend/pixma_io_sanei.c (+592/-0)
backend/pixma_mp150.c (+1830/-0)
backend/pixma_mp730.c (+828/-0)
backend/pixma_mp750.c (+970/-0)
backend/pixma_mp810.c (+2382/-0)
backend/pixma_rename.h (+105/-0)
backend/pixma_sane_options.c (+346/-0)
backend/pixma_sane_options.h (+51/-0)
backend/plustek-pp.h (+640/-0)
backend/plustek-pp_dac.c (+2658/-0)
backend/plustek-pp_dbg.h (+101/-0)
backend/plustek-pp_detect.c (+526/-0)
backend/plustek-pp_genericio.c (+1463/-0)
backend/plustek-pp_hwdefs.h (+1034/-0)
backend/plustek-pp_image.c (+1652/-0)
backend/plustek-pp_io.c (+999/-0)
backend/plustek-pp_map.c (+304/-0)
backend/plustek-pp_misc.c (+823/-0)
backend/plustek-pp_models.c (+614/-0)
backend/plustek-pp_motor.c (+3348/-0)
backend/plustek-pp_p12.c (+778/-0)
backend/plustek-pp_p12ccd.c (+1149/-0)
backend/plustek-pp_p48xx.c (+877/-0)
backend/plustek-pp_p9636.c (+1088/-0)
backend/plustek-pp_procfs.c (+474/-0)
backend/plustek-pp_procs.h (+255/-0)
backend/plustek-pp_ptdrv.c (+1987/-0)
backend/plustek-pp_scale.c (+149/-0)
backend/plustek-pp_scan.h (+202/-0)
backend/plustek-pp_scandata.h (+642/-0)
backend/plustek-pp_sysdep.h (+362/-0)
backend/plustek-pp_tpa.c (+1174/-0)
backend/plustek-pp_types.h (+191/-0)
backend/plustek-pp_wrapper.c (+361/-0)
backend/plustek-usb.c (+1526/-0)
backend/plustek-usb.h (+725/-0)
backend/plustek-usbcal.c (+1388/-0)
backend/plustek-usbcalfile.c (+845/-0)
backend/plustek-usbdevs.c (+3095/-0)
backend/plustek-usbhw.c (+1848/-0)
backend/plustek-usbimg.c (+1984/-0)
backend/plustek-usbio.c (+351/-0)
backend/plustek-usbmap.c (+210/-0)
backend/plustek-usbscan.c (+1666/-0)
backend/plustek-usbshading.c (+3215/-0)
backend/plustek.c (+2806/-0)
backend/plustek.conf.in (+184/-0)
backend/plustek.h (+431/-0)
backend/plustek_pp.c (+2180/-0)
backend/plustek_pp.conf.in (+40/-0)
backend/pnm.c (+1395/-0)
backend/qcam.c (+2264/-0)
backend/qcam.conf.in (+12/-0)
backend/qcam.h (+190/-0)
backend/ricoh-scsi.c (+413/-0)
backend/ricoh.c (+1025/-0)
backend/ricoh.conf.in (+2/-0)
backend/ricoh.h (+330/-0)
backend/rts8891.c (+7815/-0)
backend/rts8891.conf.in (+9/-0)
backend/rts8891.h (+155/-0)
backend/rts8891_devices.c (+248/-0)
backend/rts8891_low.c (+869/-0)
backend/rts8891_low.h (+301/-0)
backend/rts88xx_lib.c (+870/-0)
backend/rts88xx_lib.h (+213/-0)
backend/s9036.c (+1341/-0)
backend/s9036.conf.in (+1/-0)
backend/s9036.h (+83/-0)
backend/sane_strstatus.c (+109/-0)
backend/saned.conf.in (+31/-0)
backend/sceptre.c (+2094/-0)
backend/sceptre.conf.in (+2/-0)
backend/sceptre.h (+414/-0)
backend/scripts/pixma_gen_options.py (+390/-0)
backend/sharp.c (+4213/-0)
backend/sharp.conf.in (+42/-0)
backend/sharp.h (+462/-0)
backend/sm3600-color.c (+313/-0)
backend/sm3600-gray.c (+389/-0)
backend/sm3600-homerun.c (+499/-0)
backend/sm3600-scanmtek.c (+310/-0)
backend/sm3600-scantool.h (+134/-0)
backend/sm3600-scanusb.c (+443/-0)
backend/sm3600-scanutil.c (+440/-0)
backend/sm3600.c (+804/-0)
backend/sm3600.h (+315/-0)
backend/sm3840.c (+846/-0)
backend/sm3840.conf.in (+5/-0)
backend/sm3840.h (+125/-0)
backend/sm3840_lib.c (+1004/-0)
backend/sm3840_lib.h (+152/-0)
backend/sm3840_params.h (+74/-0)
backend/sm3840_scan.c (+946/-0)
backend/snapscan-data.c (+4150/-0)
backend/snapscan-mutex.c (+183/-0)
backend/snapscan-options.c (+1922/-0)
backend/snapscan-scsi.c (+1948/-0)
backend/snapscan-sources.c (+1385/-0)
backend/snapscan-sources.h (+109/-0)
backend/snapscan-usb.c (+656/-0)
backend/snapscan-usb.h (+128/-0)
backend/snapscan.c (+2646/-0)
backend/snapscan.conf.in (+115/-0)
backend/snapscan.h (+751/-0)
backend/sp15c-scsi.h (+566/-0)
backend/sp15c.c (+2232/-0)
backend/sp15c.conf.in (+1/-0)
backend/sp15c.h (+336/-0)
backend/st400.c (+1309/-0)
backend/st400.conf.in (+53/-0)
backend/st400.h (+79/-0)
backend/stubs.c (+85/-0)
backend/stv680.c (+2180/-0)
backend/stv680.conf.in (+10/-0)
backend/stv680.h (+302/-0)
backend/tamarack.c (+1474/-0)
backend/tamarack.conf.in (+3/-0)
backend/tamarack.h (+267/-0)
backend/teco1.c (+2263/-0)
backend/teco1.conf.in (+17/-0)
backend/teco1.h (+399/-0)
backend/teco2.c (+3455/-0)
backend/teco2.conf.in (+29/-0)
backend/teco2.h (+465/-0)
backend/teco3.c (+2255/-0)
backend/teco3.conf.in (+11/-0)
backend/teco3.h (+427/-0)
backend/test-picture.c (+849/-0)
backend/test.c (+2841/-0)
backend/test.conf.in (+87/-0)
backend/test.h (+146/-0)
backend/u12-ccd.c (+1121/-0)
backend/u12-hw.c (+978/-0)
backend/u12-hwdef.h (+473/-0)
backend/u12-if.c (+602/-0)
backend/u12-image.c (+908/-0)
backend/u12-io.c (+851/-0)
backend/u12-map.c (+192/-0)
backend/u12-motor.c (+519/-0)
backend/u12-scanner.h (+306/-0)
backend/u12-shading.c (+877/-0)
backend/u12-tpa.c (+441/-0)
backend/u12.c (+1869/-0)
backend/u12.conf.in (+67/-0)
backend/u12.h (+336/-0)
backend/umax-scanner.c (+136/-0)
backend/umax-scanner.h (+61/-0)
backend/umax-scsidef.h (+1091/-0)
backend/umax-uc1200s.c (+204/-0)
backend/umax-uc1200se.c (+204/-0)
backend/umax-uc1260.c (+204/-0)
backend/umax-uc630.c (+195/-0)
backend/umax-uc840.c (+195/-0)
backend/umax-ug630.c (+195/-0)
backend/umax-ug80.c (+198/-0)
backend/umax-usb.c (+324/-0)
backend/umax.c (+8131/-0)
backend/umax.conf.in (+117/-0)
backend/umax.h (+499/-0)
backend/umax1220u-common.c (+2386/-0)
backend/umax1220u.c (+960/-0)
backend/umax1220u.conf.in (+14/-0)
backend/umax_pp.c (+2404/-0)
backend/umax_pp.conf.in (+64/-0)
backend/umax_pp.h (+207/-0)
backend/umax_pp_low.c (+13197/-0)
backend/umax_pp_low.h (+123/-0)
backend/umax_pp_mid.c (+475/-0)
backend/umax_pp_mid.h (+191/-0)
backend/v4l-frequencies.h (+113/-0)
backend/v4l.c (+1137/-0)
backend/v4l.conf.in (+12/-0)
backend/v4l.h (+242/-0)
backend/xerox_mfp-tcp.c (+182/-0)
backend/xerox_mfp-usb.c (+112/-0)
backend/xerox_mfp.c (+1343/-0)
backend/xerox_mfp.conf.in (+212/-0)
backend/xerox_mfp.h (+216/-0)
compile (+347/-0)
config.guess (+1558/-0)
config.sub (+1793/-0)
configure (+21245/-0)
configure.in (+898/-0)
debian/TROUBLESHOOTING.Debian (+13/-0)
debian/changelog (+2632/-0)
debian/compat (+1/-0)
debian/control (+151/-0)
debian/copyright (+1399/-0)
debian/libsane-common.doc-base (+7/-0)
debian/libsane-common.examples (+2/-0)
debian/libsane-common.install.in (+6/-0)
debian/libsane-common.links (+1/-0)
debian/libsane-common.postrm (+11/-0)
debian/libsane-common.preinst (+12/-0)
debian/libsane-dev.doc-base (+16/-0)
debian/libsane-dev.install (+7/-0)
debian/libsane-dev.links (+3/-0)
debian/libsane.NEWS (+19/-0)
debian/libsane.README.Debian (+181/-0)
debian/libsane.docs (+1/-0)
debian/libsane.install (+4/-0)
debian/libsane.postinst (+36/-0)
debian/libsane.shlibs (+1/-0)
debian/libsane.symbols (+2065/-0)
debian/libsane1.docs (+1/-0)
debian/libsane1.install (+4/-0)
debian/libsane1.postinst (+36/-0)
debian/libsane1.shlibs (+1/-0)
debian/libsane1.symbols (+2065/-0)
debian/patches/0005-mk_reproducible_results.patch (+22/-0)
debian/patches/001-scanimage_manpage.patch (+21/-0)
debian/patches/0100-usb3-corrections.patch (+168/-0)
debian/patches/0105-fuj-126a.patch (+68/-0)
debian/patches/0500-systemd_configure.patch (+60/-0)
debian/patches/0510-disable-html-tests.patch (+35/-0)
debian/patches/99-fix-pixma.patch (+15/-0)
debian/patches/disable_v4l.patch (+25/-0)
debian/patches/dll_backend_conf.patch (+33/-0)
debian/patches/fix-FTBFS-format-not-a-string-literal-error.patch (+28/-0)
debian/patches/fix_avahi_error_paths.patch (+32/-0)
debian/patches/frontend_libs.patch (+46/-0)
debian/patches/hp3900.patch (+20/-0)
debian/patches/hp5370c.patch (+20/-0)
debian/patches/kfreebsd.patch (+15/-0)
debian/patches/kodakaio.patch (+63/-0)
debian/patches/libsane_deps.patch (+43/-0)
debian/patches/license_typo.patch (+21/-0)
debian/patches/man-page-spelling.patch (+218/-0)
debian/patches/man_typo.patch (+18/-0)
debian/patches/multiarch_dll_search_path.patch (+59/-0)
debian/patches/multiarch_manpages_libdir.patch (+18/-0)
debian/patches/nousbtest.patch (+36/-0)
debian/patches/out_of_bounds.patch (+85/-0)
debian/patches/ppc64el.patch (+74/-0)
debian/patches/sane-desc.c_debian_mods.patch (+15636/-0)
debian/patches/saned.man.patch (+15/-0)
debian/patches/series (+32/-0)
debian/patches/source-spelling.patch (+565/-0)
debian/patches/trim-libraries-in-sane-backends.pc.in.patch (+24/-0)
debian/patches/typo.patch (+20/-0)
debian/patches/unneeded_doc.patch (+58/-0)
debian/patches/usb3_timing_fix.patch (+40/-0)
debian/po/POTFILES.in (+1/-0)
debian/po/ca.po (+116/-0)
debian/po/cs.po (+110/-0)
debian/po/da.po (+111/-0)
debian/po/de.po (+114/-0)
debian/po/es.po (+140/-0)
debian/po/eu.po (+116/-0)
debian/po/fi.po (+115/-0)
debian/po/fr.po (+118/-0)
debian/po/gl.po (+125/-0)
debian/po/it.po (+112/-0)
debian/po/ja.po (+111/-0)
debian/po/nl.po (+115/-0)
debian/po/pl.po (+114/-0)
debian/po/pt.po (+112/-0)
debian/po/pt_BR.po (+114/-0)
debian/po/ru.po (+114/-0)
debian/po/sk.po (+112/-0)
debian/po/sv.po (+111/-0)
debian/po/templates.pot (+91/-0)
debian/po/vi.po (+113/-0)
debian/po/zh_CN.po (+105/-0)
debian/rules (+144/-0)
debian/sane-utils.README.Debian (+83/-0)
debian/sane-utils.config (+18/-0)
debian/sane-utils.install (+12/-0)
debian/sane-utils.links (+1/-0)
debian/sane-utils.lintian-overrides (+14/-0)
debian/sane-utils.postinst (+88/-0)
debian/sane-utils.postrm (+52/-0)
debian/sane-utils.saned.default (+8/-0)
debian/sane-utils.saned.init (+101/-0)
debian/sane-utils.templates (+35/-0)
debian/saned.socket (+10/-0)
debian/saned@.service (+16/-0)
debian/source.lintian-overrides (+4/-0)
debian/source/format (+1/-0)
debian/tests/control (+9/-0)
debian/tests/start-net (+29/-0)
debian/upstream/metadata (+6/-0)
debian/watch (+8/-0)
depcomp (+791/-0)
doc/.gitignore (+21/-0)
doc/Makefile.am (+316/-0)
doc/Makefile.in (+1009/-0)
doc/backend-writing.txt (+500/-0)
doc/canon/canon.changes (+42/-0)
doc/canon/canon.install2700F.txt (+135/-0)
doc/descriptions-external/brother-mfc4600.desc (+37/-0)
doc/descriptions-external/brother.desc (+409/-0)
doc/descriptions-external/brother2.desc (+235/-0)
doc/descriptions-external/canon_mfp.desc (+73/-0)
doc/descriptions-external/cs3200f.desc (+34/-0)
doc/descriptions-external/epkowa.desc (+3124/-0)
doc/descriptions-external/geniusvp2.desc (+26/-0)
doc/descriptions-external/hp3770.desc (+39/-0)
doc/descriptions-external/hp8200.desc (+40/-0)
doc/descriptions-external/hpaio.desc (+2241/-0)
doc/descriptions-external/hpoj.desc (+34/-0)
doc/descriptions-external/kodak-twain.desc (+87/-0)
doc/descriptions-external/lhii.desc (+46/-0)
doc/descriptions-external/mustek_a3p1.desc (+21/-0)
doc/descriptions-external/panamfs.desc (+57/-0)
doc/descriptions-external/primascan.desc (+33/-0)
doc/descriptions-external/primax.desc (+46/-0)
doc/descriptions-external/samsung.desc (+88/-0)
doc/descriptions-external/scanwit.desc (+27/-0)
doc/descriptions-external/template.desc. (+81/-0)
doc/descriptions-external/v4l2.desc (+21/-0)
doc/descriptions-external/viceo.desc (+75/-0)
doc/descriptions.txt (+130/-0)
doc/descriptions/abaton.desc (+20/-0)
doc/descriptions/agfafocus.desc (+40/-0)
doc/descriptions/apple.desc (+26/-0)
doc/descriptions/artec.desc (+72/-0)
doc/descriptions/artec_eplus48u.desc (+106/-0)
doc/descriptions/as6e.desc (+44/-0)
doc/descriptions/avision.desc (+857/-0)
doc/descriptions/bh.desc (+56/-0)
doc/descriptions/canon.desc (+65/-0)
doc/descriptions/canon630u.desc (+37/-0)
doc/descriptions/canon_dr.desc (+393/-0)
doc/descriptions/canon_pp.desc (+62/-0)
doc/descriptions/cardscan.desc (+35/-0)
doc/descriptions/coolscan.desc (+43/-0)
doc/descriptions/coolscan2.desc (+65/-0)
doc/descriptions/coolscan3.desc (+75/-0)
doc/descriptions/dc210.desc (+14/-0)
doc/descriptions/dc240.desc (+15/-0)
doc/descriptions/dc25.desc (+16/-0)
doc/descriptions/dell1600n_net.desc (+17/-0)
doc/descriptions/dll.desc (+7/-0)
doc/descriptions/dmc.desc (+29/-0)
doc/descriptions/epjitsu.desc (+65/-0)
doc/descriptions/epson.desc (+356/-0)
doc/descriptions/epson2.desc (+3095/-0)
doc/descriptions/epsonds.desc (+97/-0)
doc/descriptions/fujitsu.desc (+468/-0)
doc/descriptions/genesys.desc (+313/-0)
doc/descriptions/gphoto2.desc (+13/-0)
doc/descriptions/gt68xx.desc (+472/-0)
doc/descriptions/hp.desc (+120/-0)
doc/descriptions/hp3500.desc (+47/-0)
doc/descriptions/hp3900.desc (+82/-0)
doc/descriptions/hp4200.desc (+43/-0)
doc/descriptions/hp5400.desc (+47/-0)
doc/descriptions/hp5590.desc (+55/-0)
doc/descriptions/hpljm1005.desc (+36/-0)
doc/descriptions/hpsj5s.desc (+32/-0)
doc/descriptions/hs2p.desc (+41/-0)
doc/descriptions/ibm.desc (+42/-0)
doc/descriptions/kodak.desc (+190/-0)
doc/descriptions/kodakaio.desc (+186/-0)
doc/descriptions/kvs1025.desc (+34/-0)
doc/descriptions/kvs20xx.desc (+48/-0)
doc/descriptions/kvs40xx.desc (+36/-0)
doc/descriptions/leo.desc (+36/-0)
doc/descriptions/lexmark.desc (+89/-0)
doc/descriptions/ma1509.desc (+38/-0)
doc/descriptions/magicolor.desc (+36/-0)
doc/descriptions/matsushita.desc (+74/-0)
doc/descriptions/microtek.desc (+96/-0)
doc/descriptions/microtek2.desc (+167/-0)
doc/descriptions/mustek.desc (+174/-0)
doc/descriptions/mustek_pp.desc (+163/-0)
doc/descriptions/mustek_usb.desc (+41/-0)
doc/descriptions/mustek_usb2.desc (+16/-0)
doc/descriptions/nec.desc (+14/-0)
doc/descriptions/net.desc (+8/-0)
doc/descriptions/niash.desc (+63/-0)
doc/descriptions/p5.desc (+31/-0)
doc/descriptions/pie.desc (+98/-0)
doc/descriptions/pint.desc (+10/-0)
doc/descriptions/pixma.desc (+1056/-0)
doc/descriptions/plustek.desc (+284/-0)
doc/descriptions/plustek_pp.desc (+156/-0)
doc/descriptions/pnm.desc (+8/-0)
doc/descriptions/qcam.desc (+19/-0)
doc/descriptions/ricoh.desc (+29/-0)
doc/descriptions/rts8891.desc (+52/-0)
doc/descriptions/s9036.desc (+14/-0)
doc/descriptions/sceptre.desc (+30/-0)
doc/descriptions/sharp.desc (+40/-0)
doc/descriptions/sm3600.desc (+53/-0)
doc/descriptions/sm3840.desc (+56/-0)
doc/descriptions/snapscan.desc (+353/-0)
doc/descriptions/sp15c.desc (+31/-0)
doc/descriptions/st400.desc (+20/-0)
doc/descriptions/stv680.desc (+63/-0)
doc/descriptions/tamarack.desc (+35/-0)
doc/descriptions/teco1.desc (+127/-0)
doc/descriptions/teco2.desc (+83/-0)
doc/descriptions/teco3.desc (+62/-0)
doc/descriptions/template.desc. (+81/-0)
doc/descriptions/test.desc (+23/-0)
doc/descriptions/u12.desc (+61/-0)
doc/descriptions/umax.desc (+382/-0)
doc/descriptions/umax1220u.desc (+47/-0)
doc/descriptions/umax_pp.desc (+63/-0)
doc/descriptions/unsupported.desc (+2757/-0)
doc/descriptions/v4l.desc (+25/-0)
doc/descriptions/xerox_mfp.desc (+354/-0)
doc/doxygen-genesys.conf.in (+1793/-0)
doc/doxygen-sanei.conf.in (+1473/-0)
doc/figs/area.eps (+126/-0)
doc/figs/area.fig (+36/-0)
doc/figs/flow.eps (+161/-0)
doc/figs/flow.fig (+40/-0)
doc/figs/hierarchy.eps (+209/-0)
doc/figs/hierarchy.fig (+79/-0)
doc/figs/image-data.eps (+178/-0)
doc/figs/image-data.fig (+63/-0)
doc/figs/xfer.eps (+117/-0)
doc/figs/xfer.fig (+32/-0)
doc/gamma4scanimage.man (+66/-0)
doc/gt68xx/gt68xx.CHANGES (+720/-0)
doc/gt68xx/gt68xx.TODO (+105/-0)
doc/html.sty (+232/-0)
doc/leo/leo.txt (+141/-0)
doc/matsushita/matsushita.txt (+189/-0)
doc/mustek/mustek.CHANGES (+995/-0)
doc/mustek_usb/mustek_usb.CHANGES (+421/-0)
doc/mustek_usb/mustek_usb.TODO (+10/-0)
doc/mustek_usb2/mustek_usb2.CHANGES (+137/-0)
doc/mustek_usb2/mustek_usb2.TODO (+9/-0)
doc/net.tex (+479/-0)
doc/niash/niash.TODO (+64/-0)
doc/plustek/FAQ (+385/-0)
doc/plustek/MakeModule.sh (+116/-0)
doc/plustek/Makefile.kernel24 (+251/-0)
doc/plustek/Makefile.kernel26 (+124/-0)
doc/plustek/Plustek-PARPORT-TODO.txt (+38/-0)
doc/plustek/Plustek-PARPORT.changes (+180/-0)
doc/plustek/Plustek-PARPORT.txt (+49/-0)
doc/plustek/Plustek-USB-TODO.txt (+53/-0)
doc/plustek/Plustek-USB.changes (+307/-0)
doc/plustek/Plustek-USB.txt (+457/-0)
doc/releases.txt (+86/-0)
doc/sane-abaton.man (+126/-0)
doc/sane-agfafocus.man (+175/-0)
doc/sane-apple.man (+252/-0)
doc/sane-artec.man (+178/-0)
doc/sane-artec_eplus48u.man (+144/-0)
doc/sane-as6e.man (+45/-0)
doc/sane-avision.man (+165/-0)
doc/sane-bh.man (+547/-0)
doc/sane-canon.man (+101/-0)
doc/sane-canon630u.man (+106/-0)
doc/sane-canon_dr.man (+221/-0)
doc/sane-canon_pp.man (+232/-0)
doc/sane-cardscan.man (+114/-0)
doc/sane-config.man (+51/-0)
doc/sane-coolscan.man (+111/-0)
doc/sane-coolscan2.man (+182/-0)
doc/sane-coolscan3.man (+182/-0)
doc/sane-dc210.man (+107/-0)
doc/sane-dc240.man (+113/-0)
doc/sane-dc25.man (+99/-0)
doc/sane-dll.man (+178/-0)
doc/sane-dmc.man (+140/-0)
doc/sane-epjitsu.man (+106/-0)
doc/sane-epson.man (+306/-0)
doc/sane-epson2.man (+358/-0)
doc/sane-epsonds.man (+101/-0)
doc/sane-find-scanner.man (+134/-0)
doc/sane-fujitsu.man (+236/-0)
doc/sane-genesys.man (+321/-0)
doc/sane-gphoto2.man (+118/-0)
doc/sane-gt68xx.man (+218/-0)
doc/sane-hp.man (+273/-0)
doc/sane-hp3500.man (+53/-0)
doc/sane-hp3900.man (+110/-0)
doc/sane-hp4200.man (+105/-0)
doc/sane-hp5400.man (+102/-0)
doc/sane-hp5590.man (+69/-0)
doc/sane-hpljm1005.man (+37/-0)
doc/sane-hpsj5s.man (+103/-0)
doc/sane-hs2p.man (+120/-0)
doc/sane-ibm.man (+88/-0)
doc/sane-kodak.man (+142/-0)
doc/sane-kodakaio.man (+40/-0)
doc/sane-kvs1025.man (+31/-0)
doc/sane-kvs20xx.man (+29/-0)
doc/sane-kvs40xx.man (+31/-0)
doc/sane-leo.man (+157/-0)
doc/sane-lexmark.man (+151/-0)
doc/sane-ma1509.man (+134/-0)
doc/sane-magicolor.man (+72/-0)
doc/sane-matsushita.man (+169/-0)
doc/sane-microtek.man (+194/-0)
doc/sane-microtek2.man (+318/-0)
doc/sane-mustek.man (+407/-0)
doc/sane-mustek_pp.man (+490/-0)
doc/sane-mustek_usb.man (+206/-0)
doc/sane-mustek_usb2.man (+72/-0)
doc/sane-nec.man (+59/-0)
doc/sane-net.man (+155/-0)
doc/sane-niash.man (+81/-0)
doc/sane-p5.man (+160/-0)
doc/sane-pie.man (+58/-0)
doc/sane-pint.man (+123/-0)
doc/sane-pixma.man (+353/-0)
doc/sane-plustek.man (+521/-0)
doc/sane-plustek_pp.man (+518/-0)
doc/sane-pnm.man (+46/-0)
doc/sane-qcam.man (+92/-0)
doc/sane-ricoh.man (+79/-0)
doc/sane-rts8891.man (+159/-0)
doc/sane-s9036.man (+71/-0)
doc/sane-sceptre.man (+152/-0)
doc/sane-scsi.man (+328/-0)
doc/sane-sharp.man (+505/-0)
doc/sane-sm3600.man (+82/-0)
doc/sane-sm3840.man (+95/-0)
doc/sane-snapscan.man (+111/-0)
doc/sane-sp15c.man (+77/-0)
doc/sane-st400.man (+146/-0)
doc/sane-stv680.man (+176/-0)
doc/sane-tamarack.man (+80/-0)
doc/sane-teco1.man (+197/-0)
doc/sane-teco2.man (+229/-0)
doc/sane-teco3.man (+154/-0)
doc/sane-test.man (+324/-0)
doc/sane-u12.man (+184/-0)
doc/sane-umax.man (+276/-0)
doc/sane-umax1220u.man (+116/-0)
doc/sane-umax_pp.man (+302/-0)
doc/sane-usb.man (+149/-0)
doc/sane-v4l.man (+91/-0)
doc/sane-xerox_mfp.man (+85/-0)
doc/sane.man (+928/-0)
doc/sane.tex (+1894/-0)
doc/saned.man (+325/-0)
doc/scanimage.man (+485/-0)
doc/sceptre/s1200.txt (+109/-0)
doc/teco/teco1.txt (+193/-0)
doc/teco/teco2.txt (+267/-0)
doc/teco/teco3.txt (+166/-0)
doc/u12/U12.changes (+36/-0)
doc/u12/U12.todo (+12/-0)
doc/umax/negative-types.txt (+15/-0)
doc/umax/sane-umax-advanced-options-doc.html (+178/-0)
doc/umax/sane-umax-astra-doc.html (+580/-0)
doc/umax/sane-umax-config-doc.html (+431/-0)
doc/umax/sane-umax-doc.html (+85/-0)
doc/umax/sane-umax-mirage-doc.html (+281/-0)
doc/umax/sane-umax-not-listed-doc.html (+107/-0)
doc/umax/sane-umax-others-doc.html (+239/-0)
doc/umax/sane-umax-parport-doc.html (+95/-0)
doc/umax/sane-umax-powerlook-doc.html (+539/-0)
doc/umax/sane-umax-scanner-clones-doc.html (+1054/-0)
doc/umax/sane-umax-speed-doc.html (+509/-0)
doc/umax/sane-umax-standard-options-doc.html (+274/-0)
doc/umax/sane-umax-uc-doc.html (+741/-0)
doc/umax/sane-umax-vista-doc.html (+701/-0)
doc/umax/umax.BUGS (+12/-0)
doc/umax/umax.CHANGES (+1172/-0)
doc/umax/umax.FAQ (+147/-0)
doc/umax/umax.TODO (+22/-0)
frontend/.gitignore (+3/-0)
frontend/Makefile.am (+34/-0)
frontend/Makefile.in (+772/-0)
frontend/saned.c (+3355/-0)
frontend/scanimage.c (+2392/-0)
frontend/stiff.c (+610/-0)
frontend/stiff.h (+20/-0)
frontend/test.c (+182/-0)
frontend/tstbackend.c (+1871/-0)
include/.gitignore (+3/-0)
include/Makefile.am (+18/-0)
include/Makefile.in (+614/-0)
include/font_6x11.h (+3337/-0)
include/lalloca.h (+74/-0)
include/lassert.h (+62/-0)
include/lgetopt.h (+189/-0)
include/md5.h (+159/-0)
include/sane/.gitignore (+2/-0)
include/sane/config.h.in (+698/-0)
include/sane/sane.h (+248/-0)
include/sane/sanei.h (+160/-0)
include/sane/sanei_ab306.h (+58/-0)
include/sane/sanei_access.h (+97/-0)
include/sane/sanei_auth.h (+98/-0)
include/sane/sanei_backend.h (+179/-0)
include/sane/sanei_cderror.h (+132/-0)
include/sane/sanei_codec_ascii.h (+62/-0)
include/sane/sanei_codec_bin.h (+61/-0)
include/sane/sanei_config.h (+175/-0)
include/sane/sanei_debug.h (+153/-0)
include/sane/sanei_jinclude.h (+91/-0)
include/sane/sanei_jpeg.h (+55/-0)
include/sane/sanei_lm983x.h (+150/-0)
include/sane/sanei_magic.h (+222/-0)
include/sane/sanei_net.h (+144/-0)
include/sane/sanei_pa4s2.h (+220/-0)
include/sane/sanei_pio.h (+55/-0)
include/sane/sanei_pp.h (+172/-0)
include/sane/sanei_pv8630.h (+96/-0)
include/sane/sanei_scsi.h (+329/-0)
include/sane/sanei_tcp.h (+37/-0)
include/sane/sanei_thread.h (+164/-0)
include/sane/sanei_udp.h (+40/-0)
include/sane/sanei_usb.h (+525/-0)
include/sane/sanei_wire.h (+132/-0)
include/sane/saneopts.h (+461/-0)
install-sh (+527/-0)
japi/.gitignore (+1/-0)
japi/ImageCanvas.java (+110/-0)
japi/ImageCanvasClient.java (+54/-0)
japi/Jscanimage.java (+1166/-0)
japi/Makefile.am (+47/-0)
japi/Makefile.in (+738/-0)
japi/README.JAVA (+55/-0)
japi/Sane.c (+493/-0)
japi/Sane.java (+144/-0)
japi/SaneDevice.java (+55/-0)
japi/SaneOption.java (+145/-0)
japi/SaneParameters.java (+68/-0)
japi/SaneRange.java (+53/-0)
japi/ScanIt.java (+391/-0)
japi/Test.java (+175/-0)
lib/.gitignore (+1/-0)
lib/Makefile.am (+14/-0)
lib/Makefile.in (+659/-0)
lib/alloca.c (+495/-0)
lib/getenv.c (+18/-0)
lib/getopt.c (+1282/-0)
lib/getopt1.c (+199/-0)
lib/inet_ntop.c (+40/-0)
lib/inet_pton.c (+57/-0)
lib/isfdtype.c (+25/-0)
lib/md5.c (+457/-0)
lib/sigprocmask.c (+53/-0)
lib/sleep.c (+30/-0)
lib/snprintf.c (+1119/-0)
lib/strcasestr.c (+120/-0)
lib/strdup.c (+38/-0)
lib/strndup.c (+39/-0)
lib/strsep.c (+49/-0)
lib/syslog.c (+13/-0)
lib/usleep.c (+60/-0)
lib/vsyslog.c (+15/-0)
ltmain.sh (+9678/-0)
m4/byteorder.m4 (+401/-0)
m4/libtool.m4 (+7992/-0)
m4/ltoptions.m4 (+384/-0)
m4/ltsugar.m4 (+123/-0)
m4/ltversion.m4 (+23/-0)
m4/lt~obsolete.m4 (+98/-0)
m4/stdint.m4 (+695/-0)
missing (+215/-0)
mkinstalldirs (+162/-0)
po/.gitignore (+3/-0)
po/LINGUAS (+21/-0)
po/Makefile.am (+87/-0)
po/Makefile.in (+548/-0)
po/POTFILES (+111/-0)
po/README (+70/-0)
po/bg.po (+5584/-0)
po/cs.po (+5561/-0)
po/da.po (+5587/-0)
po/de.po (+5792/-0)
po/en_GB.po (+5587/-0)
po/eo.po (+5624/-0)
po/es.po (+5662/-0)
po/fi.po (+5554/-0)
po/fr.po (+5703/-0)
po/gl.po (+5657/-0)
po/it.po (+5656/-0)
po/ja.po (+5480/-0)
po/nb.po (+5425/-0)
po/nl.po (+5782/-0)
po/pl.po (+5628/-0)
po/pt.po (+5215/-0)
po/ru.po (+5593/-0)
po/sv.po (+5664/-0)
po/uk.po (+5809/-0)
sane-backends.lsm (+27/-0)
sanei/.gitignore (+1/-0)
sanei/Makefile.am (+21/-0)
sanei/Makefile.in (+675/-0)
sanei/linux_sg3_err.h (+135/-0)
sanei/os2_srb.h (+156/-0)
sanei/sanei_DomainOS.c (+528/-0)
sanei/sanei_DomainOS.h (+76/-0)
sanei/sanei_ab306.c (+583/-0)
sanei/sanei_access.c (+232/-0)
sanei/sanei_auth.c (+283/-0)
sanei/sanei_codec_ascii.c (+345/-0)
sanei/sanei_codec_bin.c (+139/-0)
sanei/sanei_config.c (+453/-0)
sanei/sanei_config2.c (+154/-0)
sanei/sanei_constrain_value.c (+309/-0)
sanei/sanei_init_debug.c (+150/-0)
sanei/sanei_jpeg.c (+235/-0)
sanei/sanei_lm983x.c (+265/-0)
sanei/sanei_magic.c (+1941/-0)
sanei/sanei_net.c (+186/-0)
sanei/sanei_pa4s2.c (+2103/-0)
sanei/sanei_pio.c (+604/-0)
sanei/sanei_pp.c (+1462/-0)
sanei/sanei_pv8630.c (+223/-0)
sanei/sanei_scsi.c (+6187/-0)
sanei/sanei_tcp.c (+136/-0)
sanei/sanei_thread.c (+562/-0)
sanei/sanei_udp.c (+232/-0)
sanei/sanei_usb.c (+3164/-0)
sanei/sanei_wire.c (+696/-0)
test-driver (+127/-0)
testsuite/Makefile.am (+45/-0)
testsuite/Makefile.in (+698/-0)
testsuite/README (+15/-0)
testsuite/sanei/Makefile.am (+40/-0)
testsuite/sanei/Makefile.in (+1108/-0)
testsuite/sanei/README (+40/-0)
testsuite/sanei/data/boolean.conf (+6/-0)
testsuite/sanei/data/empty.conf (+1/-0)
testsuite/sanei/data/fixed.conf (+6/-0)
testsuite/sanei/data/int.conf (+2/-0)
testsuite/sanei/data/snapscan.conf (+115/-0)
testsuite/sanei/data/string-list.conf (+3/-0)
testsuite/sanei/data/string.conf (+3/-0)
testsuite/sanei/data/umax_pp.conf (+64/-0)
testsuite/sanei/data/word-array.conf (+2/-0)
testsuite/sanei/data/wrong-boolean.conf (+4/-0)
testsuite/sanei/data/wrong-fixed.conf (+2/-0)
testsuite/sanei/data/wrong-range.conf (+2/-0)
testsuite/sanei/data/wrong-string-list.conf (+3/-0)
testsuite/sanei/sanei_check_test.c (+478/-0)
testsuite/sanei/sanei_config_test.c (+907/-0)
testsuite/sanei/sanei_constrain_test.c (+795/-0)
testsuite/sanei/sanei_usb_test.c (+949/-0)
testsuite/sanei/test_wire.c (+236/-0)
testsuite/tools/Makefile.am (+43/-0)
testsuite/tools/Makefile.in (+518/-0)
testsuite/tools/README (+10/-0)
testsuite/tools/data/ascii.ref (+15583/-0)
testsuite/tools/data/db.ref (+1362/-0)
testsuite/tools/data/hal-new.ref (+3543/-0)
testsuite/tools/data/hal.ref (+3543/-0)
testsuite/tools/data/html-backends-split.ref (+16501/-0)
testsuite/tools/data/html-mfgs.ref (+23915/-0)
testsuite/tools/data/hwdb.ref (+2736/-0)
testsuite/tools/data/plist.ref (+5358/-0)
testsuite/tools/data/statistics.ref (+20/-0)
testsuite/tools/data/testfile.desc (+13888/-0)
testsuite/tools/data/udev+acl.ref (+1470/-0)
testsuite/tools/data/udev+hwdb.ref (+79/-0)
testsuite/tools/data/udev.ref (+1470/-0)
testsuite/tools/data/usermap.ref (+1360/-0)
testsuite/tools/data/xml.ref (+18149/-0)
tools/.gitignore (+9/-0)
tools/Makefile.am (+79/-0)
tools/Makefile.in (+916/-0)
tools/README (+74/-0)
tools/RenSaneDlls.cmd (+33/-0)
tools/check-po.awk (+173/-0)
tools/check-usb-chip.c (+4338/-0)
tools/epson2usb.pl (+63/-0)
tools/gamma4scanimage.c (+140/-0)
tools/hotplug-ng/.gitignore (+2/-0)
tools/hotplug-ng/README (+46/-0)
tools/hotplug-ng/libsane.hotplug (+29/-0)
tools/hotplug/.gitignore (+2/-0)
tools/hotplug/README (+35/-0)
tools/hotplug/libusbscanner (+35/-0)
tools/libtool-get-dll-ext (+19/-0)
tools/mustek600iin-off.c (+199/-0)
tools/openbsd/attach (+20/-0)
tools/openbsd/detach (+22/-0)
tools/sane-backends.pc.in (+14/-0)
tools/sane-config.in (+91/-0)
tools/sane-desc.c (+4061/-0)
tools/sane-find-scanner.c (+2098/-0)
tools/umax_pp.c (+573/-0)
tools/xerox (+60/-0)
Conflict adding file .pc.  Moved existing file to .pc.moved.
Conflict adding file AUTHORS.  Moved existing file to AUTHORS.moved.
Conflict adding file COPYING.  Moved existing file to COPYING.moved.
Conflict adding file ChangeLog-1.0.0.  Moved existing file to ChangeLog-1.0.0.moved.
Conflict adding file ChangeLog-1.0.1.  Moved existing file to ChangeLog-1.0.1.moved.
Conflict adding file ChangeLog-1.0.10.  Moved existing file to ChangeLog-1.0.10.moved.
Conflict adding file ChangeLog-1.0.12.  Moved existing file to ChangeLog-1.0.12.moved.
Conflict adding file ChangeLog-1.0.13.  Moved existing file to ChangeLog-1.0.13.moved.
Conflict adding file ChangeLog-1.0.14.  Moved existing file to ChangeLog-1.0.14.moved.
Conflict adding file ChangeLog-1.0.15.  Moved existing file to ChangeLog-1.0.15.moved.
Conflict adding file ChangeLog-1.0.16.  Moved existing file to ChangeLog-1.0.16.moved.
Conflict adding file ChangeLog-1.0.17.  Moved existing file to ChangeLog-1.0.17.moved.
Conflict adding file ChangeLog-1.0.18.  Moved existing file to ChangeLog-1.0.18.moved.
Conflict adding file ChangeLog-1.0.19.  Moved existing file to ChangeLog-1.0.19.moved.
Conflict adding file ChangeLog-1.0.2.  Moved existing file to ChangeLog-1.0.2.moved.
Conflict adding file ChangeLog-1.0.20.  Moved existing file to ChangeLog-1.0.20.moved.
Conflict adding file ChangeLog-1.0.21.  Moved existing file to ChangeLog-1.0.21.moved.
Conflict adding file ChangeLog-1.0.22.  Moved existing file to ChangeLog-1.0.22.moved.
Conflict adding file ChangeLog-1.0.3.  Moved existing file to ChangeLog-1.0.3.moved.
Conflict adding file ChangeLog-1.0.4.  Moved existing file to ChangeLog-1.0.4.moved.
Conflict adding file ChangeLog-1.0.5.  Moved existing file to ChangeLog-1.0.5.moved.
Conflict adding file ChangeLog-1.0.6.  Moved existing file to ChangeLog-1.0.6.moved.
Conflict adding file ChangeLog-1.0.7.  Moved existing file to ChangeLog-1.0.7.moved.
Conflict adding file ChangeLog-1.0.8.  Moved existing file to ChangeLog-1.0.8.moved.
Conflict adding file ChangeLog-1.0.9.  Moved existing file to ChangeLog-1.0.9.moved.
Conflict adding file ChangeLog.  Moved existing file to ChangeLog.moved.
Conflict adding file INSTALL.  Moved existing file to INSTALL.moved.
Conflict adding file LICENSE.  Moved existing file to LICENSE.moved.
Conflict adding file Makefile.am.  Moved existing file to Makefile.am.moved.
Conflict adding file Makefile.in.  Moved existing file to Makefile.in.moved.
Conflict adding file NEWS.  Moved existing file to NEWS.moved.
Conflict adding file PROBLEMS.  Moved existing file to PROBLEMS.moved.
Conflict adding file PROJECTS.  Moved existing file to PROJECTS.moved.
Conflict adding file README.aix.  Moved existing file to README.aix.moved.
Conflict adding file README.beos.  Moved existing file to README.beos.moved.
Conflict adding file README.darwin.  Moved existing file to README.darwin.moved.
Conflict adding file README.djpeg.  Moved existing file to README.djpeg.moved.
Conflict adding file README.freebsd.  Moved existing file to README.freebsd.moved.
Conflict adding file README.hp-ux.  Moved existing file to README.hp-ux.moved.
Conflict adding file README.linux.  Moved existing file to README.linux.moved.
Conflict adding file README.  Moved existing file to README.moved.
Conflict adding file README.netbsd.  Moved existing file to README.netbsd.moved.
Conflict adding file README.openbsd.  Moved existing file to README.openbsd.moved.
Conflict adding file README.os2.  Moved existing file to README.os2.moved.
Conflict adding file README.solaris.  Moved existing file to README.solaris.moved.
Conflict adding file README.unixware2.  Moved existing file to README.unixware2.moved.
Conflict adding file README.unixware7.  Moved existing file to README.unixware7.moved.
Conflict adding file README.windows.  Moved existing file to README.windows.moved.
Conflict adding file README.zeta.  Moved existing file to README.zeta.moved.
Conflict adding file acinclude.m4.  Moved existing file to acinclude.m4.moved.
Conflict adding file aclocal.m4.  Moved existing file to aclocal.m4.moved.
Conflict adding file backend.  Moved existing file to backend.moved.
Conflict adding file compile.  Moved existing file to compile.moved.
Conflict adding file config.guess.  Moved existing file to config.guess.moved.
Conflict adding file config.sub.  Moved existing file to config.sub.moved.
Conflict adding file configure.in.  Moved existing file to configure.in.moved.
Conflict adding file configure.  Moved existing file to configure.moved.
Conflict adding file debian.  Moved existing file to debian.moved.
Conflict adding file depcomp.  Moved existing file to depcomp.moved.
Conflict adding file doc.  Moved existing file to doc.moved.
Conflict adding file frontend.  Moved existing file to frontend.moved.
Conflict adding file include.  Moved existing file to include.moved.
Conflict adding file install-sh.  Moved existing file to install-sh.moved.
Conflict adding file japi.  Moved existing file to japi.moved.
Conflict adding file lib.  Moved existing file to lib.moved.
Conflict adding file ltmain.sh.  Moved existing file to ltmain.sh.moved.
Conflict adding file m4.  Moved existing file to m4.moved.
Conflict adding file missing.  Moved existing file to missing.moved.
Conflict adding file mkinstalldirs.  Moved existing file to mkinstalldirs.moved.
Conflict adding file po.  Moved existing file to po.moved.
Conflict adding file sane-backends.lsm.  Moved existing file to sane-backends.lsm.moved.
Conflict adding file sanei.  Moved existing file to sanei.moved.
Conflict adding file testsuite.  Moved existing file to testsuite.moved.
Conflict adding file tools.  Moved existing file to tools.moved.
To merge this branch: bzr merge lp://staging/~jfbcable/ubuntu/wily/sane-backends/fix-pixma
Reviewer Review Type Date Requested Status
Marc Deslauriers Needs Fixing
Review via email: mp+276937@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Marc Deslauriers (mdeslaur) wrote :

Thanks for this merge request.

This is the upstream commit:
http://anonscm.debian.org/cgit/sane/sane-backends.git/commit/backend/pixma_bjnp.c?id=43bca22e0cc9ad7e2024a4f97be7250aa72c7992

Could you please update the patch with appropriate tags, including a reference to the upstream commit?
Also, could you please add an appropriate description to the debian/changelog on what the patch fixes?

Thanks!

review: Needs Fixing
Reply
Revision history for this message
Julian Cable (jfbcable) wrote :

Hi Marc. I can add the description and link the upstream commit. What other tags should I add?

Julian

> On 10 Nov 2015, at 15:57, Marc Deslauriers <email address hidden> wrote:
>
> Review: Needs Fixing
>
> Thanks for this merge request.
>
> This is the upstream commit:
> http://anonscm.debian.org/cgit/sane/sane-backends.git/commit/backend/pixma_bjnp.c?id=43bca22e0cc9ad7e2024a4f97be7250aa72c7992
>
> Could you please update the patch with appropriate tags, including a reference to the upstream commit?
> Also, could you please add an appropriate description to the debian/changelog on what the patch fixes?
>
> Thanks!
> --
> https://code.launchpad.net/~jfbcable/ubuntu/wily/sane-backends/fix-pixma/+merge/276937
> You are the owner of lp:~jfbcable/ubuntu/wily/sane-backends/fix-pixma.

Reply

Unmerged revisions

3. By Julian Cable

debian/patches/99-fix-pixma.patch: [apply upstream fix #315219]

2. By Michael Thayer

Fix timing issues on USB3 or fast recent hardware. Back-port from
upstream.

1. By Michael Thayer

Import upstream version 1.0.25+git20150528

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: