Bug#1114148: hplip: diff for NMU version 3.22.10+dfsg0-8.2

[Adrian Bunk <bunk@debian.org>]

Control: tags 1114148 + pending

Dear maintainer,

I've prepared an NMU for hplip (versioned as 3.22.10+dfsg0-8.2) and 
uploaded it to DELAYED/15. Please feel free to tell me if I should 
cancel it.

cu
Adrian

diffstat for hplip-3.22.10+dfsg0 hplip-3.22.10+dfsg0

 changelog            |    8 ++++++++
 control              |   34 +++++++++++++++++-----------------
 hplip-doc.doc-base   |    4 ++--
 patches/gcc-15.patch |   15 +++++++++++++++
 patches/series       |    1 +
 5 files changed, 43 insertions(+), 19 deletions(-)

diff -Nru hplip-3.22.10+dfsg0/debian/changelog hplip-3.22.10+dfsg0/debian/changelog
--- hplip-3.22.10+dfsg0/debian/changelog	2025-04-13 16:10:47.000000000 +0300
+++ hplip-3.22.10+dfsg0/debian/changelog	2025-11-18 21:54:48.000000000 +0200
@@ -1,3 +1,11 @@
+hplip (3.22.10+dfsg0-8.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS with GCC 15. (Closes: #1114148)
+  * debian/{control,hplip-doc.doc-base}: Correct the name of the project.
+
+ -- Adrian Bunk <bunk@debian.org>  Tue, 18 Nov 2025 21:54:48 +0200
+
 hplip (3.22.10+dfsg0-8.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru hplip-3.22.10+dfsg0/debian/control hplip-3.22.10+dfsg0/debian/control
--- hplip-3.22.10+dfsg0/debian/control	2025-04-13 16:10:47.000000000 +0300
+++ hplip-3.22.10+dfsg0/debian/control	2025-11-18 21:54:48.000000000 +0200
@@ -68,8 +68,8 @@
  hplip-gui,
  python3-notify2,
  system-config-printer,
-Description: HP Linux Printing and Imaging System (HPLIP)
- The HP Linux Printing and Imaging System provides full support for
+Description: HP Linux Imaging and Printing System (HPLIP)
+ The HP Linux Imaging and Printing System provides full support for
  printing on most HP SFP (single function peripheral) inkjets and many
  LaserJets, and for scanning, sending faxes and for photo-card access on
  most HP MFP (multi-function peripheral) printers.
@@ -111,9 +111,9 @@
  hplip-ppds,
 Replaces:
  hplip-ppds,
-Description: HP Linux Printing and Imaging - HPIJS PPD files
+Description: HP Linux Imaging and Printing - HPIJS PPD files
  This package contains PPD (printer definition) files for the
- printers supported through the HP Linux Printing and Imaging
+ printers supported through the HP Linux Imaging and Printing
  System HPIJS driver.
  .
  These PPDs should work well with the matching versions of HPLIP
@@ -130,13 +130,13 @@
  ${python3:Depends},
 Suggests:
  hplip,
-Description: HP Linux Printing and Imaging - data files
- The HP Linux Printing and Imaging System provides full support for
+Description: HP Linux Imaging and Printing - data files
+ The HP Linux Imaging and Printing System provides full support for
  printing on most HP SFP (single function peripheral) inkjets and many
  LaserJets, and for scanning, sending faxes and for photo-card access on
  most HP MFP (multi-function peripheral) printers.
  .
- This package contains data files for the HP Linux Printing and Imaging
+ This package contains data files for the HP Linux Imaging and Printing
  System.
 
 Package: hplip-doc
@@ -147,8 +147,8 @@
  ${misc:Depends},
 Suggests:
  hplip,
-Description: HP Linux Printing and Imaging - documentation
- The HP Linux Printing and Imaging System provides full support for
+Description: HP Linux Imaging and Printing - documentation
+ The HP Linux Imaging and Printing System provides full support for
  printing on most HP SFP (single function peripheral) inkjets and many
  LaserJets, and for scanning, sending faxes and for photo-card access on
  most HP MFP (multi-function peripheral) printers.
@@ -169,8 +169,8 @@
 Recommends:
  python3-notify2,
  xsane | simple-scan | skanlite,
-Description: HP Linux Printing and Imaging - GUI utilities (Qt-based)
- The HP Linux Printing and Imaging System provides full support for
+Description: HP Linux Imaging and Printing - GUI utilities (Qt-based)
+ The HP Linux Imaging and Printing System provides full support for
  printing on most HP SFP (single function peripheral) inkjets and many
  LaserJets, and for scanning, sending faxes and for photo-card access on
  most HP MFP (multi-function peripheral) printers.
@@ -190,7 +190,7 @@
  ${misc:Depends},
  ${shlibs:Depends},
 Description: HP Multi-Point Transport Driver (hpmud) development libraries
- The HP Linux Printing and Imaging System provides full support for
+ The HP Linux Imaging and Printing System provides full support for
  printing on most HP SFP (single function peripheral) inkjets and many
  LaserJets, and for scanning, sending faxes and for photo-card access on
  most HP MFP (multi-function peripheral) printers.
@@ -219,7 +219,7 @@
 Pre-Depends:
  ${misc:Pre-Depends},
 Description: HP Multi-Point Transport Driver (hpmud) run-time libraries
- The HP Linux Printing and Imaging System provides full support for
+ The HP Linux Imaging and Printing System provides full support for
  printing on most HP SFP (single function peripheral) inkjets and many
  LaserJets, and for scanning, sending faxes and for photo-card access on
  most HP MFP (multi-function peripheral) printers.
@@ -252,7 +252,7 @@
 Replaces:
  hplip (<< 3.17.10+repack0-5~),
 Description: HP SANE backend for multi-function peripherals
- The HP Linux Printing and Imaging System provides full support for
+ The HP Linux Imaging and Printing System provides full support for
  printing on most HP SFP (single function peripheral) inkjets and many
  LaserJets, and for scanning, sending faxes and for photo-card access on
  most HP MFP (multi-function peripheral) printers.
@@ -276,7 +276,7 @@
 Suggests:
  hplip (= ${binary:Version}),
  hplip-doc,
-Description: HP Linux Printing and Imaging - CUPS Raster driver (hpcups)
+Description: HP Linux Imaging and Printing - CUPS Raster driver (hpcups)
  This package contains a CUPS-Raster-based printer driver which adds support
  for most inkjet printers and some LaserJet printers manufactured by HP. It
  does not provide PPDs for the fax functionality of HP's multi-function
@@ -309,7 +309,7 @@
  hpijs-ppds,
  hplip,
  hplip-doc,
-Description: HP Linux Printing and Imaging - printer driver (hpijs)
+Description: HP Linux Imaging and Printing - printer driver (hpijs)
  This package contains an IJS printer driver for Ghostscript, which
  adds support for most inkjet printers and some LaserJet printers
  manufactured by HP.  It is also required for HPLIP fax support.
@@ -344,7 +344,7 @@
 Replaces:
  hplip (<< 3.18.3+dfsg0-1~),
 Description: HP Printers PostScript Descriptions
- The HP Linux Printing and Imaging System provides full support for
+ The HP Linux Imaging and Printing System provides full support for
  printing on most HP SFP (single function peripheral) inkjets and many
  LaserJets, and for scanning, sending faxes and for photo-card access on
  most HP MFP (multi-function peripheral) printers.
diff -Nru hplip-3.22.10+dfsg0/debian/hplip-doc.doc-base hplip-3.22.10+dfsg0/debian/hplip-doc.doc-base
--- hplip-3.22.10+dfsg0/debian/hplip-doc.doc-base	2025-04-13 16:10:47.000000000 +0300
+++ hplip-3.22.10+dfsg0/debian/hplip-doc.doc-base	2025-11-18 21:54:48.000000000 +0200
@@ -1,7 +1,7 @@
 Document: hplip-manual
-Title: HP Linux Printing and Imaging System (HPLIP/HPIJS) Manual
+Title: HP Linux Imaging and Printing System (HPLIP/HPIJS) Manual
 Author: David Suffield
-Abstract: User manual for the HP Linux Printing and Imaging
+Abstract: User manual for the HP Linux Imaging and Printing
  System, with basic usage instructions and a list of products
  supported.  Includes the manual for the HPIJS IJS driver.
 Section: System/Administration
diff -Nru hplip-3.22.10+dfsg0/debian/patches/gcc-15.patch hplip-3.22.10+dfsg0/debian/patches/gcc-15.patch
--- hplip-3.22.10+dfsg0/debian/patches/gcc-15.patch	1970-01-01 02:00:00.000000000 +0200
+++ hplip-3.22.10+dfsg0/debian/patches/gcc-15.patch	2025-11-18 21:54:48.000000000 +0200
@@ -0,0 +1,15 @@
+Description: Fix FTBFS with GCC 15
+Author: Adrian Bunk <bunk@debian.org>
+Bug-Debian: https://bugs.debian.org/1114148
+
+--- hplip-3.22.10+dfsg0.orig/scan/sane/ledmi.h
++++ hplip-3.22.10+dfsg0/scan/sane/ledmi.h
+@@ -162,7 +162,7 @@ struct ledm_session
+ int bb_open(struct ledm_session*);
+ int bb_close(struct ledm_session*);
+ int bb_get_parameters(struct ledm_session*, SANE_Parameters*, int);
+-int bb_is_paper_in_adf();         /* 0 = no paper in adf, 1 = paper in adf, -1 = error */
++int bb_is_paper_in_adf(struct ledm_session*);         /* 0 = no paper in adf, 1 = paper in adf, -1 = error */
+ SANE_Status bb_start_scan(struct ledm_session*);
+ int bb_get_image_data(struct ledm_session*, int); 
+ int bb_end_page(struct ledm_session*, int);
diff -Nru hplip-3.22.10+dfsg0/debian/patches/series hplip-3.22.10+dfsg0/debian/patches/series
--- hplip-3.22.10+dfsg0/debian/patches/series	2025-04-13 16:10:47.000000000 +0300
+++ hplip-3.22.10+dfsg0/debian/patches/series	2025-11-18 21:54:48.000000000 +0200
@@ -87,3 +87,4 @@
 0087-Use-read_file-instead-of-readfp-for-python-3.12.patch
 0088-remove-hash-symbol-from-ppd-files.patch
 0089-Makefile.am-Install-D-Bus-policy-in-usr-not-etc.patch
+gcc-15.patch