diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-31 17:00:20 +0200 | 
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-31 17:00:20 +0200 | 
| commit | 3759ce55ba79b8d3b9d8ed247a252273ee7dade3 (patch) | |
| tree | d69692a274dd1c7d0672e6bb7155a0fc106f9d49 /tools | |
| parent | c8bd2513ecba169cff44c09c8058c36987357b18 (diff) | |
| parent | 1687222e1b9e74c89cafbb5910e72d8ec7bfd40f (diff) | |
Update upstream source from tag 'upstream/1.0.28'
Update to upstream version '1.0.28'
with Debian dir ec5bb298266630fc3801ff6dc0c258f6df7ba979
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/.gitignore | 8 | ||||
| -rw-r--r-- | tools/Makefile.am | 3 | ||||
| -rw-r--r-- | tools/Makefile.in | 913 | ||||
| -rw-r--r-- | tools/README | 7 | ||||
| -rw-r--r-- | tools/RenSaneDlls.cmd | 2 | ||||
| -rwxr-xr-x | tools/check-po.awk | 6 | ||||
| -rw-r--r-- | tools/check-usb-chip.c | 34 | ||||
| -rwxr-xr-x | tools/create-changelog.sh | 16 | ||||
| -rwxr-xr-x | tools/create-release.sh | 61 | ||||
| -rwxr-xr-x | tools/epson2usb.pl | 61 | ||||
| -rw-r--r-- | tools/hotplug-ng/.gitignore | 1 | ||||
| -rw-r--r-- | tools/hotplug/.gitignore | 1 | ||||
| -rwxr-xr-x | tools/hotplug/libusbscanner | 1 | ||||
| -rw-r--r-- | tools/sane-config.in | 3 | ||||
| -rw-r--r-- | tools/sane-desc.c | 60 | ||||
| -rw-r--r-- | tools/sane-find-scanner.c | 59 | ||||
| -rwxr-xr-x | tools/style-check.sh | 99 | ||||
| -rw-r--r-- | tools/umax_pp.c | 6 | ||||
| -rwxr-xr-x | tools/update-upstreams.sh | 21 | ||||
| -rwxr-xr-x | tools/xerox | 4 | 
20 files changed, 366 insertions, 1000 deletions
| diff --git a/tools/.gitignore b/tools/.gitignore new file mode 100644 index 0000000..445cc64 --- /dev/null +++ b/tools/.gitignore @@ -0,0 +1,8 @@ +gamma4scanimage +hal +sane-backends.pc +sane-config +sane-desc +sane-find-scanner +udev +umax_pp diff --git a/tools/Makefile.am b/tools/Makefile.am index 70c87ee..684815a 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -33,6 +33,9 @@ CLEANFILES = $(bin_SCRIPTS) $(dist_noinst_SCRIPTS)  EXTRA_DIST = check-po.awk libtool-get-dll-ext mustek600iin-off.c \  	     RenSaneDlls.cmd README xerox +EXTRA_DIST += style-check.sh +EXTRA_DIST += create-changelog.sh +EXTRA_DIST += update-upstreams.sh  sane_find_scanner_SOURCES = sane-find-scanner.c  if have_usblib diff --git a/tools/Makefile.in b/tools/Makefile.in deleted file mode 100644 index 77e9d72..0000000 --- a/tools/Makefile.in +++ /dev/null @@ -1,913 +0,0 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - - - -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ -  case $${target_option-} in \ -      ?) ;; \ -      *) echo "am__make_running_with_option: internal error: invalid" \ -              "target option '$${target_option-}' specified" >&2; \ -         exit 1;; \ -  esac; \ -  has_opt=no; \ -  sane_makeflags=$$MAKEFLAGS; \ -  if $(am__is_gnu_make); then \ -    sane_makeflags=$$MFLAGS; \ -  else \ -    case $$MAKEFLAGS in \ -      *\\[\ \	]*) \ -        bs=\\; \ -        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \ -    esac; \ -  fi; \ -  skip_next=no; \ -  strip_trailopt () \ -  { \ -    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -  }; \ -  for flg in $$sane_makeflags; do \ -    test $$skip_next = yes && { skip_next=no; continue; }; \ -    case $$flg in \ -      *=*|--*) continue;; \ -        -*I) strip_trailopt 'I'; skip_next=yes;; \ -      -*I?*) strip_trailopt 'I';; \ -        -*O) strip_trailopt 'O'; skip_next=yes;; \ -      -*O?*) strip_trailopt 'O';; \ -        -*l) strip_trailopt 'l'; skip_next=yes;; \ -      -*l?*) strip_trailopt 'l';; \ -      -[dEDm]) skip_next=yes;; \ -      -[JT]) skip_next=yes;; \ -    esac; \ -    case $$flg in \ -      *$$target_option*) has_opt=yes; break;; \ -    esac; \ -  done; \ -  test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -bin_PROGRAMS = sane-find-scanner$(EXEEXT) gamma4scanimage$(EXEEXT) \ -	$(am__EXEEXT_1) -noinst_PROGRAMS = sane-desc$(EXEEXT) $(am__EXEEXT_2) -@INSTALL_UMAX_PP_TOOLS_TRUE@am__append_1 = umax_pp -@INSTALL_UMAX_PP_TOOLS_FALSE@am__append_2 = umax_pp -@have_usblib_TRUE@am__append_3 = check-usb-chip.c -subdir = tools -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -	$(top_srcdir)/mkinstalldirs $(srcdir)/sane-config.in \ -	$(srcdir)/sane-backends.pc.in $(top_srcdir)/depcomp README -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ -	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/ltoptions.m4 \ -	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ -	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ -	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -	$(top_srcdir)/acinclude.m4 $(top_srcdir)/m4/libtool.m4 \ -	$(top_srcdir)/m4/byteorder.m4 $(top_srcdir)/m4/stdint.m4 \ -	$(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -	$(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/include/sane/config.h -CONFIG_CLEAN_FILES = sane-config sane-backends.pc -CONFIG_CLEAN_VPATH_FILES = -@INSTALL_UMAX_PP_TOOLS_TRUE@am__EXEEXT_1 = umax_pp$(EXEEXT) -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \ -	"$(DESTDIR)$(pkgconfigdir)" -@INSTALL_UMAX_PP_TOOLS_FALSE@am__EXEEXT_2 = umax_pp$(EXEEXT) -PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) -am_gamma4scanimage_OBJECTS = gamma4scanimage.$(OBJEXT) -gamma4scanimage_OBJECTS = $(am_gamma4scanimage_OBJECTS) -am__DEPENDENCIES_1 = -gamma4scanimage_DEPENDENCIES = $(am__DEPENDENCIES_1) -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -am__v_lt_1 =  -am_sane_desc_OBJECTS = sane-desc.$(OBJEXT) -sane_desc_OBJECTS = $(am_sane_desc_OBJECTS) -sane_desc_DEPENDENCIES = ../sanei/libsanei.la ../lib/liblib.la -am__sane_find_scanner_SOURCES_DIST = sane-find-scanner.c \ -	check-usb-chip.c -@have_usblib_TRUE@am__objects_1 = check-usb-chip.$(OBJEXT) -am_sane_find_scanner_OBJECTS = sane-find-scanner.$(OBJEXT) \ -	$(am__objects_1) -sane_find_scanner_OBJECTS = $(am_sane_find_scanner_OBJECTS) -sane_find_scanner_DEPENDENCIES = ../sanei/libsanei.la ../lib/liblib.la \ -	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ -	$(am__DEPENDENCIES_1) ../backend/sane_strstatus.lo -am_umax_pp_OBJECTS = umax_pp.$(OBJEXT) -umax_pp_OBJECTS = $(am_umax_pp_OBJECTS) -umax_pp_DEPENDENCIES = ../sanei/libsanei.la ../lib/liblib.la \ -	$(am__DEPENDENCIES_1) ../backend/umax_pp_low.lo -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ -    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -    *) f=$$p;; \ -  esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ -  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ -  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ -  for p in $$list; do echo "$$p $$p"; done | \ -  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ -  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ -    if (++n[$$2] == $(am__install_max)) \ -      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ -    END { for (dir in files) print dir, files[dir] }' -am__base_list = \ -  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ -  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ -  test -z "$$files" \ -    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -         $(am__cd) "$$dir" && rm -f $$files; }; \ -  } -SCRIPTS = $(bin_SCRIPTS) $(noinst_SCRIPTS) -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo "  GEN     " $@; -am__v_GEN_1 =  -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 =  -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include/sane -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -	$(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo "  CC      " $@; -am__v_CC_1 =  -CCLD = $(CC) -LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -	$(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo "  CCLD    " $@; -am__v_CCLD_1 =  -SOURCES = $(gamma4scanimage_SOURCES) $(sane_desc_SOURCES) \ -	$(sane_find_scanner_SOURCES) $(umax_pp_SOURCES) -DIST_SOURCES = $(gamma4scanimage_SOURCES) $(sane_desc_SOURCES) \ -	$(am__sane_find_scanner_SOURCES_DIST) $(umax_pp_SOURCES) -am__can_run_installinfo = \ -  case $$AM_UPDATE_INFO_DIR in \ -    n|no|NO) false;; \ -    *) (install-info --version) >/dev/null 2>&1;; \ -  esac -DATA = $(pkgconfig_DATA) -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -# Read a list of newline-separated strings from the standard input, -# and print each of them once, without duplicates.  Input order is -# *not* preserved. -am__uniquify_input = $(AWK) '\ -  BEGIN { nonempty = 0; } \ -  { items[$$0] = 1; nonempty = 1; } \ -  END { if (nonempty) { for (i in items) print i; }; } \ -' -# Make sure the list of sources is unique.  This is necessary because, -# e.g., the same source file might be shared among _SOURCES variables -# for different programs/libraries. -am__define_uniq_tagged_files = \ -  list='$(am__tagged_files)'; \ -  unique=`for i in $$list; do \ -    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -  done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALLOCA = @ALLOCA@ -AMTAR = @AMTAR@ -AM_CFLAGS = @AM_CFLAGS@ -AM_CPPFLAGS = @AM_CPPFLAGS@ -I. -I$(srcdir) -I$(top_builddir)/include \ -	-I$(top_srcdir)/include $(USB_CFLAGS) -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AM_LDFLAGS = @AM_LDFLAGS@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AVAHI_CFLAGS = @AVAHI_CFLAGS@ -AVAHI_LIBS = @AVAHI_LIBS@ -AWK = @AWK@ -BACKENDS = @BACKENDS@ -BACKEND_CONFS_ENABLED = @BACKEND_CONFS_ENABLED@ -BACKEND_LIBS_ENABLED = @BACKEND_LIBS_ENABLED@ -BACKEND_MANS_ENABLED = @BACKEND_MANS_ENABLED@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLH = @DLH@ -DLLTOOL = @DLLTOOL@ -DL_LIBS = @DL_LIBS@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -DVIPS = @DVIPS@ -DYNAMIC_FLAG = @DYNAMIC_FLAG@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -FIG2DEV = @FIG2DEV@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ -GMSGFMT = @GMSGFMT@ -GMSGFMT_015 = @GMSGFMT_015@ -GPHOTO2_CPPFLAGS = @GPHOTO2_CPPFLAGS@ -GPHOTO2_LDFLAGS = @GPHOTO2_LDFLAGS@ -GPHOTO2_LIBS = @GPHOTO2_LIBS@ -GREP = @GREP@ -GS = @GS@ -HAVE_GPHOTO2 = @HAVE_GPHOTO2@ -IEEE1284_LIBS = @IEEE1284_LIBS@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_LOCKPATH = @INSTALL_LOCKPATH@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLLIBS = @INTLLIBS@ -INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ -JPEG_LIBS = @JPEG_LIBS@ -LATEX = @LATEX@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBICONV = @LIBICONV@ -LIBINTL = @LIBINTL@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBV4L_CFLAGS = @LIBV4L_CFLAGS@ -LIBV4L_LIBS = @LIBV4L_LIBS@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LOCKPATH_GROUP = @LOCKPATH_GROUP@ -LTALLOCA = @LTALLOCA@ -LTLIBICONV = @LTLIBICONV@ -LTLIBINTL = @LTLIBINTL@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINDEX = @MAKEINDEX@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MATH_LIB = @MATH_LIB@ -MKDIR_P = @MKDIR_P@ -MSGFMT = @MSGFMT@ -MSGFMT_015 = @MSGFMT_015@ -MSGMERGE = @MSGMERGE@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PDFLATEX = @PDFLATEX@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -PNG_LIBS = @PNG_LIBS@ -POSUB = @POSUB@ -PPMTOGIF = @PPMTOGIF@ -PRELOADABLE_BACKENDS = @PRELOADABLE_BACKENDS@ -PRELOADABLE_BACKENDS_ENABLED = @PRELOADABLE_BACKENDS_ENABLED@ -PTHREAD_LIBS = @PTHREAD_LIBS@ -RANLIB = @RANLIB@ -RESMGR_LIBS = @RESMGR_LIBS@ -SANEI_SANEI_JPEG_LO = @SANEI_SANEI_JPEG_LO@ -SANE_CONFIG_PATH = @SANE_CONFIG_PATH@ -SCSI_LIBS = @SCSI_LIBS@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SNMP_CFLAGS = @SNMP_CFLAGS@ -SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@ -SNMP_LIBS = @SNMP_LIBS@ -SOCKET_LIBS = @SOCKET_LIBS@ -STRICT_LDFLAGS = @STRICT_LDFLAGS@ -STRIP = @STRIP@ -SYSLOG_LIBS = @SYSLOG_LIBS@ -SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ -SYSTEMD_LIBS = @SYSTEMD_LIBS@ -TIFF_LIBS = @TIFF_LIBS@ -USB_CFLAGS = @USB_CFLAGS@ -USB_LIBS = @USB_LIBS@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -V_MAJOR = @V_MAJOR@ -V_MINOR = @V_MINOR@ -V_REV = @V_REV@ -XGETTEXT = @XGETTEXT@ -XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -configdir = @configdir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -effective_target = @effective_target@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -locksanedir = @locksanedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -@CROSS_COMPILING_FALSE@HOTPLUG = hal/libsane.fdi hotplug/libsane.usermap hotplug-ng/libsane.db \ -@CROSS_COMPILING_FALSE@	  udev/libsane.rules - -@CROSS_COMPILING_TRUE@HOTPLUG =  -@CROSS_COMPILING_FALSE@HOTPLUG_DIRS = hal hotplug hotplug-ng udev -@CROSS_COMPILING_TRUE@HOTPLUG_DIRS =  -@CROSS_COMPILING_FALSE@HOTPLUG_DIR = dirs -@CROSS_COMPILING_TRUE@HOTPLUG_DIR =  -bin_SCRIPTS = sane-config -noinst_SCRIPTS = $(HOTPLUG) -BUILT_SOURCES = $(HOTPLUG_DIR) -CLEANFILES = $(bin_SCRIPTS) $(dist_noinst_SCRIPTS) -EXTRA_DIST = check-po.awk libtool-get-dll-ext mustek600iin-off.c \ -	RenSaneDlls.cmd README xerox hotplug/README \ -	hotplug/libusbscanner hotplug-ng/README \ -	hotplug-ng/libsane.hotplug openbsd/attach openbsd/detach -sane_find_scanner_SOURCES = sane-find-scanner.c $(am__append_3) -sane_find_scanner_LDADD = ../sanei/libsanei.la ../lib/liblib.la \ -			  $(USB_LIBS) $(IEEE1284_LIBS) $(SCSI_LIBS) \ -			  ../backend/sane_strstatus.lo - -gamma4scanimage_SOURCES = gamma4scanimage.c -gamma4scanimage_LDADD = $(MATH_LIB) -umax_pp_SOURCES = umax_pp.c -umax_pp_LDADD = ../sanei/libsanei.la ../lib/liblib.la $(MATH_LIB) \ -	        ../backend/umax_pp_low.lo - -sane_desc_SOURCES = sane-desc.c -sane_desc_LDADD = ../sanei/libsanei.la ../lib/liblib.la -pkgconfigdir = @libdir@/pkgconfig -pkgconfig_DATA = sane-backends.pc -descriptions = ${top_srcdir}/doc/descriptions/*.desc ${top_srcdir}/doc/descriptions-external/*.desc -all: $(BUILT_SOURCES) -	$(MAKE) $(AM_MAKEFLAGS) all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps) -	@for dep in $?; do \ -	  case '$(am__configure_deps)' in \ -	    *$$dep*) \ -	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ -	        && { if test -f $@; then exit 0; else break; fi; }; \ -	      exit 1;; \ -	  esac; \ -	done; \ -	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tools/Makefile'; \ -	$(am__cd) $(top_srcdir) && \ -	  $(AUTOMAKE) --gnu tools/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -	@case '$?' in \ -	  *config.status*) \ -	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -	  *) \ -	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -	esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): -sane-config: $(top_builddir)/config.status $(srcdir)/sane-config.in -	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -sane-backends.pc: $(top_builddir)/config.status $(srcdir)/sane-backends.pc.in -	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -install-binPROGRAMS: $(bin_PROGRAMS) -	@$(NORMAL_INSTALL) -	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ -	if test -n "$$list"; then \ -	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ -	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ -	fi; \ -	for p in $$list; do echo "$$p $$p"; done | \ -	sed 's/$(EXEEXT)$$//' | \ -	while read p p1; do if test -f $$p \ -	 || test -f $$p1 \ -	  ; then echo "$$p"; echo "$$p"; else :; fi; \ -	done | \ -	sed -e 'p;s,.*/,,;n;h' \ -	    -e 's|.*|.|' \ -	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ -	sed 'N;N;N;s,\n, ,g' | \ -	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ -	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ -	    if ($$2 == $$4) files[d] = files[d] " " $$1; \ -	    else { print "f", $$3 "/" $$4, $$1; } } \ -	  END { for (d in files) print "f", d, files[d] }' | \ -	while read type dir files; do \ -	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ -	    test -z "$$files" || { \ -	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ -	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ -	    } \ -	; done - -uninstall-binPROGRAMS: -	@$(NORMAL_UNINSTALL) -	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ -	files=`for p in $$list; do echo "$$p"; done | \ -	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ -	      -e 's/$$/$(EXEEXT)/' \ -	`; \ -	test -n "$$list" || exit 0; \ -	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ -	cd "$(DESTDIR)$(bindir)" && rm -f $$files - -clean-binPROGRAMS: -	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ -	echo " rm -f" $$list; \ -	rm -f $$list || exit $$?; \ -	test -n "$(EXEEXT)" || exit 0; \ -	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ -	echo " rm -f" $$list; \ -	rm -f $$list - -clean-noinstPROGRAMS: -	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ -	echo " rm -f" $$list; \ -	rm -f $$list || exit $$?; \ -	test -n "$(EXEEXT)" || exit 0; \ -	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ -	echo " rm -f" $$list; \ -	rm -f $$list - -gamma4scanimage$(EXEEXT): $(gamma4scanimage_OBJECTS) $(gamma4scanimage_DEPENDENCIES) $(EXTRA_gamma4scanimage_DEPENDENCIES)  -	@rm -f gamma4scanimage$(EXEEXT) -	$(AM_V_CCLD)$(LINK) $(gamma4scanimage_OBJECTS) $(gamma4scanimage_LDADD) $(LIBS) - -sane-desc$(EXEEXT): $(sane_desc_OBJECTS) $(sane_desc_DEPENDENCIES) $(EXTRA_sane_desc_DEPENDENCIES)  -	@rm -f sane-desc$(EXEEXT) -	$(AM_V_CCLD)$(LINK) $(sane_desc_OBJECTS) $(sane_desc_LDADD) $(LIBS) - -sane-find-scanner$(EXEEXT): $(sane_find_scanner_OBJECTS) $(sane_find_scanner_DEPENDENCIES) $(EXTRA_sane_find_scanner_DEPENDENCIES)  -	@rm -f sane-find-scanner$(EXEEXT) -	$(AM_V_CCLD)$(LINK) $(sane_find_scanner_OBJECTS) $(sane_find_scanner_LDADD) $(LIBS) - -umax_pp$(EXEEXT): $(umax_pp_OBJECTS) $(umax_pp_DEPENDENCIES) $(EXTRA_umax_pp_DEPENDENCIES)  -	@rm -f umax_pp$(EXEEXT) -	$(AM_V_CCLD)$(LINK) $(umax_pp_OBJECTS) $(umax_pp_LDADD) $(LIBS) -install-binSCRIPTS: $(bin_SCRIPTS) -	@$(NORMAL_INSTALL) -	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ -	if test -n "$$list"; then \ -	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ -	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ -	fi; \ -	for p in $$list; do \ -	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ -	done | \ -	sed -e 'p;s,.*/,,;n' \ -	    -e 'h;s|.*|.|' \ -	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ -	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ -	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ -	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \ -	      if (++n[d] == $(am__install_max)) { \ -		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ -	    else { print "f", d "/" $$4, $$1 } } \ -	  END { for (d in files) print "f", d, files[d] }' | \ -	while read type dir files; do \ -	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ -	     test -z "$$files" || { \ -	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \ -	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ -	     } \ -	; done - -uninstall-binSCRIPTS: -	@$(NORMAL_UNINSTALL) -	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \ -	files=`for p in $$list; do echo "$$p"; done | \ -	       sed -e 's,.*/,,;$(transform)'`; \ -	dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir) - -mostlyclean-compile: -	-rm -f *.$(OBJEXT) - -distclean-compile: -	-rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check-usb-chip.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gamma4scanimage.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sane-desc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sane-find-scanner.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/umax_pp.Po@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ -@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< - -.c.obj: -@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ -@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ -@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ -@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< - -mostlyclean-libtool: -	-rm -f *.lo - -clean-libtool: -	-rm -rf .libs _libs -install-pkgconfigDATA: $(pkgconfig_DATA) -	@$(NORMAL_INSTALL) -	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ -	if test -n "$$list"; then \ -	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ -	  $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ -	fi; \ -	for p in $$list; do \ -	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -	  echo "$$d$$p"; \ -	done | $(am__base_list) | \ -	while read files; do \ -	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \ -	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \ -	done - -uninstall-pkgconfigDATA: -	@$(NORMAL_UNINSTALL) -	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ -	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ -	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) - -ID: $(am__tagged_files) -	$(am__define_uniq_tagged_files); mkid -fID $$unique -tags: tags-am -TAGS: tags - -tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -	set x; \ -	here=`pwd`; \ -	$(am__define_uniq_tagged_files); \ -	shift; \ -	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ -	  test -n "$$unique" || unique=$$empty_fix; \ -	  if test $$# -gt 0; then \ -	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -	      "$$@" $$unique; \ -	  else \ -	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -	      $$unique; \ -	  fi; \ -	fi -ctags: ctags-am - -CTAGS: ctags -ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -	$(am__define_uniq_tagged_files); \ -	test -z "$(CTAGS_ARGS)$$unique" \ -	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ -	     $$unique - -GTAGS: -	here=`$(am__cd) $(top_builddir) && pwd` \ -	  && $(am__cd) $(top_srcdir) \ -	  && gtags -i $(GTAGS_ARGS) "$$here" -cscopelist: cscopelist-am - -cscopelist-am: $(am__tagged_files) -	list='$(am__tagged_files)'; \ -	case "$(srcdir)" in \ -	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -	  *) sdir=$(subdir)/$(srcdir) ;; \ -	esac; \ -	for i in $$list; do \ -	  if test -f "$$i"; then \ -	    echo "$(subdir)/$$i"; \ -	  else \ -	    echo "$$sdir/$$i"; \ -	  fi; \ -	done >> $(top_builddir)/cscope.files - -distclean-tags: -	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) -	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -	list='$(DISTFILES)'; \ -	  dist_files=`for file in $$list; do echo $$file; done | \ -	  sed -e "s|^$$srcdirstrip/||;t" \ -	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -	case $$dist_files in \ -	  */*) $(MKDIR_P) `echo "$$dist_files" | \ -			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -			   sort -u` ;; \ -	esac; \ -	for file in $$dist_files; do \ -	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -	  if test -d $$d/$$file; then \ -	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ -	    if test -d "$(distdir)/$$file"; then \ -	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ -	    fi; \ -	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ -	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ -	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ -	    fi; \ -	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ -	  else \ -	    test -f "$(distdir)/$$file" \ -	    || cp -p $$d/$$file "$(distdir)/$$file" \ -	    || exit 1; \ -	  fi; \ -	done -check-am: all-am -check: $(BUILT_SOURCES) -	$(MAKE) $(AM_MAKEFLAGS) check-am -all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA) -installdirs: -	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgconfigdir)"; do \ -	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -	done -install: $(BUILT_SOURCES) -	$(MAKE) $(AM_MAKEFLAGS) install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am -	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: -	if test -z '$(STRIP)'; then \ -	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -	      install; \ -	else \ -	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -	fi -mostlyclean-generic: - -clean-generic: -	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -distclean-generic: -	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: -	@echo "This command is intended for maintainers to use" -	@echo "it deletes files that may require special tools to rebuild." -	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -clean: clean-am - -clean-am: clean-binPROGRAMS clean-generic clean-libtool clean-local \ -	clean-noinstPROGRAMS mostlyclean-am - -distclean: distclean-am -	-rm -rf ./$(DEPDIR) -	-rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ -	distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: install-pkgconfigDATA - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: install-binPROGRAMS install-binSCRIPTS - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am -	-rm -rf ./$(DEPDIR) -	-rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ -	mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ -	uninstall-pkgconfigDATA - -.MAKE: all check install install-am install-strip - -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ -	clean-binPROGRAMS clean-generic clean-libtool clean-local \ -	clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \ -	distclean-compile distclean-generic distclean-libtool \ -	distclean-tags distdir dvi dvi-am html html-am info info-am \ -	install install-am install-binPROGRAMS install-binSCRIPTS \ -	install-data install-data-am install-dvi install-dvi-am \ -	install-exec install-exec-am install-html install-html-am \ -	install-info install-info-am install-man install-pdf \ -	install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ -	install-strip installcheck installcheck-am installdirs \ -	maintainer-clean maintainer-clean-generic mostlyclean \ -	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -	uninstall-binPROGRAMS uninstall-binSCRIPTS \ -	uninstall-pkgconfigDATA - - -# When build directory is not same as source directory then any -# subdirectories that targets use must be manually created (under -# the build directory that is). -dirs: -	for subdir in $(HOTPLUG_DIRS); do \ -	  $(MKDIR_P) $$subdir || exit 1; \ -	  done - -hotplug/libsane.usermap: sane-desc $(descriptions) -	@./sane-desc -m usermap -s ${top_srcdir}/doc/descriptions:${top_srcdir}/doc/descriptions-external \ -	   -d 1 > $@ - -hotplug-ng/libsane.db: sane-desc $(descriptions) -	@./sane-desc -m db -s ${top_srcdir}/doc/descriptions:${top_srcdir}/doc/descriptions-external \ -	   -d 0 > $@ - -udev/libsane.rules: sane-desc $(descriptions) -	@./sane-desc -m udev -s ${top_srcdir}/doc/descriptions:${top_srcdir}/doc/descriptions-external \ -	   -d 0 > $@ - -hal/libsane.fdi: sane-desc $(descriptions) -	@./sane-desc -m hal -s ${top_srcdir}/doc/descriptions:${top_srcdir}/doc/descriptions-external \ -	   -d 0 > $@ - -clean-local: -	rm -f $(HOTPLUG) - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/tools/README b/tools/README index 10d0d95..ca15ad4 100644 --- a/tools/README +++ b/tools/README @@ -48,7 +48,7 @@ This directory contains various tools that may be useful:  	scanner protocol can be tested directly.   gamma4scanimage: Creates a gamma table in the format expected by scanimage. -	You can define a gamma value, shadow and highlight.  +	You can define a gamma value, shadow and highlight.  	Take a look at manual page gamma4scanimage for further information.   RenSaneDlls.cmd: Convert backend-DLL-filenames according to 8.3 naming @@ -57,13 +57,13 @@ This directory contains various tools that may be useful:  Maybe useful for SANE developers:   sane-config: -        Show SANE version, linker flags etc. Might be useful for  +        Show SANE version, linker flags etc. Might be useful for          frontend developers.   sane-desc:          Generate SANE webpages (and ASCII lists) from backend .desc files.          Run "sane-desc --help" for details. The default lists are generated -        in doc/Makefile.  +        in doc/Makefile.   check-po.awk:          Print untranslated and fuzzy messages and their line numbers in the @@ -73,4 +73,3 @@ Maybe useful for SANE developers:          script. Alternatively, run it via gawk's -f option, like so:             gawk -f tools/check-po.awk po/de.po          More documentation is in the script itself. - diff --git a/tools/RenSaneDlls.cmd b/tools/RenSaneDlls.cmd index 2973f85..97c6f71 100644 --- a/tools/RenSaneDlls.cmd +++ b/tools/RenSaneDlls.cmd @@ -3,7 +3,7 @@  /* necessary for DLLs on OS/2            (C) Franz Bakan  2004,2005     */  /*                                                                      */  /* This file is part of the SANE package.                               */ -/*                                                                      */  +/*                                                                      */  /* 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 the Free Software Foundation; either version 2 of the   */ diff --git a/tools/check-po.awk b/tools/check-po.awk index 09e4d15..412b451 100755 --- a/tools/check-po.awk +++ b/tools/check-po.awk @@ -18,11 +18,11 @@  # This script will (hopefully!) check the completeness of a .po  # translation file. It will report untranslated strings, as well -# as fuzzy ones. It will print a summarry at the end of the check +# as fuzzy ones. It will print a summary at the end of the check  # that says how many strings there are, how many are translated  # (and the percentage it represents), how many are fuzzy (and the  # percentage it represents amongst translated strings), and how -# many aree un-translated (and the percentage it represents). +# many are untranslated (and the percentage it represents).  # It will _not_ tell you wether your file is syntactically correct  # (eg. check for terminating double quotes!). And of course it  # will _not_ tell you wether the translations are correct! ;-] @@ -30,7 +30,7 @@  # It was originaly been written for SANE backends translations, but  # shall be able to check any .po file.  # -# Originally writen by Yann E. MORIN  +# Originally writen by Yann E. MORIN  # <yann dot morin dot 1998 at anciens dot enib dot fr>  #  # Output will look like : diff --git a/tools/check-usb-chip.c b/tools/check-usb-chip.c index 50b3e88..ac71cb4 100644 --- a/tools/check-usb-chip.c +++ b/tools/check-usb-chip.c @@ -1,6 +1,6 @@  /*     check-usb-chip.c -- Find out what USB scanner chipset is used -    +     Copyright (C) 2003-2005 Henning Meier-Geinitz <henning@meier-geinitz.de>     Copyright (C) 2003 Gerhard Jaeger <gerhard@gjaeger.de>                        for LM983x tests @@ -706,7 +706,7 @@ check_ma1017 (struct usb_device *dev)        finish_interface (handle);        return 0;      } -  /* Read one byte again to work around a bug in the MA-1017 chipset that  +  /* Read one byte again to work around a bug in the MA-1017 chipset that       appears when an odd number of bytes is read or written. */    result = usb_bulk_write (handle, 0x01, req, 2, 1000);    result = usb_bulk_read (handle, 0x82, &res, 1, 1000); @@ -1727,14 +1727,14 @@ check_gl660_gl646 (struct usb_device *dev)  /********** the gl841 section **********/ -/* the various incarnations could be distinguished by the  +/* the various incarnations could be distinguished by the   * bcdDevice entry:   *    0x701 --> GL124   *    0x700 --> ?   *    0x605 --> GL845   *    0x603 --> GL847 - *    0x601 --> GL846  - *    0x500 --> GL843  + *    0x601 --> GL846 + *    0x500 --> GL843   *    0x300 --> GL842 (perhaps only >= 0x303 ?)   *    0x200 --> GL841   */ @@ -2239,7 +2239,7 @@ check_pv8630_lm9830 (struct usb_device *dev)    if (!result)      return "PV8630/LM9830?"; -  result =  +  result =      usb_control_msg (handle, 0x40, 0x01, 0x38, 0x01, NULL, 0, TIMEOUT);    if (result < 0)      { @@ -2261,7 +2261,7 @@ check_pv8630_lm9830 (struct usb_device *dev)        return 0;      } -  result =  +  result =      usb_control_msg (handle, 0x40, 0x01, 0x38, 0x01, NULL, 0, TIMEOUT);    if (result < 0)      { @@ -2375,7 +2375,7 @@ check_m011 (struct usb_device *dev)    data = 0x63; -  result =  +  result =      usb_control_msg (handle, 0x40, 0x08, 0x34, 0x00, &data, 1, TIMEOUT);    if (result < 0)      { @@ -2876,13 +2876,13 @@ check_sq113 (struct usb_device *dev)    result = prepare_interface (dev, &handle);    if (!result)      return "SQ113?"; -   +    buffer [0] = 0x5f;    buffer [1] = 0x00;    buffer [2] = 0x5f;    buffer [3] = 0x00; -  result =  +  result =      usb_control_msg (handle, 0x40, 0x01, 0xb0, 0, (char *) buffer, 4, TIMEOUT);    if (result < 0)      { @@ -2900,7 +2900,7 @@ check_sq113 (struct usb_device *dev)    buffer [2] = 0x8b;    buffer [3] = data; -  result =  +  result =      usb_control_msg (handle, 0x40, 0x01, 0xb0, 0, (char *) buffer, 4, TIMEOUT);    if (result < 0)      { @@ -2915,7 +2915,7 @@ check_sq113 (struct usb_device *dev)    buffer [1] = 0x8b;    buffer [2] = 0x8b;    buffer [3] = 0x8b; -  result =  +  result =      usb_control_msg (handle, 0x40, 0x01, 0x04, 0x8b, (char *) buffer, 4, TIMEOUT);    if (result < 0)      { @@ -2926,7 +2926,7 @@ check_sq113 (struct usb_device *dev)        return 0;      } -  result =  +  result =      usb_control_msg (handle, 0xc0, 0x01, 0x07, 0, (char *) buffer, 4, TIMEOUT);    if (result < 0)      { @@ -3240,7 +3240,7 @@ check_hp5590 (struct usb_device *dev)      }    /* Get confirmation for USB-in-USB command */ -  result = usb_control_msg (handle, USB_ENDPOINT_IN | USB_TYPE_VENDOR,  +  result = usb_control_msg (handle, USB_ENDPOINT_IN | USB_TYPE_VENDOR,  			    0x0c, 0x8e, 0x20,  			    (char *) &status, sizeof(status), TIMEOUT);    if (result < 0) @@ -3874,14 +3874,14 @@ check_gt6816 (libusb_device_handle * handle,  /** @brief check for known genesys chip   *   * Try to check if the scanner use a known genesys ASIC. - * The various incarnations could be distinguished by the  + * The various incarnations could be distinguished by the   * bcdDevice entry:   *    0x701 --> GL124   *    0x700 --> ?   *    0x605 --> GL845   *    0x603 --> GL847 - *    0x601 --> GL846  - *    0x500 --> GL843  + *    0x601 --> GL846 + *    0x500 --> GL843   *    0x300 --> GL842 (perhaps only >= 0x303 ?)   *    0x200 --> GL841   * diff --git a/tools/create-changelog.sh b/tools/create-changelog.sh new file mode 100755 index 0000000..a0b8d91 --- /dev/null +++ b/tools/create-changelog.sh @@ -0,0 +1,16 @@ +#!/bin/sh -u +# tools/create-changelog.sh -- for inclusion in source tarballs +# Copyright (C) 2019  Olaf Meeuwissen +# +# License: GPL-3.0+ + +git log --date=iso8601 --decorate=short 1.0.27..HEAD \ +    | sed 's/^[ \t]*$//' \ +    > ChangeLog + +cat << EOF >> ChangeLog + +---------------------------------------------------------------------- +Older ChangeLog entries can be found in the ChangeLogs/ directory on a +file per release basis.  Please note that 1.0.26 was never released. +EOF diff --git a/tools/create-release.sh b/tools/create-release.sh new file mode 100755 index 0000000..40904d7 --- /dev/null +++ b/tools/create-release.sh @@ -0,0 +1,61 @@ +#!/bin/sh -eux +# tools/create-release.sh -- via GitLab CI and API +# Copyright (C) 2019  Olaf Meeuwissen +# +# License: GPL-3.0+ + +GROUP=sane-project +PROJECT=backends +PROJECT_ID=$GROUP%2F$PROJECT + +API_ENDPOINT=https://gitlab.com/api/v4 + +# Uploads a file and returns a project relative URL to it. +upload () { +    curl --silent --fail \ +         --header "PRIVATE-TOKEN: $PRIVATE_TOKEN" \ +         --form "file=@$1" \ +         --request POST \ +         $API_ENDPOINT/projects/$PROJECT_ID/uploads \ +        | jq --raw-output .url \ +        | sed "s|^|https://gitlab.com/$GROUP/$PROJECT|" +} + +cat << EOF > release.json +{ +  "name": "SANE Backends $CI_COMMIT_TAG", +  "tag_name": "$CI_COMMIT_TAG", +  "description": "$(sed '1,3d; //{s/.*//; q}' NEWS \ +     | git stripspace \ +     | sed 's/"/\\"/g; s/$/\\n/g' \ +     | tr -d '\n')", +  "assets": { +    "links": [ +EOF + +for check in sha256 sha512; do +    ${check}sum sane-backends-$CI_COMMIT_TAG.tar.gz \ +            > sane-backends-$CI_COMMIT_TAG.$check.txt +    cat << EOF >> release.json +      { +        "name": "sane-backends-$CI_COMMIT_TAG.$check.txt", +        "url": "$(upload sane-backends-$CI_COMMIT_TAG.$check.txt)" +      }, +EOF +done + +cat << EOF >> release.json +      { +        "name": "sane-backends-$CI_COMMIT_TAG.tar.gz", +        "url": "$(upload sane-backends-$CI_COMMIT_TAG.tar.gz)" +      } +    ] +  } +} +EOF + +curl --silent --fail --write-out "%{http_code}\n"\ +     --header "PRIVATE-TOKEN: $PRIVATE_TOKEN" \ +     --header "Content-Type: application/json" \ +     --data @release.json \ +     --request POST $API_ENDPOINT/projects/$PROJECT_ID/releases diff --git a/tools/epson2usb.pl b/tools/epson2usb.pl new file mode 100755 index 0000000..6d542d7 --- /dev/null +++ b/tools/epson2usb.pl @@ -0,0 +1,61 @@ +#!/usr/bin/perl -w + +# Creates an USB device list from the description file +# +# epson2usb.pl doc/descriptions/epson2.desc +# +# Copyright (C) 2010 Tower Technologies +# Author: Alessandro Zummo <a.zummo@towertech.it> +# +# This file is part of the SANE package. +# +# 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 the Free Software Foundation, version 2. + +use strict; +use warnings; + +	my %ids; +	my @models; +	my $i = 0; + +	while (<>) { + +		my $flip = /^:model/ ... /^$/; + +		$models[$i]{$1} = $2 +			if /^:(\w+)\s+(.+)/; + +		$i++ +			if $flip =~ /E0$/; +	} + +	foreach my $m (@models) { + +		next unless defined $m->{'usbid'}; +		next if $m->{'status'} eq ':unsupported'; + +#		print $m->{'model'} , "\n"; +#		print "-", $m->{'usbid'} , "-\n"; + +		next unless $m->{'usbid'} =~ /"0x04b8"\s+"(0x[[:xdigit:]]+)"/; + +		my $id = $1; + +#		print $id, "\n"; + +		$id =~ s/0x0/0x/; + +		$m->{'model'} =~ s/;.+$//; +		$m->{'model'} =~ s/\"//g; +		$m->{'model'} =~ s/\s+$//; + +		push(@{$ids{$id}}, $m->{'model'}); +	} + +	foreach (sort keys %ids) { +		print '  ', $_, ', /* '; +		print join(', ', @{$ids{$_}}); +		print " */\n"; +	} diff --git a/tools/hotplug-ng/.gitignore b/tools/hotplug-ng/.gitignore new file mode 100644 index 0000000..c63faf4 --- /dev/null +++ b/tools/hotplug-ng/.gitignore @@ -0,0 +1 @@ +libsane.db diff --git a/tools/hotplug/.gitignore b/tools/hotplug/.gitignore new file mode 100644 index 0000000..e194d28 --- /dev/null +++ b/tools/hotplug/.gitignore @@ -0,0 +1 @@ +libsane.usermap diff --git a/tools/hotplug/libusbscanner b/tools/hotplug/libusbscanner index bf613a5..55646d4 100755 --- a/tools/hotplug/libusbscanner +++ b/tools/hotplug/libusbscanner @@ -32,4 +32,3 @@ fi  # if [ "$ACTION" = "add" -a "$TYPE" = "usb" ]; then  #  chmod 0666 "$DEVICE"  # fi - diff --git a/tools/sane-config.in b/tools/sane-config.in index 6b7cd30..5ef9ba4 100644 --- a/tools/sane-config.in +++ b/tools/sane-config.in @@ -2,7 +2,7 @@  #  # This script is part of SANE, <URL:http://www.sane-project.org/>  # -# Send bugreports and other requests to sane-devel@lists.alioth.debian.org +# Send bugreports and other requests to sane-devel@alioth-lists.debian.net  PACKAGE="@PACKAGE@"  scriptname="sane-config" @@ -88,4 +88,3 @@ if test $# -gt 0; then        ;;    esac  fi - diff --git a/tools/sane-desc.c b/tools/sane-desc.c index badc8ce..890e754 100644 --- a/tools/sane-desc.c +++ b/tools/sane-desc.c @@ -47,7 +47,7 @@  #define SANE_DESC_VERSION "3.5" -#define MAN_PAGE_LINK "http://www.sane-project.org/man/%s.5.html" +#define MAN_PAGE_LINK "man/%s.5.html"  #define COLOR_MINIMAL      "\"#B00000\""  #define COLOR_BASIC        "\"#FF9000\""  #define COLOR_GOOD         "\"#90B000\"" @@ -315,7 +315,7 @@ print_usage (char *program_name)    printf ("Usage: %s [-s dir] [-m mode] [-d level] [-h] [-V]\n",  	  program_name);    printf ("  -s|--search-dir dir    " -	  "Specify the directory that contains .desc files \n" +	  "Specify the directory that contains .desc files\n"  	  "                         "  	  "(multiple directories can be concatenated by \":\")\n");    printf ("  -m|--mode mode         " @@ -2075,7 +2075,7 @@ xml_print_backends (void)  	printf ("<backend name=\"*none\">\n");        if (be->version) -	printf ("<version>%s</version> \n", clean_string (be->version)); +	printf ("<version>%s</version>\n", clean_string (be->version));        else  	printf ("<version>*none*</version>\n"); @@ -2448,7 +2448,7 @@ html_backends_split_table (device_type dev_type)    backend_entry *be = first_backend;    SANE_Bool first = SANE_TRUE; -  printf ("<p><b>Backends</b>: \n"); +  printf ("<p><b>Backends</b>:\n");    while (be)			/* print link list */      {        type_entry *type = be->type; @@ -2463,7 +2463,7 @@ html_backends_split_table (device_type dev_type)        if (found)  	{  	  if (!first) -	    printf (", \n"); +	    printf (",\n");  	  first = SANE_FALSE;  	  printf ("<a href=\"#%s\">%s</a>",  		  html_generate_anchor_name (dev_type, be->name), be->name); @@ -2512,7 +2512,7 @@ html_backends_split_table (device_type dev_type)  	      if (be->url && be->url->name)  		{  		  url_entry *url = be->url; -		  printf ("<b>Link(s):</b> \n"); +		  printf ("<b>Link(s):</b>\n");  		  while (url)  		    {  		      if (url != be->url) @@ -2650,11 +2650,11 @@ html_mfgs_table (device_type dev_type)    first_mfg_record = create_mfg_list (dev_type);    mfg_record = first_mfg_record; -  printf ("<p><b>Manufacturers</b>: \n"); +  printf ("<p><b>Manufacturers</b>:\n");    while (mfg_record)      {        if (mfg_record != first_mfg_record) -	printf (", \n"); +	printf (",\n");        printf ("<a href=\"#%s\">%s</a>",  	      html_generate_anchor_name (type_unknown, mfg_record->name),  	      mfg_record->name); @@ -2675,7 +2675,7 @@ html_mfgs_table (device_type dev_type)        if (mfg_record->url && mfg_record->url->name)  	{  	  url_entry *url = mfg_record->url; -	  printf ("<b>Link(s):</b> \n"); +	  printf ("<b>Link(s):</b>\n");  	  while (url)  	    {  	      if (url != mfg_record->url) @@ -2786,7 +2786,7 @@ html_print_header (void)      ("</head>\n"       "<body bgcolor=FFFFFF>\n"       "<div align=center>\n" -     "<img src=\"http://www.sane-project.org/images/sane.png\" alt=\"SANE\">\n"); +     "<img src=\"images/sane.png\" alt=\"SANE\">\n");    printf ("<h1>%s</h1>\n", title);    printf ("</div>\n" "<hr>\n");    printf ("%s\n", intro); @@ -2797,8 +2797,8 @@ html_print_header (void)       "concerning each backend.</p>\n");    printf      ("<p>If you have new information or corrections, please file a\n" -     "<a href=\"http://www.sane-project.org/bugs.html\">bug report</a>\n" -     "with as many details as possible. Also please tell us if your scanner \n" +     "<a href=\"bugs.html\">bug report</a>\n" +     "with as many details as possible. Also please tell us if your scanner\n"       "isn't mentioned in this list at all.</p>\n"       "<p>For an explanation of the tables, see the\n"       "<a href=\"#legend\">legend</a>.\n"); @@ -2812,9 +2812,9 @@ html_print_footer (void)    printf      ("<hr>\n" -     "<a href=\"http://www.sane-project.org/\">SANE homepage</a>\n" +     "<a href=\"./\">SANE homepage</a>\n"       "<address>\n" -     "<a href=\"http://www.sane-project.org/imprint.html\"\n" +     "<a href=\"imprint.html\"\n"       ">Contact</a>\n" "</address>\n" "<font size=-1>\n");    printf ("This page was last updated on %s by sane-desc %s from %s\n",  	  asctime (localtime (¤t_time)), SANE_DESC_VERSION, PACKAGE_STRING); @@ -2834,8 +2834,8 @@ html_print_legend_backend (void)       "      available from their home sites.<br>"       "      <font color=" COLOR_NEW ">NEW!</font> means brand-new to the\n"       "      current release of SANE.<br>\n" -     "      UNMAINTAINED means that nobody maintains that backend. Expect no \n" -     "      new features or newly supported devices. You are welcome to take over \n" +     "      UNMAINTAINED means that nobody maintains that backend. Expect no\n" +     "      new features or newly supported devices. You are welcome to take over\n"       "      maintainership.\n" "  </dd>\n");  } @@ -2902,7 +2902,7 @@ html_print_legend_status (void)  {    printf      ("  <dt><b>Status</b>:</dt>\n" -     "  <dd>Indicates how many of the features the device provides \n" +     "  <dd>Indicates how many of the features the device provides\n"       "      are supported by SANE.\n"       "      <ul><li><font color=" COLOR_UNSUPPORTED ">unsupported</font>"       "        means the device is not supported at least by this backend. " @@ -2912,16 +2912,16 @@ html_print_legend_status (void)       "        device may be supported but couldn't be tested. Be very "       "        careful and report success/failure.\n"       "      <li><font color=" COLOR_MINIMAL ">minimal</font> means that the\n" -     "        device is detected and scans at least in one mode. But the quality \n" +     "        device is detected and scans at least in one mode. But the quality\n"       "        is bad or important features won't work.\n");    printf -    ("      <li><font color=" COLOR_BASIC ">basic</font> means it works at \n" +    ("      <li><font color=" COLOR_BASIC ">basic</font> means it works at\n"       "        least in the most important modes but quality is not perfect.\n"       "      <li><font color=" COLOR_GOOD -     ">good</font> means the device is usable \n" +     ">good</font> means the device is usable\n"       "        for day-to-day work. Some rather exotic features may be missing.\n"       "      <li><font color=" COLOR_COMPLETE -     ">complete</font> means the backends \n" +     ">complete</font> means the backends\n"       "        supports everything the device can do.\n" "      </ul></dd>\n");  } @@ -3360,7 +3360,7 @@ print_usermap_header (void)       "# device detection support for your OS\n"       "#\n"       "# If the scanner is supported by sane-backends, please mail the entry to\n" -     "# the sane-devel mailing list (sane-devel@lists.alioth.debian.org).\n" +     "# the sane-devel mailing list (sane-devel@alioth-lists.debian.net).\n"       "#\n"       ); @@ -3427,7 +3427,7 @@ print_db_header (void)       "# device detection support for your OS\n"       "#\n"       "# If the scanner is supported by sane-backends, please mail the entry to\n" -     "# the sane-devel mailing list (sane-devel@lists.alioth.debian.org).\n" +     "# the sane-devel mailing list (sane-devel@alioth-lists.debian.net).\n"       "#\n"       );  } @@ -3451,7 +3451,7 @@ print_db (void)  	  name = name->next;  	}        printf ("\n"); -      printf ("%s\t%s\t%s:%s\t%s\t\n", usbid->usb_vendor_id, +      printf ("%s\t%s\t%s:%s\t%s\n", usbid->usb_vendor_id,  	      usbid->usb_product_id, DEVOWNER, DEVGROUP, DEVMODE);        usbid = usbid->next;      } @@ -3491,7 +3491,7 @@ print_udev_header (void)       "# device detection support for your OS\n"       "#\n"       "# If the scanner is supported by sane-backends, please mail the entry to\n" -     "# the sane-devel mailing list (sane-devel@lists.alioth.debian.org).\n" +     "# the sane-devel mailing list (sane-devel@alioth-lists.debian.net).\n"       "#\n"       );  } @@ -3679,7 +3679,7 @@ print_udevhwdb_header (void)       "# device detection support for your OS\n"       "#\n"       "# If the scanner is supported by sane-backends, please mail the entry to\n" -     "# the sane-devel mailing list (sane-devel@lists.alioth.debian.org).\n" +     "# the sane-devel mailing list (sane-devel@alioth-lists.debian.net).\n"       "#\n"       );  } @@ -3782,8 +3782,8 @@ print_hwdb_header (void)       "# device detection support for your OS\n"       "#\n"       "# If the scanner is supported by sane-backends, please mail the entry to\n" -     "# the sane-devel mailing list (sane-devel@lists.alioth.debian.org).\n" -     "#\n" +     "# the sane-devel mailing list (sane-devel@alioth-lists.debian.net).\n" +     "#"       );  } @@ -3802,7 +3802,7 @@ print_hwdb (void)        manufacturer_model_type * name = usbid->name;        i = 0; -      printf ("# "); +      printf ("\n# ");        while (name)  	{  	  if ((name != usbid->name) && (i > 0)) @@ -3833,7 +3833,7 @@ print_hwdb (void)          product_id[j] = toupper(product_id[j]);        } -      printf ("usb:v%sp%s*\n libsane_matched=yes\n\n", +      printf ("usb:v%sp%s*\n libsane_matched=yes\n",  		vendor_id, product_id);        free(vendor_id); diff --git a/tools/sane-find-scanner.c b/tools/sane-find-scanner.c index 04f19d9..a62ceac 100644 --- a/tools/sane-find-scanner.c +++ b/tools/sane-find-scanner.c @@ -225,7 +225,7 @@ scanner_do_scsi_inquiry (unsigned char *buffer, int sfd)    memset (buffer, '\0', 256);	/* clear buffer */ -  size = 5;			/* first get only 5 bytes to get size of  +  size = 5;			/* first get only 5 bytes to get size of  				   inquiry_return_block */    set_inquiry_return_size (inquiry.cmd, size);    status = sanei_scsi_cmd (sfd, inquiry.cmd, inquiry.size, buffer, &size); @@ -433,13 +433,13 @@ get_libusb_string_descriptor (struct usb_device *dev, int index)        return 0;      } -  if (sd->bLength < 2  +  if (sd->bLength < 2        || sd->bDescriptorType != USB_DT_STRING)      {        usb_close (handle);        return 0;      } -   +    size = sd->bLength;    buffer = calloc (1, size + 1); @@ -659,7 +659,7 @@ check_libusb_device (struct usb_device *dev, SANE_Bool from_file)  	  ++is_scanner;  	  break;  	case USB_CLASS_PER_INTERFACE: -	  if (dev->config[0].interface[interface_nr].num_altsetting == 0 ||  +	  if (dev->config[0].interface[interface_nr].num_altsetting == 0 ||  	      !dev->config[0].interface[interface_nr].altsetting)  	    break;  	  switch (dev->config[0].interface[interface_nr].altsetting[0].bInterfaceClass) @@ -782,7 +782,7 @@ get_libusb_string_descriptor (libusb_device_handle *hdl, int index)    if ((short_buffer[0] < 2) /* descriptor length */        || (short_buffer[1] != LIBUSB_DT_STRING)) /* descriptor type */      return NULL; -   +    size = short_buffer[0];    buffer = calloc (1, size + 1); @@ -934,7 +934,7 @@ check_libusb_device (libusb_device *dev, SANE_Bool from_file)  	  printf (" iConfiguration       %d (%s)\n", c->iConfiguration,  		  (buf) ? buf : "");  	  free (buf); -		   +  	  printf (" bmAttributes         %d (%s%s)\n", c->bmAttributes,  		  c->bmAttributes & 64 ? "Self-powered" : "",  		  c->bmAttributes & 32 ? "Remote Wakeup" : ""); @@ -1064,7 +1064,7 @@ check_libusb_device (libusb_device *dev, SANE_Bool from_file)    if (is_scanner > 0)      {        char *chipset = NULL; -       +        if(!from_file)          chipset = check_usb_chip (verbose, desc, hdl, config0); @@ -1084,7 +1084,7 @@ check_libusb_device (libusb_device *dev, SANE_Bool from_file)        libusb_device_found = SANE_TRUE;        device_found = SANE_TRUE;      } -   +    libusb_free_config_descriptor (config0);   out_free: @@ -1212,14 +1212,14 @@ static char **build_scsi_dev_list(void)  		adapter = (PSCSI_ADAPTER_BUS_INFO)buffer; -		for(i = 0; i < adapter->NumberOfBuses; i++) {	 +		for(i = 0; i < adapter->NumberOfBuses; i++) {  			if (adapter->BusData[i].InquiryDataOffset == 0) {  				/* No device here */  				continue;  			} -			inquiry = (PSCSI_INQUIRY_DATA) (buffer +  +			inquiry = (PSCSI_INQUIRY_DATA) (buffer +  											adapter->BusData[i].InquiryDataOffset);  			while(1) {  				/* Check if it is a scanner or a processor @@ -1233,7 +1233,7 @@ static char **build_scsi_dev_list(void)  					dev_list[dev_list_index] = strdup(device_name);  					dev_list_index++;  				} -			 +  				if (inquiry->NextInquiryDataOffset == 0) {  					/* No device here */  					break; @@ -1300,7 +1300,7 @@ check_mustek_pp_device (void)        printf ("checking %s...", devices[ctr]);      result = sanei_pa4s2_open (devices[ctr], &fd); -     +      if (verbose > 1)        {          if (result != 0) @@ -1315,13 +1315,13 @@ check_mustek_pp_device (void)        found++;        sanei_pa4s2_close(fd);      } -     +      /* trying scsi over pp devices */      if (verbose > 1)        printf ("checking %s (SCSI emulation)...", devices[ctr]);      result = sanei_pa4s2_scsi_pp_open (devices[ctr], &fd); -     +      if (verbose > 1)        {          if (result != 0) @@ -1365,7 +1365,7 @@ parse_num (char* search, const char* line, int base, long int * number)    if (start_number == NULL)      return SANE_FALSE;    start_number += strlen (search); -  +    *number = strtol (start_number, NULL, base);    if (verbose > 2)      printf ("Found %s%ld\n", search, *number); @@ -1384,11 +1384,11 @@ parse_bcd (char* search, const char* line, long int * number)    if (start_number == NULL)      return SANE_FALSE;    start_number += strlen (search); -  +    first_part = strtol (start_number, &end_number, 10);    start_number = end_number + 1; /* skip colon */    second_part = strtol (start_number, NULL, 10); -  *number = ((first_part / 10) << 12) + ((first_part % 10) << 8)  +  *number = ((first_part / 10) << 12) + ((first_part % 10) << 8)      + ((second_part / 10) << 4) + (second_part % 10);    if (verbose > 2)      printf ("Found %s%ld\n", search, *number); @@ -1478,7 +1478,7 @@ parse_file (char *filename)  	    }  	  if (parse_num ("Ifs=", line, 10, &number))  	    dev->config[current_config].bNumInterfaces = number; -	  dev->config[current_config].interface  +	  dev->config[current_config].interface  	    = calloc (number, sizeof (struct usb_interface));  	  if (parse_num ("Atr=", line, 16, &number))  	    dev->config[current_config].bmAttributes = number; @@ -1504,24 +1504,24 @@ parse_file (char *filename)  	  if (parse_num ("Alt=", line, 10, &number))  	    {  	      current_as = number; -	      dev->config[current_config].interface[current_if].altsetting[current_as].bInterfaceNumber  +	      dev->config[current_config].interface[current_if].altsetting[current_as].bInterfaceNumber  		= current_if; -	      dev->config[current_config].interface[current_if].altsetting[current_as].bAlternateSetting  +	      dev->config[current_config].interface[current_if].altsetting[current_as].bAlternateSetting  		= current_as;  	    }  	  if (parse_num ("#EPs=", line, 10, &number)) -	    dev->config[current_config].interface[current_if].altsetting[current_as].bNumEndpoints  +	    dev->config[current_config].interface[current_if].altsetting[current_as].bNumEndpoints  	      = number; -	  dev->config[current_config].interface[current_if].altsetting[current_as].endpoint  +	  dev->config[current_config].interface[current_if].altsetting[current_as].endpoint  	    = calloc (number, sizeof (struct usb_endpoint_descriptor));  	  if (parse_num ("Cls=", line, 16, &number)) -	    dev->config[current_config].interface[current_if].altsetting[current_as].bInterfaceClass  +	    dev->config[current_config].interface[current_if].altsetting[current_as].bInterfaceClass  	      = number;  	  if (parse_num ("Sub=", line, 16, &number)) -	    dev->config[current_config].interface[current_if].altsetting[current_as].bInterfaceSubClass  +	    dev->config[current_config].interface[current_if].altsetting[current_as].bInterfaceSubClass  	      = number;  	  if (parse_num ("Prot=", line, 16, &number)) -	    dev->config[current_config].interface[current_if].altsetting[current_as].bInterfaceProtocol  +	    dev->config[current_config].interface[current_if].altsetting[current_as].bInterfaceProtocol  	      = number;  	  break;  	case 'E': @@ -1605,6 +1605,13 @@ main (int argc, char **argv)  #endif  	  exit (0); +	case '-': +	  if (!strcmp((*ap), "--help")) +	    { +	      usage (0); +	      exit (0); +	    } +  	default:  	  printf ("unknown option: -%c, try -h for help\n", (*ap)[1]);  	  exit (0); @@ -2069,7 +2076,7 @@ main (int argc, char **argv)  		"more details.\n");  #endif      } -  if (enable_pp_checks == SANE_TRUE)  +  if (enable_pp_checks == SANE_TRUE)      {        if (!check_mustek_pp_device() && verbose > 0)          printf ("\n  # No Mustek parallel port scanners found. If you expected" diff --git a/tools/style-check.sh b/tools/style-check.sh new file mode 100755 index 0000000..479f7bb --- /dev/null +++ b/tools/style-check.sh @@ -0,0 +1,99 @@ +#!/bin/sh -u +# tools/style-check.sh -- for conformance or --fix to conform +# Copyright (C) 2017  Olaf Meeuwissen +# +# License: GPL-3.0+ + +check_final_newline() { +    test x = "x$(tail -c 1 $1)" +} + +insert_final_newline() { +    check_final_newline $1 || echo >> $1 +} + +check_trailing_whitespace() { +    test -z "$(sed -n '/[ \t]$/{p;q}' $1)" +} + +trim_trailing_whitespace() { +    sed -i 's/[ \t]*$//' $1 +} + +check_trailing_blank_lines() { +    test -z "$(sed -n '${/^$/s/^/blank/p}' $1)" +} + +trim_trailing_blank_lines() { +    sed -i -e :a -e '/^\n*$/{$d;N;};/\n$/ba' $1 +} + +check_leading_blank_lines() { +    test -z "$(sed -n '1{/^$/s/^/blank/p;q}' $1)" +} + +trim_leading_blank_lines() { +    sed -i '/./,$!d' $1 +} + +check_utf_8_charset() { +    err=$(iconv -f utf-8 -t utf-8 < $1 2>&1 > /dev/null) +    if test x != "x$err"; then +        echo "charset not UTF-8: $1" >&2 +        echo "$err" >&2 +        return 1 +    fi +} + +fix=false +case $1 in +    --fix) fix=true; shift;; +esac + +status=0 +for file in "$@"; do +    test -d $file && continue       # skip directories, just in case +    file=$(echo $file | sed 's,^\.\/,,') +    case $file in +        COPYING) ;;                 # hands off of the GPL +        *.gif) ;;                   # don't touch image files +        *.jpg) ;; +        *.png) ;; +        *.pnm) ;; +        *.patch) ;;                 # patch output may have trailing lines or whitespace +        Makefile.in) ;;             # skip automake outputs +        */Makefile.in) ;; +        aclocal.m4) ;;              # skip autoconf outputs +        include/sane/config.h.in) ;; +        m4/libtool.m4) ;;           # courtesy of libtool +        m4/lt~obsolete.m4) ;; +        ABOUT-NLS) ;;               # courtesy of gettext +        doc/doxygen-*.conf.in) ;;   # don't fix doxygen -g comments + +        *) +            if `$fix`; then +                trim_trailing_whitespace $file +                insert_final_newline $file +                trim_trailing_blank_lines $file +            else +                if ! check_trailing_whitespace $file; then +                    status=1 +                    echo "trailing whitespace: $file" >&2 +                fi +                if ! check_final_newline $file; then +                    status=1 +                    echo "final newline missing: $file" >&2 +                fi +                if ! check_trailing_blank_lines $file; then +                    status=1 +                    echo "trailing blank lines: $file" >&2 +                fi +                if ! check_utf_8_charset $file; then +                    status=1 +                fi +            fi +            ;; +    esac +done + +exit $status diff --git a/tools/umax_pp.c b/tools/umax_pp.c index 134320b..7b127e3 100644 --- a/tools/umax_pp.c +++ b/tools/umax_pp.c @@ -35,12 +35,16 @@ main (int argc, char **argv)    char *name = NULL;    int scan = 0;    int lamp = -1; -  int i, fd; +  int i;    int found;    int recover = 0;    int trace = 0;    int maxw, maxh; +#ifdef HAVE_LINUX_PPDEV_H +  int fd; +#endif +  /* scanning parameters : defaults to preview (75 dpi color, full scan area) */    int gain = 0x0;    int offset = 0x646; diff --git a/tools/update-upstreams.sh b/tools/update-upstreams.sh new file mode 100755 index 0000000..3fde735 --- /dev/null +++ b/tools/update-upstreams.sh @@ -0,0 +1,21 @@ +#!/bin/sh -u +# tools/update-upstreams.sh -- files to their latest version +# Copyright (C) 2017, 2019  Olaf Meeuwissen +# +# License: GPL-3.0+ + +fetch () { +    if type curl 2>/dev/null >/dev/null ; then +        curl --silent --location --remote-name $1 +        return +    fi +    if type wget 2>/dev/null >/dev/null ; then +        wget --quiet --output-document $(echo $1 | sed 's,.*/,,') $1 +    fi +} + +CONFIG_BASE_URL=https://git.savannah.gnu.org/cgit/config.git/plain + +for file in config.guess config.sub; do +    fetch $CONFIG_BASE_URL/$file +done diff --git a/tools/xerox b/tools/xerox index 0b2a7c3..0d04a0c 100755 --- a/tools/xerox +++ b/tools/xerox @@ -35,11 +35,11 @@ else    WIDTH=8.27; HEIGHT=11.69  fi -SCANWIDTH=`bc <<_EOF_  +SCANWIDTH=`bc <<_EOF_  scale=3  $WIDTH-$LMARGIN-$RMARGIN  _EOF_` -SCANHEIGHT=`bc <<_EOF_  +SCANHEIGHT=`bc <<_EOF_  scale=3  $HEIGHT-$TMARGIN-$BMARGIN  _EOF_` | 
