1532520fa1
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
2021-02-12 09:52:08 +00:00
4c8ac5e0a6
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 .
2021-02-12 18:34:45 +09:00
e79adde8b2
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 .
2021-02-12 17:41:38 +09:00
b1a2b5fdb6
Merge branch '438-hp-scanjet-3400c-incorrect-maximum-scan-area' into 'master'
...
Resolve "HP ScanJet 3400C incorrect maximum scan area"
Closes #438
See merge request sane-project/backends!590
2021-02-12 03:11:27 +00:00
23a4c86b32
niash: increased the maximum Y extent to 297mm
...
297mm is advertised in the official specs for this machine family.
Tested against the ScanJet 3300C and it doesn't bottom out or anything.
Issue came about because A4 is 297mm in height and 296mm too short.
Probably just a typo or an oversight.
2021-02-11 18:54:24 -08:00
9ec6ec40a9
Merge branch 'update_uk3' into 'release/1.0.32'
...
Update Ukrainian translation
See merge request sane-project/backends!589
2021-02-09 09:14:43 +00:00
51a7abd1fb
Update Ukrainian translation
2021-02-08 15:33:42 +02:00
a21f4713da
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
2021-02-08 13:15:43 +00:00
ae2c406842
I18N: Sync po/*.po files with sources slated for next release
2021-02-08 21:58:34 +09:00
5db03a0593
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
2021-02-07 12:25:51 +00:00
a83126fc23
Work around missing C++ symbols for static linking scenarios
2021-02-07 21:06:38 +09:00
fe7b1a8f2d
Add missing backend dependencies for static linking. Re #124
2021-02-07 21:00:51 +09:00
4cb49c1f08
Disambiguate symbols for static linking scenarios. Re #124
2021-02-07 19:32:24 +09:00
335edb9ed8
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
2021-02-07 07:42:06 +00:00
fea0ccca1e
Build genesys testsuite only when backend is build. Re #354
2021-02-07 16:25:30 +09:00
68312608d1
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
2021-02-07 06:23:25 +00:00
e86771c21b
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.
2021-02-07 15:02:38 +09:00
bb463d642a
Make it easy to update the git-version-gen script
2021-02-07 14:49:52 +09:00
c28c9843ed
Use git-version-gen to inject a version
...
This fixes builds from tarballs without a .git directory.
Fixes #248
2021-02-07 14:46:47 +09:00
3ca641c018
autogen.sh: Fix out-of-tree invocation
2021-02-07 14:44:50 +09:00
30eaec1f00
doc: additional format tweaks to man pages hpljm1005-kodakaio
2021-02-02 12:58:54 -08:00
460898b18f
doc: hp manpages tweaked.
2021-01-31 23:19:48 -08:00
6a51099e9f
doc: some more consistency changes to format.
2021-01-31 22:06:39 -08:00
79b866619b
doc: corrections for trailing space and a batch of man pages
2021-01-31 19:44:13 -08:00
cfa36aa47a
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.
2021-01-31 17:44:58 -08:00
678495f596
Merge branch 'escl-fix-header-hp' into 'master'
...
Use header to activate hack localhost.
See merge request sane-project/backends!583
2021-01-31 15:18:09 +00:00
5ff0496998
pixma: Downcase USB product ID
2021-01-31 19:44:18 +09:00
5ae713180a
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
2021-01-31 08:20:48 +00:00
7acfdead70
Collect patches in one place and distribute them
2021-01-31 16:51:01 +09:00
129b53bbca
Suppress obsolete macro warnings. Fixes #122
2021-01-31 16:44:49 +09:00
742989b658
man: grammar and formatting for gamma4scanimage.man and sane.man
2021-01-30 12:25:09 -08:00
5f2209ffd9
Use header to activate hack localhost.
2021-01-30 20:32:00 +01:00
ab945b1a89
Merge branch 'ci-bump-alpine-fedora-versions' into 'master'
...
CI: Bump alpine fedora versions
See merge request sane-project/backends!579
2021-01-25 11:09:24 +00:00
1229b5a3d1
Merge branch 'ukGB_translation' into 'release/1.0.32'
...
Added en_GB translations.
See merge request sane-project/backends!578
2021-01-24 18:36:03 +00:00
7946a14cfb
po: Added en_GB translations.
...
Note: also fixed a minor grammar point in the pixma backend.
2021-01-24 10:04:47 -08:00
a7a8cb44d4
CI: Bump Fedora from 32 to 33
2021-01-24 21:22:34 +09:00
8462b2d75a
CI: Bump Alpine from 3.12 to 3.13
2021-01-24 21:22:07 +09:00
b90ecabf8c
Merge branch 'update_uk1' into 'master'
...
Update Ukrainian translation
See merge request sane-project/backends!576
2021-01-24 11:42:36 +00:00
63d938de61
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
2021-01-24 08:24:47 +00:00
420e09214a
Merge branch 'escl-fix-sleep-mode' into 'master'
...
Fix sleep mode
See merge request sane-project/backends!577
2021-01-24 07:17:36 +00:00
6f90442641
Fix sleep mode
2021-01-24 07:17:36 +00:00
c3a29fb984
Merge branch 'readme1' into 'master'
...
Add Ubuntu pre-built section to README
See merge request sane-project/backends!518
2021-01-24 06:24:53 +00:00
a057082801
Update Ukrainian translation
2021-01-18 13:36:37 +02:00
fc74de7c5e
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
2021-01-17 16:52:58 +00:00
9dd8319a01
Utilise MakeAndModel pour le device au hack.
2021-01-17 17:23:56 +01:00
ece6d7d5e7
Merge branch 'escl-hack-scanjob-request' into 'master'
...
Escl hack scanjob request
See merge request sane-project/backends!574
2021-01-16 22:27:14 +00:00
af445c2e9c
Fix syntax in escl.conf.in
2021-01-16 22:11:36 +00:00
4b6418476e
Allows to activate the hack from the configuration file, only the first form supports it.
2021-01-16 23:01:31 +01:00
cb8b6d2ace
Fixed variable initialization.
2021-01-16 09:06:01 +01:00
b24907c8a9
Fix scanjob for LaserJet FlowMFP M578 and LaserJet MFP M630.
2021-01-16 09:03:14 +01:00
Olaf Meeuwissen