data/models/models.dat | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 models.dat: fix scanning with m281fdw laserjet

Error was: Failed: Error during device I/O

data/models/models.dat | 77 77 + 0 - 0 !
1 file changed, 77 insertions(+)

 models.dat: correct entry for the hp photosmart pro b9100

LP: #213984

Makefile.in | 4 4 + 0 - 0 !
cups_drv.inc | 2 2 + 0 - 0 !
data/models/models.dat | 477 468 + 9 - 0 !
prnt/drv/hpcups.drv.in | 16 16 + 0 - 0 !
4 files changed, 490 insertions(+), 9 deletions(-)

 models.dat: re-add drivers missing from 3.19.1

several printers were removed in 3.19.1, but actually someone still uses them
reported upstream https://bugs.launchpad.net/hplip/+bug/1843592
bugzillas 1742949, 1740132, 1739855

data/models/models.dat | 68 34 + 34 - 0 !
1 file changed, 34 insertions(+), 34 deletions(-)

 models.dat: 3.20.6+ regression: take 3.20.5's "plugin=1" for all
 models with 1 in least significant bit of plugin-reason (="needs plugin for
 printing")

Makefile.am | 2 1 + 1 - 0 !
prnt/hpcups/Pcl3Gui2.cpp | 17 0 + 17 - 0 !
prnt/hpcups/Pcl3Gui2.h | 1 0 + 1 - 0 !
3 files changed, 1 insertion(+), 19 deletions(-)

 cope with prnt/hpcups/erniefilter.{cpp,h} removal by disabling the
 functionality

prnt/hpijs/breaks_open.cpp | 5 4 + 1 - 0 !
prnt/hpijs/dj660_maps.cpp | 5 4 + 1 - 0 !
prnt/hpijs/dj690_maps.cpp | 5 4 + 1 - 0 !
prnt/hpijs/dj895_maps.cpp | 5 4 + 1 - 0 !
prnt/hpijs/dj895_maps2.cpp | 5 4 + 1 - 0 !
prnt/hpijs/dj970_maps.cpp | 6 5 + 1 - 0 !
prnt/hpijs/dj970_maps3.cpp | 3 2 + 1 - 0 !
7 files changed, 27 insertions(+), 7 deletions(-)

 blank-ink-only patch by richard spencer-smith

scan/sane/scl.c | 5 3 + 2 - 0 !
1 file changed, 3 insertions(+), 2 deletions(-)

 fix missing charsign

prnt/hpijs/ljcolor.cpp | 13 13 + 0 - 0 !
prnt/hpijs/ljjetready.cpp | 11 11 + 0 - 0 !
prnt/hpijs/ljmono.cpp | 13 13 + 0 - 0 !
3 files changed, 37 insertions(+)

 fixed short-edge duplex for non-ps laser printers

LP: #244295

base/utils.py | 17 10 + 7 - 0 !
ui5/ui_utils.py | 2 1 + 1 - 0 !
2 files changed, 11 insertions(+), 8 deletions(-)

 make simple-scan the default scanning frontend

LP: #539015

scan/sane/marvell.c | 2 1 + 1 - 0 !
scan/sane/soap.c | 2 1 + 1 - 0 !
scan/sane/soapht.c | 2 1 + 1 - 0 !
3 files changed, 3 insertions(+), 3 deletions(-)

 try libhpmud.so.0 directly

It's the library we ship.

Closes: #600670

prnt/drv/hpijs.drv.in.template | 20 10 + 10 - 0 !
1 file changed, 10 insertions(+), 10 deletions(-)

 for the lidil printers,
 enable two-cartridge modes (black and color cartridge) in the hpcups driver
 and assign the choices of the "Printout Mode" option to two-cartridge modes
 in the hpijs driver

LP: #235399

fax/backend/hpfax.py | 5 4 + 1 - 0 !
prnt/filters/hpps | 10 8 + 2 - 0 !
2 files changed, 12 insertions(+), 3 deletions(-)

 treat logging before importing of logger module

LP: #560849

ui5/systemtray.py | 25 4 + 21 - 0 !
1 file changed, 4 insertions(+), 21 deletions(-)

 simplified the construction of the title line of the hp-systray
 applet menu,
 so that the applet-to-indicator converter sni-qt also imports this title
 line (at least the text of it).

Thanks to Aurelien Gateau for this patch.

ui5/systemtray.py | 3 3 + 0 - 0 !
1 file changed, 3 insertions(+)

 make the menu of the hp-systray applet appearing when the applet is
 converted to an indicator applet by sni-qt and put into the notification
 area of KDE

LP: #857929

scan/sane/sclpml.c | 21 9 + 12 - 0 !
1 file changed, 9 insertions(+), 12 deletions(-)

 fix "duplex descriptor uninitialized"

Closes: #583273

io/hpmud/musb.c | 32 21 + 11 - 0 !
1 file changed, 21 insertions(+), 11 deletions(-)

 make sure that the hplip components which access the usb (especially
 the CUPS backends "hp" and "hpfax") do not crash when libusb fails to
 connect to the USB,
 for example on machines without USB or with the USB kernel modules not
 loaded

LP: #1302437

pcard/pcardext/pcardext.c | 59 47 + 12 - 0 !
pcard/photocard.py | 2 1 + 1 - 0 !
unload.py | 5 5 + 0 - 0 !
3 files changed, 53 insertions(+), 13 deletions(-)

 workaround patch for missing python3 transition of the old
 (pre-USB-storage) photo memory card support (pcardext) as this part builds
 in Python3 environments but with pointer-related warnings which are fatal
 errors for Ubuntu's build servers. The patch silences the warnings but the
 memory card support is dropped in Python3 environments. This patch is
 supplied by the HPLIP upstream developers and will be replaced by a more
 proper solution in the next upstream release of HPLIP (see LP: #1275353)

scan/sane/bb_ledm.c | 47 41 + 6 - 0 !
scan/sane/ledm.c | 12 7 + 5 - 0 !
2 files changed, 48 insertions(+), 11 deletions(-)

 allow non-jpeg scanning on the hp deskjet 3520 all-in-one and
 similar devices

LP: #1245578

base/pkit.py | 9 6 + 3 - 0 !
1 file changed, 6 insertions(+), 3 deletions(-)

 fix download and installation of hp's proprietary plug-in in python3
 environments

LP: #1422004

scan.py | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 in hp-scan's manpage, sort page_sizes in help,
 for the manpage to be reproducibly created

Makefile.am | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 install check-plugin.py as a script

The installer installs check-plugin.py as hp-check-plugin, do the same from the Makefile.

prnt/ps/hp-laserjet_4000_series-ps.ppd | 11 11 + 0 - 0 !
1 file changed, 11 insertions(+)

 laserjet postscript 4000 ppd bugfix

The PostScript PPD for the HP LaserJet 4000 is buggy, and prevent printing complex documents.
The 4000 and 4050 are pretty much the same printer. The fix was to extract the missing snipset from the PPD for the 4050 and put it in the PPD for the 4000.

ui5/devmgr5_base.ui | 31 0 + 31 - 0 !
ui5/wifisetupdialog_base.ui | 2 1 + 1 - 0 !
2 files changed, 1 insertion(+), 32 deletions(-)

 patch ui files to match upstream produced .py code

The update tab was manually patched out in the generated code, and the label_2 was renamed in the code.

configure.in | 2 1 + 1 - 0 !
prnt/hpcups/HPCupsFilter.h | 2 2 + 0 - 0 !
prnt/hpijs/hpcupsfax.cpp | 1 1 + 0 - 0 !
3 files changed, 4 insertions(+), 1 deletion(-)

 add 'include <cups/ppd.h>' in various places as cups 2.2 moved some
 definitions to ppd.h

scan.py | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 fix list wrapping in scan.py to fix generated manpage

base/sixext.py | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 fix handling of unicode filenames in sixext.py

LP: #1480152
Closes: #861731

Makefile.am | 4 3 + 1 - 0 !
1 file changed, 3 insertions(+), 1 deletion(-)

 make dat2drv and locateppd build dependent of class driver enabling;
 copes with its source code removal from source

Makefile.am | 19 2 + 17 - 0 !
1 file changed, 2 insertions(+), 17 deletions(-)

 remove imageprocessor binary installs

ui/devmgr4.py | 16 8 + 8 - 0 !
ui/faxaddrbookform.py | 6 3 + 3 - 0 !
ui/faxsendjobform.py | 6 3 + 3 - 0 !
ui/firmwaredialog.py | 2 1 + 1 - 0 !
ui/makecopiesform.py | 4 2 + 2 - 0 !
ui/nodevicesform.py | 2 1 + 1 - 0 !
ui/pluginform2.py | 4 2 + 2 - 0 !
ui/printerform.py | 2 1 + 1 - 0 !
ui/settingsdialog.py | 4 2 + 2 - 0 !
ui/setupform.py | 10 5 + 5 - 0 !
ui/unloadform.py | 2 1 + 1 - 0 !
ui/upgradeform.py | 4 2 + 2 - 0 !
ui5/devmgr5.py | 6 2 + 4 - 0 !
ui5/fabwindow.py | 2 1 + 1 - 0 !
ui5/nodevicesdialog.py | 3 1 + 2 - 0 !
ui5/plugindialog.py | 2 1 + 1 - 0 !
ui5/queuesconf.py | 2 1 + 1 - 0 !
ui5/setupdialog.py | 6 3 + 3 - 0 !
18 files changed, 40 insertions(+), 43 deletions(-)

 call qmessagebox constructors of pyqt5 with the correct parameters

The whole Python source code of HPLIP contains 40 incorrect calls of
the QMessageBox constructurs, mostly the list of buttons was given as
separate arguments instead of a bitwise OR of each button's
representation value.  If the flow of the code hits one of these
calls (usually when some error or warnings message should be
displayed or an "Are you sure?" question asked) the GUI app crashes.
See https://pythonspot.com/pyqt5-messagebox/ for QMessageBox
documentation.
This patch corrects all these calls.

Bug-Debian: https://bugs.debian.org/912768
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1745383

ui5/devmgr5.py | 8 4 + 4 - 0 !
1 file changed, 4 insertions(+), 4 deletions(-)

 fixed incomplete removal of hp-toolbox features,
 which caused the hp-toolbox not to start

Looking into the ui5/devmgr5.py of the HPLIP Python source code it
seems that some features got removed by commenting them out, but this
removal seems not to have been completed, making non-existing objects
being called during the start of hp-toolbox and so it crashes right
away.

This patch completes the commenting-out and so makes hp-toolbox start
up and work again.

Bug-Debian: https://bugs.debian.org/912768
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1789184

check.py | 8 4 + 4 - 0 !
1 file changed, 4 insertions(+), 4 deletions(-)

 hp-check: fix core.distro vs. core.distro_name mixups.

core.distro is the index of the distribution and is thus not suitable
for traces and information messages.

Bug-Ubuntu: https://bugs.launchpad.net/bugs/1688684

base/g.py | 6 3 + 3 - 0 !
1 file changed, 3 insertions(+), 3 deletions(-)

 make base.g.xint more generous in what it can take

Fixes hp-doctor in python with version '2.7.15+'

Closes: #912765

Makefile.am | 10 5 + 5 - 0 !
1 file changed, 5 insertions(+), 5 deletions(-)

 fix linking of libhpipp and the *ext python extensions

Closes: #886391

common/utils.c | 4 2 + 2 - 0 !
prnt/backend/hp.c | 2 1 + 1 - 0 !
prnt/hpcups/LJZjStream.cpp | 2 1 + 1 - 0 !
protocol/hp_ipp.c | 4 2 + 2 - 0 !
scan/sane/saneopts.h | 2 1 + 1 - 0 !
5 files changed, 7 insertions(+), 7 deletions(-)

 =?utf-8?q?fix_some_typos_in_bug=c2=a0and_dbg=c2=a0messages?=

installer/dcheck.py | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 fix version pattern check to support ghostscript rc versions

$ gs -v
GPL Ghostscript RELEASE CANDIDATE 2 9.28 (2019-09-05)
Copyright (C) 2019 Artifex Software, Inc.  All rights reserved.

Without the escaped dot, the version will match as "2 9".

base/validation.py | 10 4 + 6 - 0 !
1 file changed, 4 insertions(+), 6 deletions(-)

 don't gpg --import, but rely on installed signing_key.asc

installer/core_install.py | 16 1 + 15 - 0 !
1 file changed, 1 insertion(+), 15 deletions(-)

 shortcut distros.dat finding to point to where it is

base/utils.py | 12 8 + 4 - 0 !
1 file changed, 8 insertions(+), 4 deletions(-)

 =?utf-8?q?accelerate_http=c2=a0check_by_doing_a_head=2c_not_a_get?=

installer/core_install.py | 109 5 + 104 - 0 !
1 file changed, 5 insertions(+), 104 deletions(-)

 enforce debian assumptions:

- The distro version is supported
- Auto installation is not allowed
- Do not allow the installer to install "missing" packages by itself

prnt/drv/hpcups.drv.in.template | 8 0 + 8 - 0 !
prnt/drv/hpijs.drv.in.template | 4 0 + 4 - 0 !
2 files changed, 12 deletions(-)

 removed all page size choices named "custom". they break with cups
 and are also identical with US Legal

See CUPS upstream issue #5639

Made with:
	sed -e '/CustomMedia.*"Custom.*612 1008/,+1d' -i prnt/drv/*drv.in.template

dat2drv.py | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 py3: fix dat2drv.py

fax/filters/pstotiff | 61 16 + 45 - 0 !
1 file changed, 16 insertions(+), 45 deletions(-)

 replace rubbish pstotiff filter

Bug-Ubuntu: #528394

prnt/hpijs/dj3320.cpp | 2 1 + 1 - 0 !
prnt/hpijs/registry.cpp | 14 7 + 7 - 0 !
2 files changed, 8 insertions(+), 8 deletions(-)

 fix strstr const

prnt/drv/hpcups.drv.in | 166 83 + 83 - 0 !
1 file changed, 83 insertions(+), 83 deletions(-)

 added several ieee 1284 device ids

prnt/backend/hp.c | 6 0 + 6 - 0 !
1 file changed, 6 deletions(-)

 retry when connecting to device fails

prnt/drv/hpcups.drv.in | 4 4 + 0 - 0 !
1 file changed, 4 insertions(+)

 mark snmp quirks for two lying devices

prnt/hpijs/hpijs.cpp | 8 6 + 2 - 0 !
1 file changed, 6 insertions(+), 2 deletions(-)

 fix bogus low ink warning from hpijs driver

prnt/hpcups/HPCupsFilter.cpp | 7 7 + 0 - 0 !
1 file changed, 7 insertions(+)

 clear old state reasons

prnt/hpijs/services.cpp | 11 10 + 1 - 0 !
1 file changed, 10 insertions(+), 1 deletion(-)

 avoid busy loop in hpcups when backend has exited

prnt/hpcups/HPCupsFilter.cpp | 2 1 + 1 - 0 !
prnt/hpcups/SystemServices.cpp | 2 1 + 1 - 0 !
2 files changed, 2 insertions(+), 2 deletions(-)

 cups filters should use tmpdir when available

prnt/hpijs/dj9xxvip.cpp | 8 4 + 4 - 0 !
1 file changed, 4 insertions(+), 4 deletions(-)

 fixed device id parsing code in hpijs's dj9xxvip.c

prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd | 1 1 + 0 - 0 !
1 file changed, 1 insertion(+)

 ieee1284 device id for hp laserjet 4000

prnt/ps/hp-laserjet_8150_mfp-ps.ppd | 40 20 + 20 - 0 !
prnt/ps/hp-laserjet_9000_mfp-ps.ppd | 30 15 + 15 - 0 !
prnt/ps/hp-laserjet_9000_series-ps.ppd | 30 15 + 15 - 0 !
3 files changed, 50 insertions(+), 50 deletions(-)

 fix imageablearea for laserjet 8150/9000

base/avahi.py | 7 6 + 1 - 0 !
1 file changed, 6 insertions(+), 1 deletion(-)

 fix parsing of avahi-daemon output

prnt/drv/hpcups.drv.in | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 fixed left/right margins for hp deskjet 990c

prnt/hpcups/HPCupsFilter.cpp | 7 4 + 3 - 0 !
prnt/hpijs/hpijs.cpp | 2 1 + 1 - 0 !
prnt/hpijs/hpijsfax.cpp | 2 1 + 1 - 0 !
3 files changed, 6 insertions(+), 5 deletions(-)

 fixed uses of strncpy throughout

base/logger.py | 2 2 + 0 - 0 !
1 file changed, 2 insertions(+)

 ignore ioerror when logging output

scan.py | 1 1 + 0 - 0 !
1 file changed, 1 insertion(+)

 exit if source cannot be fetched from device

installer/core_install.py | 6 3 + 3 - 0 !
1 file changed, 3 insertions(+), 3 deletions(-)

 hp-check shows 'cups incompatible or not running' even if cups is
 running

firmware.py | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 hp-firmware:nameerror: name 'interactive_mode4' is not defined