commit c1c567c49b3bc9d86a5796b7fd9b17816700f75c (HEAD, tag: 1.0.32, origin/release/1.0.32, refs/pipelines/256007409)
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2021-02-14 20:00:00 +0900

    NEWS: Document changes for 1.0.32 release

commit eda0a770bf52c4ae446779d8ad8af005a8a974f9
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2021-02-14 16:24:24 +0900

    po: Re-sync *.po files to pick up latest source code changes

    Lines number have changes due to the FSF address change.

commit edcfdbc0d801547d3c1e0ab8bd62dad74295c54e
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2021-02-13 20:21:45 +0900

    saned: Add new -p, --port option to the manual page

    This complements !549.

commit 3408eef8ed04bbffd2cf601850ccee16e596e4b1
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2021-02-13 20:20:14 +0900

    escl.desc: Add entries for models newly supported since 1.0.31

    These were mentioned in the commit logs and merge requests but missing
    from the descriptions file.

commit e0b5a7e40748490bccfe10fbc2cd2d5a469cfd90
Merge: 102288c22 9c46d6bca
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2021-02-14 09:31:59 +0000

    Merge branch 'disable-canoscan-4400f' into 'release/1.0.32'

    genesys: Disable support for the CanoScan 4400F

    See merge request sane-project/backends!592

commit 102288c22eb33e2becb38ff866fdb3260f58cefb
Merge: ef8e40357 e3962ad18
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2021-02-14 07:18:00 +0000

    Merge branch 'add-files-to-source-tarball' into 'release/1.0.32'

    Add extra documentation and utility file to the source tarball

    See merge request sane-project/backends!593

commit e3962ad1843432bdf11c7ac31338491407a41960
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2021-02-14 16:01:01 +0900

    Add extra documentation and utility file to the source tarball

    These might be useful for someone starting from one of our release or
    snapshot source tarballs.

commit 9c46d6bcaccf38df870f22b5bc78ca8cc2eba692
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2021-02-14 10:46:36 +0900

    genesys: Disable support for the CanoScan 4400F.  Re #436

commit ef8e403572d91cb8bac4ef63ba9cae21fc46f5dc
Merge: 1532520fa 85f4ef106
Author: Ralph Little <littlesincanada@yahoo.co.uk>
Date:   2021-02-13 20:20:01 +0000

    Merge branch '433-issues-in-sane-man-pages' into 'release/1.0.32'

    Resolve "Issues in SANE man pages"

    See merge request sane-project/backends!581

commit 85f4ef10657735b0322c9f545b426b857a28b502 (origin/433-issues-in-sane-man-pages)
Author: Ralph Little <skelband@gmail.com>
Date:   2021-02-13 12:02:54 -0800

    doc: final pass through the man pages.

    Mostly just tidy up, catching pages that I missed the first time round.
    A small number of pages were given a bit more reformat. A bit beyond
    the remit of this merge request but not too much has been changed.

commit 0eaae38d1e546ddd67b811ef81791194cf5c4687
Author: Ralph Little <skelband@gmail.com>
Date:   2021-02-12 18:01:30 -0800

    doc: remaining man pages done.

    I will quickly review them all and check in corrections.
    I know that there are a few things that I did wrong in the first pass
    and I will fix them up.

commit 1532520fa14b43972c708282efbb19b436dd4ce8
Merge: 9ec6ec40a 4c8ac5e0a
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2021-02-12 09:52:08 +0000

    Merge branch '320-incorrect-fsf-address-in-license-and-copying' into 'release/1.0.32'

    Resolve "Incorrect FSF address in LICENSE and COPYING"

    See merge request sane-project/backends!591

commit 4c8ac5e0a6bd565a59099426aa7212eb780175d5
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2021-02-12 18:23:53 +0900

    COPYING: Sync with current plain text version on the FSF site

    This updates the Free Software Foundation's postal address.

    It replaces references to the Library General Public License (LGPL-2)
    with references to the GNU Lesser Public License (LGPL-2.1) as well.
    These licenses differ slightly, the latter adds section 6b, but the
    references are *outside* the TERMS AND CONDITIONS section.  Moreover,
    the first reference is in connection with clarifying the licensing of
    Free Software Foundation software and the second reference is merely a
    suggestion to use the LGPL in case you want to allow linking your code
    with proprietary software.

    In view of that, these changes in COPYING do *not* have an effect on
    the licensing status of the SANE Backends.

    Re #320.

