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

Patch-Name: 01_rss.patch

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

 some missing charsign

Patch-Name: 14_charsign_fixes.patch

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

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

LP: #213984

Patch-Name: hp_photosmart_pro_b9100_support.patch

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

Patch-Name: pjl-duplex-binding.patch

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
Patch-Name: simple-scan-as-default.patch

scan/sane/marvell.c | 10 7 + 3 - 0 !
scan/sane/soap.c | 9 6 + 3 - 0 !
scan/sane/soapht.c | 9 6 + 3 - 0 !
3 files changed, 19 insertions(+), 9 deletions(-)

 try libhpmud.so.0 after libhpmud.so

Closes: #600670
Patch-Name: try_libhpmud.so.0.patch

prnt/drv/hpijs.drv.in | 20 10 + 10 - 0 !
prnt/drv/hpijs.drv.in.template | 20 10 + 10 - 0 !
2 files changed, 20 insertions(+), 20 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
Patch-Name: add-lidil-two-cartridge-modes.patch

fax/backend/hpfax.py | 5 4 + 1 - 0 !
1 file changed, 4 insertions(+), 1 deletion(-)

 the hpfax cups backend uses its function bug() (which in turnuses
 log()) before log() gets imported (with base.g). Made use of log() in bug()
 optional

LP: #560849
Patch-Name: hpfax-bug-function-used-before-importing-log.patch

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.

Patch-Name: hp-systray-make-menu-title-visible-in-sni-qt-indicator.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
Patch-Name: hp-systray-make-menu-appear-in-sni-qt-indicator-with-kde.patch

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

Patch-Name: musb-c-do-not-crash-on-usb-failure.patch

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)

Patch-Name: pcardext-python3-workaround-upstream.patch

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

Patch-Name: hpscan-deskjet-3520-aio-allow-non-jpeg-scanning.patch

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
Patch-Name: hp-plugin-download-fix.patch

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

Patch-Name: order-page-sizes-consistently.patch

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.

Patch-Name: ui-patch-upstream-like.patch

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