commit e79adde8b2d713448f3022632f410d4a9de0fb91
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2021-02-12 17:41:38 +0900

    Use URL to refer users to copies of the GPL and LGPL

    With the exception of use in three quotes as well as our inlcuded copy
    of the GPL, all use of the Free Software Foundation's postal address
    has been removed.

    Re #320.

commit 9ec6ec40a926cc78cdba7e02168c54c68a5944f9
Merge: a21f4713d 51a7abd1f
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2021-02-09 09:14:43 +0000

    Merge branch 'update_uk3' into 'release/1.0.32'

    Update Ukrainian translation

    See merge request sane-project/backends!589

commit 51a7abd1fb940c299cbad31c6da57217e5b8ef57
Author: Yuri Chornoivan <yurchor@ukr.net>
Date:   2021-02-08 15:33:42 +0200

    Update Ukrainian translation

commit a21f4713da86f355941307c91d03cc64c211d045
Merge: 5db03a059 ae2c40684
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2021-02-08 13:15:43 +0000

    Merge branch 'sync-po-files-with-source' into 'release/1.0.32'

    I18N: Sync po/*.po files with sources slated for next release

    See merge request sane-project/backends!588

commit ae2c4068428a9345670b0b9902555a00bc868555
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2021-02-08 21:58:34 +0900

    I18N: Sync po/*.po files with sources slated for next release

commit 5db03a05935f06fe31035a08ff6cc81007d83efe
Merge: 335edb9ed a83126fc2
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2021-02-07 12:25:51 +0000

    Merge branch '124-configure-disable-shared-errors-out-linking-scanimage' into 'release/1.0.32'

    Resolve "./configure --disable-shared errors out linking scanimage"

    See merge request sane-project/backends!586

commit a83126fc2373e838cae4a7cc41b5ad572fcc877d
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2021-02-07 21:06:38 +0900

    Work around missing C++ symbols for static linking scenarios

commit fe7b1a8f2d9e1d63ccd685263fb7a7bcf4dd642d
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2021-02-07 19:33:11 +0900

    Add missing backend dependencies for static linking.  Re #124

commit 4cb49c1f0819c0dffb38e63c28f6cd3dbc12adee
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2021-02-07 19:32:24 +0900

    Disambiguate symbols for static linking scenarios.  Re #124

commit 335edb9ed87f4367f5aed91cb8c95830b3af752d
Merge: 68312608d fea0ccca1
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2021-02-07 07:42:06 +0000

    Merge branch '354-genesys-testsuite-built-even-when-backend-isnt' into 'release/1.0.32'

    Build genesys testsuite only when backend is build

    See merge request sane-project/backends!585

commit fea0ccca1ea879ccdedcfc8feb1de82905a37d98
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2021-02-07 16:25:30 +0900

    Build genesys testsuite only when backend is build.  Re #354

commit 68312608d13adcabea808f2239f52c4183dd493e
Merge: 5ff049699 e86771c21
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2021-02-07 06:23:25 +0000

    Merge branch '248-generated-source-tar-balls-cant-be-built' into 'release/1.0.32'

    Resolve "Generated source tar balls can't be built"

    See merge request sane-project/backends!584

commit e86771c21bb29cc7a082c96f935e2c77c45ad22d
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2021-02-07 15:02:38 +0900

    Fix ignore pattern when comparing sane-desc outputs in testsuite

    The old versions used plain `git describe` output leading to versions
    like 1.0.32-265-g5ff049.  The `git-version-gen` scripts replaces the
    first dash, `-`, with a period, `.`, for the benefit of other version
    comparison tools and strips the `g` to save a byte.  So that leads to
    versions like 1.0.32.265-5ff049.

commit bb463d642a464e11610abcfc1aa9f68b34ecf178
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2021-02-07 14:49:52 +0900

    Make it easy to update the git-version-gen script

commit c28c9843ed12f0fe2697d66c3dad724f68d0e576
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2021-02-07 14:46:47 +0900

    Use git-version-gen to inject a version

    This fixes builds from tarballs without a .git directory.

    Fixes #248

commit 3ca641c0185124d471e4186b77c1411d6aba280c
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2021-02-07 14:44:50 +0900

    autogen.sh: Fix out-of-tree invocation

commit 30eaec1f00f6d5edfec8f7ce79baa6fb5c0541bc
Author: Ralph Little <skelband@gmail.com>
Date:   2021-02-02 12:58:54 -0800

    doc: additional format tweaks to man pages hpljm1005-kodakaio

commit 460898b18ff0657550a06d1bdfba1a4f393441f8
Author: Ralph Little <skelband@gmail.com>
Date:   2021-01-31 23:19:48 -0800

    doc: hp manpages tweaked.

commit 6a51099e9fe313a29a92cc60bd7189e7b67a59cf
Author: Ralph Little <skelband@gmail.com>
Date:   2021-01-31 22:06:39 -0800

    doc: some more consistency changes to format.

commit 79b866619b6292da00d385fdd3c7d182a0634d0f
Author: Ralph Little <skelband@gmail.com>
Date:   2021-01-31 19:44:13 -0800

    doc: corrections for trailing space and a batch of man pages

commit cfa36aa47a7d768d7db694ed5702c70bf8448565
Author: Ralph Little <skelband@gmail.com>
Date:   2021-01-31 17:44:58 -0800

    doc: implemented some reformatting and wording suggestions

    Partly through suggestions from translators but also from canonical
    man page references for consistency and conformity.

    I have also removed some unnecessary wordiness from some of the backend
    supporting lists which contained verbose repetition.

commit 5ff049699846dc59424aaacb76b7eafee0bddf5d
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2021-01-31 19:44:18 +0900

    pixma: Downcase USB product ID

commit 5ae713180a335306398e2e0db0be2d26dd10778b
Merge: 1229b5a3d 7acfdead7
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2021-01-31 08:20:48 +0000

    Merge branch '122-autogen-sh-script-complains-about-obsolete-macros' into 'release/1.0.32'

    Resolve "autogen.sh script complains about obsolete macro"

    See merge request sane-project/backends!582

commit 7acfdead7038ee8f1482f11676dac1e15f1935bb
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2021-01-31 16:51:01 +0900

    Collect patches in one place and distribute them

commit 129b53bbca254914b6b7d716bd63b30d0f3e2f70
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2021-01-31 16:44:49 +0900

    Suppress obsolete macro warnings.  Fixes #122

commit 742989b65807e27bb9d6a1343e949094ddca1649
Author: Ralph Little <skelband@gmail.com>
Date:   2021-01-30 12:25:09 -0800

    man: grammar and formatting for gamma4scanimage.man and sane.man

commit ab945b1a89cb193a28ea2aa50c084c28d1be0ca0
Merge: b90ecabf8 a7a8cb44d
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2021-01-25 11:09:24 +0000

    Merge branch 'ci-bump-alpine-fedora-versions' into 'master'

    CI: Bump alpine fedora versions

    See merge request sane-project/backends!579

commit 1229b5a3d1d5daf626b61da94010505f158db167
Merge: b90ecabf8 7946a14cf
Author: Ralph Little <littlesincanada@yahoo.co.uk>
Date:   2021-01-24 18:36:03 +0000

    Merge branch 'ukGB_translation' into 'release/1.0.32'

    Added en_GB translations.

    See merge request sane-project/backends!578

commit 7946a14cfbae0303562663f5acd756eef7d0c2fb
Author: Ralph Little <skelband@gmail.com>
Date:   2021-01-24 10:04:47 -0800

    po: Added en_GB translations.

    Note: also fixed a minor grammar point in the pixma backend.

commit a7a8cb44d4f1e2f31fc09825fed846ba31a2b195
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2021-01-24 21:22:34 +0900

    CI: Bump Fedora from 32 to 33

commit 8462b2d75ae83a6930eccfe014fded249572a774
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2021-01-24 21:22:07 +0900

    CI: Bump Alpine from 3.12 to 3.13

commit b90ecabf8c62e92bec8284559dee2bf0dd11158b
Merge: 63d938de6 a05708280
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2021-01-24 11:42:36 +0000

    Merge branch 'update_uk1' into 'master'

    Update Ukrainian translation

    See merge request sane-project/backends!576

commit 63d938de61c3be99dbc9474f48740ccbb143ea80
Merge: 420e09214 1042a61c3
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2021-01-24 08:24:47 +0000

    Merge branch 'fix-udev-rules' into 'master'

    Trigger udev rules parsing on all kernel events except of "remove".

    See merge request sane-project/backends!541

commit 420e09214a5833f0040881d3e2036ff03cea1f5b
Merge: c3a29fb98 6f9044264
Author: Ordissimo <thierry@ordissimo.com>
Date:   2021-01-24 07:17:36 +0000

    Merge branch 'escl-fix-sleep-mode' into 'master'

    Fix sleep mode

    See merge request sane-project/backends!577

commit 6f9044264179dc8f2503cd4e73a1f7eff82543c8
Author: Ordissimo <thierry@ordissimo.com>
Date:   2021-01-24 07:17:36 +0000

    Fix sleep mode

commit c3a29fb9843ccbf479b8127fff4ce8a1c568cf20
Merge: fc74de7c5 7ddbefd10
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2021-01-24 06:24:53 +0000

    Merge branch 'readme1' into 'master'

    Add Ubuntu pre-built section to README

    See merge request sane-project/backends!518

commit a0570828010e061fda2bae0fab4a569ead47fee3
Author: Yuri Chornoivan <yurchor@ukr.net>
Date:   2021-01-18 13:36:37 +0200

    Update Ukrainian translation

commit fc74de7c5ec6043542b028e6a0f39ec8c01358e3
Merge: ece6d7d5e 9dd8319a0
Author: Ordissimo <thierry@ordissimo.com>
Date:   2021-01-17 16:52:58 +0000

    Merge branch 'escl-complete-hack-scanjob-request' into 'master'

    Use MakeAndModel to apply the hack to the device

    See merge request sane-project/backends!575

commit 9dd8319a01923feabfbbe0cb97965fce19f2b75f
Author: Thierry HUCHARD <thierry@ordissimo.com>
Date:   2021-01-17 17:23:56 +0100

    Utilise MakeAndModel pour le device au hack.

commit ece6d7d5e7212e8d8d59175be9c1e49a5f324c3c
Merge: 7b602c1d6 af445c2e9
Author: Ordissimo <thierry@ordissimo.com>
Date:   2021-01-16 22:27:14 +0000

    Merge branch 'escl-hack-scanjob-request' into 'master'

    Escl hack scanjob request

    See merge request sane-project/backends!574

commit af445c2e9c78adbfe33551f5262b4ddcd24981c2
Author: Ordissimo <thierry@ordissimo.com>
Date:   2021-01-16 22:11:36 +0000

    Fix syntax in escl.conf.in

commit 4b6418476e1aa675af0e55fa25a2127a1f5d8aa7
Author: Thierry HUCHARD <thierry@ordissimo.com>
Date:   2021-01-16 23:01:31 +0100

    Allows to activate the hack from the configuration file, only the first form supports it.

commit cb8b6d2ace5316ad6379018358e788590f3fef4f
Author: Thierry HUCHARD <thierry@ordissimo.com>
Date:   2021-01-16 09:06:01 +0100

    Fixed variable initialization.

commit b24907c8a9f8bdfecaeb33175653a49f7a0f650a
Author: Thierry HUCHARD <thierry@ordissimo.com>
Date:   2021-01-16 09:03:14 +0100

    Fix scanjob for LaserJet FlowMFP M578 and LaserJet MFP M630.

commit 7b602c1d6b12ab48ce0dea5095f2359fa051c0f2
Merge: c26e9acd7 957a4fcb8
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2021-01-16 06:30:56 +0000

    Merge branch 'sync-utsushi-desc-with-upstream' into 'master'

    utsushi.desc: Sync with upstream

    See merge request sane-project/backends!573

commit 957a4fcb8f1a374c54c8061f2fe5b74807328431
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2021-01-16 15:14:22 +0900

    utsushi.desc: Sync with upstream

commit c26e9acd79ee7072c9803ced5107eb5e3424e6cc
Merge: d46fbd9d7 891ccac3b
Author: Ordissimo <thierry@ordissimo.com>
Date:   2021-01-15 15:16:45 +0000

    Merge branch 'escl-fix-alloc' into 'master'

    escl: fix char_to_array memory allocation calculations

    Closes #425

    See merge request sane-project/backends!571

commit 891ccac3b62b2677623696b8dbdf03a27611bf1b
Author: Timo Teräs <timo.teras@iki.fi>
Date:   2021-01-15 16:45:12 +0200

    escl: fix char_to_array memory allocation calculations

    Too little memory allocated due to incorrect calculation.

    Fixes #425

commit d46fbd9d794cd7acefba2f491582319a6c4750cd
Merge: b0655dc03 0293e662c
Author: Ordissimo <thierry@ordissimo.com>
Date:   2021-01-14 12:46:22 +0000

    Merge branch 'escl-check-poppler-glib' into 'master'

    Fix check poppler-glib, (see issue #422).

    See merge request sane-project/backends!570

commit 0293e662cff93fcd6da8c0ce41f77a47a4f4a0f1
Author: thierry1970 <thierry@ordissimo.com>
Date:   2021-01-14 13:20:17 +0100

    Fix check poppler-glib, (see issue #422).

commit b0655dc03e67de902bf98850b4460b188503c186
Author: Gerhard Jaeger <gerhard@gjaeger.de>
Date:   2021-01-07 12:34:34 +0100

    Fix issue with '--enable-locking': Do not require sub-directory for locking.

commit f0f7e43d7fb06ee4e1587ec3b84852bd4dcce957
Merge: adbfcd169 fefc6f181
Author: Ordissimo <thierry@ordissimo.com>
Date:   2021-01-04 19:07:25 +0000

    Merge branch 'escl-fix-orders' into 'master'

    The order of the parameters does not change the result.

    See merge request sane-project/backends!568

commit fefc6f1818a286a23217420a74c29ad2da825496
Author: Thierry HUCHARD <thierry@ordissimo.com>
Date:   2021-01-04 19:47:08 +0100

    The order of the parameters does not change the result.

commit adbfcd16960ca535c6426005f632076d2feddcdb
Merge: 2e41482e0 17023afb9
Author: Ordissimo <thierry@ordissimo.com>
Date:   2021-01-04 18:40:43 +0000

    Merge branch 'escl-devices-list-properties' into 'master'

    Adds to the list of detected devices the different supported trays

    See merge request sane-project/backends!564

commit 2e41482e0142b63ce998ab9401f2ce826eab5d3c
Merge: 0c2fa6bea 445b5bd7e
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2021-01-01 07:19:07 +0000

    Merge branch '409-autoconf-2.70-causes-resulting-configure-file-to-fail' into 'master'

    Drop use of obsoleted autoconf AC_HEADER_STDC macro.  Fixes #409

    Closes #409

    See merge request sane-project/backends!566

commit 445b5bd7e19245c08de6a0e669dd9211d2597bfa
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2021-01-01 15:53:11 +0900

    Drop use of obsoleted autoconf AC_HEADER_STDC macro.  Fixes #409

    Use of the STDC_HEADER pre-processor macro that the autoconf macro
    used to define has been removed.  Conditionalized code is now used
    unconditionally.  This should be fine as the macro checks for ANSI
    C, i.e. C89 (ISO C90), compliant headers.  We already require C99.

commit 17023afb99fbbcbff73b7e534c1ee3ea147331f0
Author: Thierry HUCHARD <thierry@ordissimo.com>
Date:   2020-12-29 11:33:55 +0100

    Get device informations with avahi.

commit 0c2fa6bea6ef07c5e2909b5c404db37361b15e4a
Merge: 422425d74 b4be10c5a
Author: Povilas Kanapickas <povilas@radix.lt>
Date:   2020-12-26 22:19:45 +0000

    Merge branch 'fix_crash' into 'master'

    Fix crash in scanimage when must_buffer is true

    Closes #408

    See merge request sane-project/backends!563

commit b4be10c5a2d8fe4105ee476b40cf636a24d79444
Author: James Ring <sjr@jdns.org>
Date:   2020-12-26 13:55:54 -0800

    Fix crash in scanimage when must_buffer is true

    Fixes https://gitlab.com/sane-project/backends/-/issues/408.

commit 422425d740ea1abfc3cec7a8bb1c53c7623ddc62
Merge: 5af7850ba ea50fb683
Author: Povilas Kanapickas <povilas@radix.lt>
Date:   2020-12-26 17:26:42 +0000

    Merge branch 'port' into 'master'

    allow saned to listen on specified port, or an ephemeral port

    See merge request sane-project/backends!549

commit ea50fb683c1b8bbf904d51cad6766b1dfae84ae9
Author: James Ring <sjr@jdns.org>
Date:   2020-12-05 09:16:18 -0800

    allow saned to listen on specified port, or an ephemeral port

commit 5af7850ba6b6970a8330c15ecface09e8ba81190
Merge: ee7f91397 e9d2cdf67
Author: Povilas Kanapickas <povilas@radix.lt>
Date:   2020-12-26 14:16:19 +0000

    Merge branch 'sanei-usb-configure-record-open-clear' into 'master'

    sanei_usb: Allow backends to specify when USB recording is cleared

    See merge request sane-project/backends!392

commit e9d2cdf67bb4dd8b7cd6b5df06d6e724d708d0a9
Author: Povilas Kanapickas <povilas@radix.lt>
Date:   2020-04-09 00:47:41 +0300

    sanei_usb: Allow backends to modify when USB recording is cleared

commit ee7f913974efb0e08fc1456f0096ff49e3b155b4
Merge: 9c00d111e ffc2bbb1f
Author: Povilas Kanapickas <povilas@radix.lt>
Date:   2020-12-26 13:56:49 +0000

    Merge branch 'pixma-add-models' into 'master'

    Add models

    See merge request sane-project/backends!553

commit 9c00d111e678da3eba892264605174f59614a68d
Merge: e0be6fc89 aa228faa1
Author: Povilas Kanapickas <povilas@radix.lt>
Date:   2020-12-26 13:41:52 +0000

    Merge branch 'fix_leak' into 'master'

    fix small memory leak in scanimage option processing

    See merge request sane-project/backends!551

commit ffc2bbb1ffd617f2f50e6f5d4eba805c289d24a3
Author: Thierry HUCHARD <thierry@ordissimo.com>
Date:   2020-12-15 07:21:21 +0100

    pixma: Add models

commit e0be6fc892013b849ed69e42c3ac7daaa72e15ef
Merge: 1ae3197f0 4d347512e
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2020-12-26 05:17:54 +0000

    Merge branch '395-add-epson-et-2600-support' into 'master'

    Resolve "Epson ET-2600 works with libusb configuration"

    Closes #395

    See merge request sane-project/backends!562

commit 4d347512ebdca44f986753ee6331e0ded9e08647
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2020-12-26 13:44:42 +0900

    epson2.desc: Fix formatting error

commit be8b84105771de6f43b7eae04e4faf89ec3695d8
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2020-12-26 12:04:11 +0900

    utsushi.desc: Sync with upstream

commit 77a3173e9094a79fe743f1dff3b7397531b09c2d
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2020-12-26 12:03:15 +0900

    epson2: Add ET-2600 as supported

    See https://gitlab.com/sane-project/backends/-/issues/395

commit 1ae3197f004f7cb4d3d095452f25892455fe219f
Merge: 87d9a8674 1dbc31632
Author: Ordissimo <thierry@ordissimo.com>
Date:   2020-12-22 15:58:19 +0000

    Merge branch 'escl-fix-messages-and-variable' into 'master'

    Fix messages and variable.

    See merge request sane-project/backends!561

commit 1dbc316327093508a357ed72388732a7e816118e
Author: thierry1970 <thierry@ordissimo.com>
Date:   2020-12-22 16:14:44 +0100

    Fix messages and variable.

commit 87d9a86742ff0efc6c7c43a8290dcd4d64980bbf
Merge: ae06e017f 4aa767327
Author: Ordissimo <thierry@ordissimo.com>
Date:   2020-12-21 20:54:27 +0000

    Merge branch 'escl-fix-documentformat' into 'master'

    Choose the format according to availability and options.

    See merge request sane-project/backends!560

commit 4aa767327d72d3df92f968346b47dfeb46a9e157
Author: Ordissimo <thierry@ordissimo.com>
Date:   2020-12-21 20:17:03 +0000

    Choose the format according to availability and options.

commit ae06e017f4423b02fd7e85e22660e2c7447c847e
Merge: c8e1c9595 c0dae7e8f
Author: Ordissimo <thierry@ordissimo.com>
Date:   2020-12-21 19:42:45 +0000

    Merge branch 'remotes/origin/escl-fix-adv-options' into 'master'

    refactoring options code

    See merge request sane-project/backends!559

commit c0dae7e8f5a8466855dcdf9d6d25bc7a8edac776
Author: thierry1970 <thierry@ordissimo.com>
Date:   2020-12-21 18:16:31 +0100

    refactoring options code

commit c8e1c9595ee5489766d7e411ee1fe6b13c528634
Merge: 6652aa42a e111c4856
Author: Ralph Little <littlesincanada@yahoo.co.uk>
Date:   2020-12-20 03:35:57 +0000

    Merge branch '402-hp-scanjet-5370c-produces-double-height-image-and-cannot-preview' into 'master'

    Resolve "HP Scanjet 5370C produces double height image and cannot preview"

    Closes #402

    See merge request sane-project/backends!558

commit e111c485627b540ec14609f48cf3123ff7290543
Author: Ralph Little <skelband@gmail.com>
Date:   2020-12-19 17:28:36 -0800

    avision: added increment of the line variable in non-interpolated case

commit 15e200a981bf2605e445ec642a070dbd5a7289de
Author: Ralph Little <skelband@gmail.com>
Date:   2020-12-19 17:27:23 -0800

    avision: added some brackets to silence warnings about precedence ambiguity

commit 6652aa42a8bd3ca676d638433099c0e5da6a335e
Merge: a03e0106a a5181be71
Author: Ordissimo <thierry@ordissimo.com>
Date:   2020-12-19 21:22:20 +0000

    Merge branch 'escl-fix-segfault' into 'master'

    Fix a crash when asking for the list of options: scanimage -A

    See merge request sane-project/backends!557

commit a5181be71bee8b0433f7b9916a2801d5eee0f227
Author: Thierry HUCHARD <thierry@ordissimo.com>
Date:   2020-12-19 22:04:30 +0100

    Fix a crash when asking for the list of options: scanimage -A

commit a03e0106a119008410786b75174ad8e6e907fd00
Merge: fc1c5667d 3ad2f011c
Author: Ordissimo <thierry@ordissimo.com>
Date:   2020-12-18 08:16:26 +0000

    Merge branch 'update-external-model-scangearmp2' into 'master'

    Add model version scangearmp2 4.0 and 4.10.

    See merge request sane-project/backends!556

commit 3ad2f011ca9c8162c4c7742d2fbefca17c92ceb5
Author: thierry1970 <thierry@ordissimo.com>
Date:   2020-12-18 08:48:27 +0100

    Add model version scangearmp2 4.0 and 4.10.

commit fc1c5667da48cbc8024f2613a3b343c3335bcc34
Merge: bb84652c3 6ad635234
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2020-12-17 10:57:02 +0000

    Merge branch 'escl-device-crash-without-flatbed' into 'master'

    Escl device crash without flatbed

    See merge request sane-project/backends!554

commit 6ad6352342812305e575fba632f8b83c0cb9c7d1
Author: thierry1970 <thierry@ordissimo.com>
Date:   2020-12-16 13:50:24 +0100

    Add model HP Deskjet 3760.

commit 841680f6108abaa1ebb032137fa5a4850011a8a3
Author: thierry1970 <thierry@ordissimo.com>
Date:   2020-12-16 13:41:31 +0100

    Fix : Fixes the crash of devices that do not have a tray, discovered on the HP Deskjet 3760 device.

commit aa228faa137072ebd69913efbe1dfc3e7706e7fe
Author: James Ring <sjr@jdns.org>
Date:   2020-12-07 14:55:32 -0800

    fix small memory leak in scanimage option processing

commit bb84652c3c345bd8bbd724e1b057392688281b9b
Merge: f1154375f a388c3abc
Author: Povilas Kanapickas <povilas@radix.lt>
Date:   2020-12-07 13:21:30 +0000

    Merge branch 'origin/pixma_bug_fixes' into 'master'

    General pixma backend fixes

    See merge request sane-project/backends!548

commit f1154375f59c12b4a0286e6b847289082255b722
Merge: 7f7a4778b cbf9627fd
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2020-11-30 11:07:40 +0000

    Merge branch 'master' into 'master'

    drop CVS keywords

    See merge request sane-project/backends!547

commit 7f7a4778bee37c88510d8f6b6af4297a54aceeb2
Author: m. allan noah <kitno455@gmail.com>
Date:   2020-11-28 18:48:50 -0500

    canon_dr backend v60

    - add new gray and color interlacing options for DR-C120
    - initial support for DR-C120 and C130
    - enable fine calibration for P-208 (per @sashacmc in !546)

commit cbf9627fd8d20b7b35ee8376ad8cd36f8aa8bb51
Author: Mikolaj Kucharski <mikolaj@kucharski.name>
Date:   2020-11-29 09:19:26 +0000

    final Revision CVS keyword removal

commit 4196d204f108be532ab9ad10d1624f8aaf3d46d6
Author: Mikolaj Kucharski <mikolaj@kucharski.name>
Date:   2020-11-29 09:17:33 +0000

    drop more tricky Revision CVS keyword

commit 7de7c051fa5afbf6765bac91b8df2a5fd2f0aec3
Author: Mikolaj Kucharski <mikolaj@kucharski.name>
Date:   2020-11-29 09:06:48 +0000

    more CVS keywords removed, Log and Revision

commit a388c3abc1584ca80eed435a3063839c4c3b4752
Author: Ralph Little <skelband@gmail.com>
Date:   2020-11-28 19:34:52 -0800

    pixma: avoid structure copy on every read by using cinfo address.

commit 410f954f3b962368d218ac8ad154c97049089797
Author: Ralph Little <skelband@gmail.com>
Date:   2020-11-28 19:29:06 -0800

    pixma: assignment must be inside the loop to be effective.

commit 08eaf1a22e6441ecc446d0a5b34f21c08709a770
Author: Ralph Little <skelband@gmail.com>
Date:   2020-11-28 19:19:26 -0800

    pixma: MX490 series returns JPEG from ADF scans.

commit 65f11315414d44417ae453e940387cd3b869deb0
Author: Mikolaj Kucharski <mikolaj@kucharski.name>
Date:   2020-11-28 10:01:56 +0000

    drop CVS keywords

commit e5bd31c88284881f156bbca3d42384711e89a34d
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2020-11-25 20:05:28 +0900

    utsushi.desc: Sync with upstream

commit 8a8595808de7b43aabe86a4b1d5c514ad8853ef7
Merge: a7f42db90 862ca098a
Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date:   2020-11-23 01:39:29 +0000

    Merge branch 'master' into 'master'

    Fixed Artec AstraSlim SE configuration.

    See merge request sane-project/backends!545

commit 862ca098ae38c31f4a1489203eadc66424bbdb22
Author: RICCIARDI-Adrien <adrien.ricciardi@hotmail.fr>
Date:   2020-11-21 11:58:17 +0100

    Fixed Artec AstraSlim SE configuration.

commit a7f42db900a02955ac030408e460d7b7b79909c0
Merge: eae1e9068 c7dd86c7e
Author: Ordissimo <thierry@ordissimo.com>
Date:   2020-11-08 19:31:12 +0000

    Merge branch 'add-new-modele' into 'master'

    Add model Canon TS-5351

    See merge request sane-project/backends!544

commit c7dd86c7e75853bbd7d3bd6622747795e01d1651
Author: Thierry HUCHARD <thierry@ordissimo.com>
Date:   2020-11-08 20:16:05 +0100

    Add model Canon TS-5351

commit eae1e9068af08f3db20bf56ff38ea53d191c7a6d
Author: Thierry HUCHARD <thierry@ordissimo.com>
Date:   2020-11-08 20:11:50 +0100

    Revert "Add model Canon wqTS-5351."

    This reverts commit 9ec62a4780dd5db444a573c055d2558739e63881.

commit 9ec62a4780dd5db444a573c055d2558739e63881
Author: Thierry HUCHARD <thierry@ordissimo.com>
Date:   2020-11-08 20:02:55 +0100

    Add model Canon wqTS-5351.

commit 7699e1a09873df90185ca65f162812f987a87395
Merge: e4ef0548b d0695c147
Author: Povilas Kanapickas <povilas@radix.lt>
Date:   2020-11-02 22:07:21 +0000

    Merge branch 'pixma-calibrate' into 'master'
[--snip--]
