iQGzBAABCgAdFiEEe+WPIRpjNw1/GSB7i8+nHsoWNFUFAlt8PMEACgkQi8+nHsoW

 NFUc3Qv/S7VZ5WS87ZaCrzk3qa7MBVjG+Ty1IcMgxih5dXk4+f3NFCuw4vAeHkwJ
 31Kh8H865ouZ/jgTblywvKMZ9AS9dQxbWKhl6YFOmLkR1Dmeh/D64MOAT4zxGt5u
 MAGoIF7QcjlGqBNQnAaVjjlO5atlqIAFEX1ZPl0XnOp/wQRMZQBAhqrWmRir7Wna
 qg35HJUhj0UfooWoxjJ6C5dMkiQWf1W7KJ75bImZNbR81gRTztiHOGtek1tX+Jpt
 kDWZiMT3QNsG/CLeiGpj+DAcSzRKOcpS21HRU7tUK0fSKeAVbh4OrIbcTB5InURX
 XeV9N5I9WR+fcjlfAGgyCpPJS/OLDG0L+Wk3JgNZkSf/9kC6pGzjr+BFuYn6qLwA
 a54B0Gn/wJcwoyNNq/zgCF7AHoxxzg9k3WVSm8z2G4NIPpey6/Rst0iHOT4POWrq
 uNHEF11KxzImU/NLfwlvwk0/I3249el14CdNrQDAdzrzD405bf1L+oYgKx4PTerF
 Dkx2GWWU
 =lV7s
 -----END PGP SIGNATURE-----

Merge upstream-repacked 3.18.7+dfsg1 version, add ImageProcessor removal patch

31 files changed, 144 insertions, 60 deletions

diff --git a/Makefile.am b/Makefile.am
index 7eb645149..cc7e89611 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -164,7 +164,7 @@ if !HPLIP_CLASS_DRIVER
 dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py
 endif #HPLIP_CLASS_DRIVER
 
-dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template prnt/hpcups/libImageProcessor-x86_64.so prnt/hpcups/libImageProcessor-x86_32.so
+dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template
 dist_noinst_SCRIPTS += dat2drv.py install.py  hplip-install init-suse-firewall init-iptables-firewall class_rpm_build.sh hplipclassdriver.spec createPPD.sh Makefile_dat2drv hpijs-drv
 
 if !HPLIP_CLASS_DRIVER
@@ -588,7 +588,7 @@ hpcups_SOURCES = prnt/hpcups/HPCupsFilter.cpp prnt/hpcups/HPCupsFilter.h prnt/hp
 	prnt/hpcups/ImageProcessor.h
 
 hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)
-hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lImageProcessor -lcups -lcupsimage -lz $(DBUS_LIBS)
+hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lcups -lcupsimage -lz $(DBUS_LIBS)
 
 #else
 #hpcupsdir = $(cupsfilterdir)
@@ -681,16 +681,6 @@ endif #HPLIP_CLASS_DRIVER
 
 install-data-hook:
 if HPLIP_BUILD
-	if [ \( "$(UNAME)" = "x86_64" -a  -d "$(libdir)/" \) ]; then \
-		cp prnt/hpcups/libImageProcessor-x86_64.so $(libdir)/ ; \
-		chmod 775 $(libdir)/libImageProcessor-x86_64.so ; \
-		ln -sf $(libdir)/libImageProcessor-x86_64.so $(libdir)/libImageProcessor.so ; \
-	fi; \
-	if [ \( \( "$(UNAME)" = "i686" -o "$(UNAME)" = "i386" \) -a -d "$(libdir)/" \) ]; then \
-		cp prnt/hpcups/libImageProcessor-x86_32.so $(libdir)/ ; \
-		chmod 775 $(libdir)/libImageProcessor-x86_32.so ; \
-		ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \
-	fi
 if !HPLIP_CLASS_DRIVER
 #	   If scanner build, add hpaio entry to sane dll.conf.
 	if [ "$(scan_build)" = "yes" ]; then \
diff --git a/debian/.git-dpm b/debian/.git-dpm
index 571ca9428..c0b05c68a 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,7 +1,7 @@
 # see git-dpm(1) from git-dpm package
-f8e31458402190e26e7e8f8f3f6242b396a3eb17
-f8e31458402190e26e7e8f8f3f6242b396a3eb17
-72e137d2b9f2a0827a9dc54693f23ca123cbf713
+b78107ce36b7a8602479222f1ee806566727c8de
+b78107ce36b7a8602479222f1ee806566727c8de
+55056d735733aa13f769096bf1c8881acdf2bbf4
 55056d735733aa13f769096bf1c8881acdf2bbf4
 hplip_3.18.7+dfsg1.orig.tar.xz
 3a7182b6cf11e8c2350a89008f64a66c653e67e6
diff --git a/debian/patches/0021-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch b/debian/patches/0021-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
index 8d7f0b526..903093d1d 100644
--- a/debian/patches/0021-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
+++ b/debian/patches/0021-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
@@ -1,4 +1,4 @@
-From a1d55283d4f20d9749f46abda363527a36be5a1e Mon Sep 17 00:00:00 2001
+From 06aeb855ce2af04185d20242d2b77211e11c6b3d Mon Sep 17 00:00:00 2001
 From: Till Kamppeter <till.kamppeter@canonical.com>
 Date: Sat, 24 Sep 2016 10:37:20 +0200
 Subject: Add 'include <cups/ppd.h>' in various places as CUPS 2.2 moved some
diff --git a/debian/patches/0022-Fix-list-wrapping-in-scan.py-to-fix-generated-manpag.patch b/debian/patches/0022-Fix-list-wrapping-in-scan.py-to-fix-generated-manpag.patch
index eac3f8357..4be3bed09 100644
--- a/debian/patches/0022-Fix-list-wrapping-in-scan.py-to-fix-generated-manpag.patch
+++ b/debian/patches/0022-Fix-list-wrapping-in-scan.py-to-fix-generated-manpag.patch
@@ -1,4 +1,4 @@
-From 40474e81a059b55ca8016f4e82bf7b47ae583b22 Mon Sep 17 00:00:00 2001
+From f21c689d332c6ca6851d7bbe7a4d19b5f4b5b0c0 Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Mon, 3 Oct 2016 11:16:48 +0200
 Subject: Fix list wrapping in scan.py to fix generated manpage
diff --git a/debian/patches/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch b/debian/patches/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch
index 1d4d86b3a..7153f95c2 100644
--- a/debian/patches/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch
+++ b/debian/patches/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch
@@ -1,4 +1,4 @@
-From 9cd24421f3010035ffa4dfcefdc8f031962565f2 Mon Sep 17 00:00:00 2001
+From 6163e9cfbc2140dd6679b542508dfb424ab6ca15 Mon Sep 17 00:00:00 2001
 From: Gaurav Sood <gaurav-sood@invalid-email.launchpad.net>
 Date: Thu, 4 May 2017 18:32:08 +0200
 Subject: Fix handling of unicode filenames in sixext.py
diff --git a/debian/patches/0024-Make-dat2drv-and-locateppd-build-dependent-of-class-.patch b/debian/patches/0024-Make-dat2drv-and-locateppd-build-dependent-of-class-.patch
index 81a1d8000..af9e5deeb 100644
--- a/debian/patches/0024-Make-dat2drv-and-locateppd-build-dependent-of-class-.patch
+++ b/debian/patches/0024-Make-dat2drv-and-locateppd-build-dependent-of-class-.patch
@@ -1,4 +1,4 @@
-From f8e31458402190e26e7e8f8f3f6242b396a3eb17 Mon Sep 17 00:00:00 2001
+From e7aef4ab76080c6cf5ec17c7e884241fc5706aa5 Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Mon, 12 Mar 2018 13:37:19 +0100
 Subject: Make dat2drv and locateppd build dependent of class driver enabling;
diff --git a/debian/patches/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch b/debian/patches/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch
new file mode 100644
index 000000000..5bf433281
--- /dev/null
+++ b/debian/patches/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch
@@ -0,0 +1,114 @@
+From b78107ce36b7a8602479222f1ee806566727c8de Mon Sep 17 00:00:00 2001
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 21 Aug 2018 18:18:10 +0200
+Subject: Remove all ImageProcessor functionality, which is closed-source
+
+---
+ Makefile.am                  | 14 ++------------
+ prnt/hpcups/HPCupsFilter.cpp | 21 ---------------------
+ 2 files changed, 2 insertions(+), 33 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 7eb645149..cc7e89611 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -164,7 +164,7 @@ if !HPLIP_CLASS_DRIVER
+ dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py
+ endif #HPLIP_CLASS_DRIVER
+ 
+-dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template prnt/hpcups/libImageProcessor-x86_64.so prnt/hpcups/libImageProcessor-x86_32.so
++dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template
+ dist_noinst_SCRIPTS += dat2drv.py install.py  hplip-install init-suse-firewall init-iptables-firewall class_rpm_build.sh hplipclassdriver.spec createPPD.sh Makefile_dat2drv hpijs-drv
+ 
+ if !HPLIP_CLASS_DRIVER
+@@ -588,7 +588,7 @@ hpcups_SOURCES = prnt/hpcups/HPCupsFilter.cpp prnt/hpcups/HPCupsFilter.h prnt/hp
+ 	prnt/hpcups/ImageProcessor.h
+ 
+ hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)
+-hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lImageProcessor -lcups -lcupsimage -lz $(DBUS_LIBS)
++hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lcups -lcupsimage -lz $(DBUS_LIBS)
+ 
+ #else
+ #hpcupsdir = $(cupsfilterdir)
+@@ -681,16 +681,6 @@ endif #HPLIP_CLASS_DRIVER
+ 
+ install-data-hook:
+ if HPLIP_BUILD
+-	if [ \( "$(UNAME)" = "x86_64" -a  -d "$(libdir)/" \) ]; then \
+-		cp prnt/hpcups/libImageProcessor-x86_64.so $(libdir)/ ; \
+-		chmod 775 $(libdir)/libImageProcessor-x86_64.so ; \
+-		ln -sf $(libdir)/libImageProcessor-x86_64.so $(libdir)/libImageProcessor.so ; \
+-	fi; \
+-	if [ \( \( "$(UNAME)" = "i686" -o "$(UNAME)" = "i386" \) -a -d "$(libdir)/" \) ]; then \
+-		cp prnt/hpcups/libImageProcessor-x86_32.so $(libdir)/ ; \
+-		chmod 775 $(libdir)/libImageProcessor-x86_32.so ; \
+-		ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \
+-	fi
+ if !HPLIP_CLASS_DRIVER
+ #	   If scanner build, add hpaio entry to sane dll.conf.
+ 	if [ "$(scan_build)" = "yes" ]; then \
+diff --git a/prnt/hpcups/HPCupsFilter.cpp b/prnt/hpcups/HPCupsFilter.cpp
+index 413daa3c5..7c1e8566c 100644
+--- a/prnt/hpcups/HPCupsFilter.cpp
++++ b/prnt/hpcups/HPCupsFilter.cpp
+@@ -31,7 +31,6 @@
+ \*****************************************************************************/
+ 
+ #include "HPCupsFilter.h"
+-#include "ImageProcessor.h"
+ 
+ #include <signal.h>
+ #include <sys/wait.h>
+@@ -637,17 +636,11 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
+ 
+ 
+     sprintf(hpPreProcessedRasterFile, "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name);
+-    image_processor_t* imageProcessor = imageProcessorCreate();
+ 
+     while (cupsRasterReadHeader2(cups_raster, &cups_header))
+     {
+ 	    dbglog("DEBUG: SHIVA inside the while loop");
+ 
+-        IMAGE_PROCESSOR_ERROR result = imageProcessorStartPage(imageProcessor, &cups_header);
+-        if (result != IPE_SUCCESS){
+-            dbglog("DEBUG: imageProcessorStartPage failed result = %d\n", result);
+-        }
+-
+         current_page_number++;
+ 
+         if (current_page_number == 1) {
+@@ -746,12 +739,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
+             color_raster = rgbRaster;
+             black_raster = kRaster;
+ 
+-            result = imageProcessorProcessLine(imageProcessor, m_pPrinterBuffer, cups_header.cupsBytesPerLine);
+-            if (result != IPE_SUCCESS){
+-                dbglog("DEBUG: imageProcessorProcessLine failed result = %d\n", result);
+-            }
+-
+-
+             if ((y == 0) && !is_ljmono) {
+                 //For ljmono, make sure that first line is not a blankRaster line.Otherwise printer
+                 //may not skip blank lines before actual data
+@@ -781,12 +768,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
+             }
+         }  // for() loop end
+ 
+-        result = imageProcessorEndPage(imageProcessor);
+-        if (result != IPE_SUCCESS){
+-                dbglog("DEBUG: imageProcessorEndPage failed result = %d\n", result);
+-        }
+-
+-
+         m_Job.NewPage();
+         if (err != NO_ERROR) {
+             break;
+@@ -801,8 +782,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
+         rgbRaster = NULL;
+     }
+ 
+-    imageProcessorDestroy(imageProcessor);
+-
+     unlink(hpPreProcessedRasterFile);
+     return ret_status;
+ }
diff --git a/debian/patches/01_rss.patch b/debian/patches/01_rss.patch
index ec9d495fc..9d645890e 100644
--- a/debian/patches/01_rss.patch
+++ b/debian/patches/01_rss.patch
@@ -1,4 +1,4 @@
-From f0d3d160872bd9eee5eac88d1c49e9469f88026f Mon Sep 17 00:00:00 2001
+From 9783ff3fd4c7c6594d68d79fe7088f477bed5477 Mon Sep 17 00:00:00 2001
 From: Torsten Landschoff <torsten@pulsar.galaxy>
 Date: Fri, 22 Jul 2016 09:32:51 +0200
 Subject: Blank-ink-only patch by Richard Spencer-Smith
diff --git a/debian/patches/14_charsign_fixes.patch b/debian/patches/14_charsign_fixes.patch
index d4402a2c4..1797cebd7 100644
--- a/debian/patches/14_charsign_fixes.patch
+++ b/debian/patches/14_charsign_fixes.patch
@@ -1,4 +1,4 @@
-From 95279cc667bb574f64e20f7bfe74cdd2c226fdd7 Mon Sep 17 00:00:00 2001
+From 4e94dd81aa651b18d833571062a4ab51c65f25e9 Mon Sep 17 00:00:00 2001
 From: Till Kamppeter <till.kamppeter@gmail.com>
 Date: Fri, 22 Jul 2016 09:32:52 +0200
 Subject: some missing charsign
diff --git a/debian/patches/HP-LaserJet_4000-PostScript-PPD.patch b/debian/patches/HP-LaserJet_4000-PostScript-PPD.patch
index b4a404e7c..6230faf1b 100644
--- a/debian/patches/HP-LaserJet_4000-PostScript-PPD.patch
+++ b/debian/patches/HP-LaserJet_4000-PostScript-PPD.patch
@@ -1,4 +1,4 @@
-From a9be810e652fd65b7cab1a2d5c86c9af60e39a61 Mon Sep 17 00:00:00 2001
+From b4cdbb853560a57ad68a2aefac8c7b4e2e7de5c9 Mon Sep 17 00:00:00 2001
 From: Jean Tourrilhes <jt@hpl.hp.com>
 Date: Fri, 22 Jul 2016 09:33:10 +0200
 Subject: LaserJet PostScript 4000 PPD bugfix
diff --git a/debian/patches/add-lidil-two-cartridge-modes.patch b/debian/patches/add-lidil-two-cartridge-modes.patch
index 61007c906..84f4c3c24 100644
--- a/debian/patches/add-lidil-two-cartridge-modes.patch
+++ b/debian/patches/add-lidil-two-cartridge-modes.patch
@@ -1,4 +1,4 @@
-From 960efb2ef5428a6225d2c3b7e56525e73840a793 Mon Sep 17 00:00:00 2001
+From 62c6770cfbe4c3e40e066377cc1c36136e1169de Mon Sep 17 00:00:00 2001
 From: Till Kamppeter <till.kamppeter@gmail.com>
 Date: Fri, 22 Jul 2016 09:32:58 +0200
 Subject: For the Lidil printers, enable two-cartridge modes (black and color
diff --git a/debian/patches/cope-with-ErnieFilter-absence.patch b/debian/patches/cope-with-ErnieFilter-absence.patch
index 308d67a30..15416b513 100644
--- a/debian/patches/cope-with-ErnieFilter-absence.patch
+++ b/debian/patches/cope-with-ErnieFilter-absence.patch
@@ -1,4 +1,4 @@
-From 75fecd4d47cb816fa5c018f77914491ad48de177 Mon Sep 17 00:00:00 2001
+From fedb895acf24ebf3880faabb50791421fb4cf20c Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Fri, 22 Jul 2016 09:32:50 +0200
 Subject: Cope with prnt/hpcups/ErnieFilter.{cpp,h} removal by disabling the
diff --git a/debian/patches/hp-plugin-download-fix.patch b/debian/patches/hp-plugin-download-fix.patch
index 7b2673470..8731ce805 100644
--- a/debian/patches/hp-plugin-download-fix.patch
+++ b/debian/patches/hp-plugin-download-fix.patch
@@ -1,4 +1,4 @@
-From 3c6daaf9fd690c96096a9e50c8239b4b52644fb9 Mon Sep 17 00:00:00 2001
+From 1ae4b0b3542fb37f4792bb0781e68b558866c0e5 Mon Sep 17 00:00:00 2001
 From: Till Kamppeter <till.kamppeter@gmail.com>
 Date: Fri, 22 Jul 2016 09:33:06 +0200
 Subject: Fix download and installation of HP's proprietary plug-in in Python3
diff --git a/debian/patches/hp-systray-make-menu-appear-in-sni-qt-indicator-with-kde.patch b/debian/patches/hp-systray-make-menu-appear-in-sni-qt-indicator-with-kde.patch
index d1fdbec2f..823ad7e20 100644
--- a/debian/patches/hp-systray-make-menu-appear-in-sni-qt-indicator-with-kde.patch
+++ b/debian/patches/hp-systray-make-menu-appear-in-sni-qt-indicator-with-kde.patch
@@ -1,4 +1,4 @@
-From 4d40ec63830e13b916b1d875188975d406a4b0c1 Mon Sep 17 00:00:00 2001
+From 54876bbf7c9c732acd679cb234873afb5ca6190a Mon Sep 17 00:00:00 2001
 From: Till Kamppeter <till.kamppeter@gmail.com>
 Date: Fri, 22 Jul 2016 09:33:01 +0200
 Subject: Make the menu of the hp-systray applet appearing when the applet is
diff --git a/debian/patches/hp-systray-make-menu-title-visible-in-sni-qt-indicator.patch b/debian/patches/hp-systray-make-menu-title-visible-in-sni-qt-indicator.patch
index e6777f6e6..9ade96991 100644
--- a/debian/patches/hp-systray-make-menu-title-visible-in-sni-qt-indicator.patch
+++ b/debian/patches/hp-systray-make-menu-title-visible-in-sni-qt-indicator.patch
@@ -1,4 +1,4 @@
-From 33748e8acf83059c2bb0bd70f8bc6e0a0a1946a1 Mon Sep 17 00:00:00 2001
+From 834406de30bbfacd6133243a872a66542d67b0c4 Mon Sep 17 00:00:00 2001
 From: Till Kamppeter <till.kamppeter@gmail.com>
 Date: Fri, 22 Jul 2016 09:33:00 +0200
 Subject: Simplified the construction of the title line of the hp-systray
diff --git a/debian/patches/hp_photosmart_pro_b9100_support.patch b/debian/patches/hp_photosmart_pro_b9100_support.patch
index 60df5afbe..8bca9242f 100644
--- a/debian/patches/hp_photosmart_pro_b9100_support.patch
+++ b/debian/patches/hp_photosmart_pro_b9100_support.patch
@@ -1,4 +1,4 @@
-From 327645f888e8d69bd94a9b9c2ed14d709b00c168 Mon Sep 17 00:00:00 2001
+From 202a8230ae62c8f589791c2f16637ba5a8b0a54b Mon Sep 17 00:00:00 2001
 From: Till Kamppeter <till.kamppeter@gmail.com>
 Date: Fri, 22 Jul 2016 09:32:53 +0200
 Subject: Corrections: models.dat entry for the HP PhotoSmart Pro B9100
diff --git a/debian/patches/hpaio-option-duplex.diff b/debian/patches/hpaio-option-duplex.diff
index fc7b5ae41..90240a50f 100644
--- a/debian/patches/hpaio-option-duplex.diff
+++ b/debian/patches/hpaio-option-duplex.diff
@@ -1,4 +1,4 @@
-From 41117ee1657a4bc3cace7dcbee800ddc3833cb41 Mon Sep 17 00:00:00 2001
+From 79248e5979eb6677c3b8e5adf65f41018ced5a5f Mon Sep 17 00:00:00 2001
 From: Matej Vela <vela@debian.org>
 Date: Fri, 22 Jul 2016 09:33:02 +0200
 Subject: Fix "duplex descriptor uninitialized"
diff --git a/debian/patches/hpfax-bug-function-used-before-importing-log.patch b/debian/patches/hpfax-bug-function-used-before-importing-log.patch
index ab41cd632..31e02bc71 100644
--- a/debian/patches/hpfax-bug-function-used-before-importing-log.patch
+++ b/debian/patches/hpfax-bug-function-used-before-importing-log.patch
@@ -1,4 +1,4 @@
-From cf750217ce009dd6e87333ee389ae0b6482acc24 Mon Sep 17 00:00:00 2001
+From 5fc90771cbf5300d2cf0f187a60b517f8770d49a Mon Sep 17 00:00:00 2001
 From: Till Kamppeter <till.kamppeter@gmail.com>
 Date: Fri, 22 Jul 2016 09:32:59 +0200
 Subject: The hpfax CUPS backend uses its function bug() (which in turnuses
diff --git a/debian/patches/hpscan-deskjet-3520-aio-allow-non-jpeg-scanning.patch b/debian/patches/hpscan-deskjet-3520-aio-allow-non-jpeg-scanning.patch
index 314c6ac27..33ebb7b6a 100644
--- a/debian/patches/hpscan-deskjet-3520-aio-allow-non-jpeg-scanning.patch
+++ b/debian/patches/hpscan-deskjet-3520-aio-allow-non-jpeg-scanning.patch
@@ -1,4 +1,4 @@
-From e72dca9888a19de60477cdad3ef482578e50617b Mon Sep 17 00:00:00 2001
+From 9dfcd96d244ee2c0a463201ac85a3458fc42ed98 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Lubo=C5=A1=20Dole=C5=BEel?= <lubos@dolezel.info>
 Date: Fri, 22 Jul 2016 09:33:05 +0200
 Subject: Allow non-JPEG scanning on the HP DeskJet 3520 All-in-One and similar
diff --git a/debian/patches/install-check-plugin.diff b/debian/patches/install-check-plugin.diff
index b4b8405d5..73597eb78 100644
--- a/debian/patches/install-check-plugin.diff
+++ b/debian/patches/install-check-plugin.diff
@@ -1,4 +1,4 @@
-From 8c739e17230d154eab8a519a2210a5559eedbeee Mon Sep 17 00:00:00 2001
+From 091f1e174af959163857b68e381ebf0a3b3bd439 Mon Sep 17 00:00:00 2001
 From: Julian Andres Klode <jak@debian.org>
 Date: Fri, 22 Jul 2016 09:33:08 +0200
 Subject: Install check-plugin.py as a script
diff --git a/debian/patches/musb-c-do-not-crash-on-usb-failure.patch b/debian/patches/musb-c-do-not-crash-on-usb-failure.patch
index 6454888f5..c9909c568 100644
--- a/debian/patches/musb-c-do-not-crash-on-usb-failure.patch
+++ b/debian/patches/musb-c-do-not-crash-on-usb-failure.patch
@@ -1,4 +1,4 @@
-From 98ffc2e65478f0af30c1d1df41e2460d34b7fcc9 Mon Sep 17 00:00:00 2001
+From 140d7f37d4cf3ab85ddb437d5a722ef44e5e6438 Mon Sep 17 00:00:00 2001
 From: Till Kamppeter <till.kamppeter@gmail.com>
 Date: Fri, 22 Jul 2016 09:33:03 +0200
 Subject: Make sure that the HPLIP components which access the USB (especially
diff --git a/debian/patches/order-page-sizes-consistently.patch b/debian/patches/order-page-sizes-consistently.patch
index 6541d9719..84a0d5373 100644
--- a/debian/patches/order-page-sizes-consistently.patch
+++ b/debian/patches/order-page-sizes-consistently.patch
@@ -1,4 +1,4 @@
-From 3bd7fe5af2dcca65bef7649cda140204955e49b7 Mon Sep 17 00:00:00 2001
+From 1ecc6a5f932bd6dacd43072674ad5afec4abb10c Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Fri, 22 Jul 2016 09:33:07 +0200
 Subject: In hp-scan's manpage, sort PAGE_SIZES in help, for the manpage to be
diff --git a/debian/patches/pcardext-python3-workaround-upstream.patch b/debian/patches/pcardext-python3-workaround-upstream.patch
index 7e825043c..b2c885e57 100644
--- a/debian/patches/pcardext-python3-workaround-upstream.patch
+++ b/debian/patches/pcardext-python3-workaround-upstream.patch
@@ -1,4 +1,4 @@
-From efe7bd60bbbc5cfb2c379a3f596500e1be9627e0 Mon Sep 17 00:00:00 2001
+From ffabc3b59a8b2403e02e34ee94271306b2397f2f Mon Sep 17 00:00:00 2001
 From: Till Kamppeter <till.kamppeter@gmail.com>
 Date: Fri, 22 Jul 2016 09:33:04 +0200
 Subject: Workaround patch for missing Python3 transition of the old
diff --git a/debian/patches/pjl-duplex-binding.patch b/debian/patches/pjl-duplex-binding.patch
index c551c7d99..0506794f8 100644
--- a/debian/patches/pjl-duplex-binding.patch
+++ b/debian/patches/pjl-duplex-binding.patch
@@ -1,4 +1,4 @@
-From 319beb4f5ccc8b58b973109b13d9c0742257ccab Mon Sep 17 00:00:00 2001
+From 2d282c95ca3d143582727c352404b00aca18ac7d Mon Sep 17 00:00:00 2001
 From: Till Kamppeter <till.kamppeter@gmail.com>
 Date: Fri, 22 Jul 2016 09:32:54 +0200
 Subject: Fixed short-edge duplex for non-PS laser printers
diff --git a/debian/patches/series b/debian/patches/series
index 173469a21..17156a4e0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,3 +22,4 @@ ui-patch-upstream-like.patch
 0022-Fix-list-wrapping-in-scan.py-to-fix-generated-manpag.patch
 0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch
 0024-Make-dat2drv-and-locateppd-build-dependent-of-class-.patch
+0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch
diff --git a/debian/patches/simple-scan-as-default.patch b/debian/patches/simple-scan-as-default.patch
index df3bb974d..f30540f29 100644
--- a/debian/patches/simple-scan-as-default.patch
+++ b/debian/patches/simple-scan-as-default.patch
@@ -1,4 +1,4 @@
-From 464586539848ae9446aa320cca5a43cdb7a2d7ff Mon Sep 17 00:00:00 2001
+From a7facbdc894fdc3c8f6b117932f8a64191267b92 Mon Sep 17 00:00:00 2001
 From: Till Kamppeter <till.kamppeter@gmail.com>
 Date: Fri, 22 Jul 2016 09:32:55 +0200
 Subject: Make simple-scan the default scanning frontend
diff --git a/debian/patches/try_libhpmud.so.0.patch b/debian/patches/try_libhpmud.so.0.patch
index 44e621c96..932f9a85d 100644
--- a/debian/patches/try_libhpmud.so.0.patch
+++ b/debian/patches/try_libhpmud.so.0.patch
@@ -1,4 +1,4 @@
-From 6bd50de31a5afc6bd417d7e98e725c3cdc4c2979 Mon Sep 17 00:00:00 2001
+From 3d5d95d703425435b7a985ca478770fdd5d06aa3 Mon Sep 17 00:00:00 2001
 From: Evgeny Golov <evgeni@debian.org>
 Date: Fri, 22 Jul 2016 09:32:56 +0200
 Subject: Try libhpmud.so.0 after libhpmud.so
diff --git a/debian/patches/ui-patch-upstream-like.patch b/debian/patches/ui-patch-upstream-like.patch
index c31ab5267..f66309ab6 100644
--- a/debian/patches/ui-patch-upstream-like.patch
+++ b/debian/patches/ui-patch-upstream-like.patch
@@ -1,4 +1,4 @@
-From b05b899872e45601adf6a83aa4c2d9ede3fb6448 Mon Sep 17 00:00:00 2001
+From e7360b854eb372f7555c56a2d9997787d3df385f Mon Sep 17 00:00:00 2001
 From: Julian Andres Klode <jak@debian.org>
 Date: Fri, 22 Jul 2016 09:33:11 +0200
 Subject: Patch UI files to match upstream produced .py code
diff --git a/prnt/hpcups/HPCupsFilter.cpp b/prnt/hpcups/HPCupsFilter.cpp
index 413daa3c5..7c1e8566c 100644
--- a/prnt/hpcups/HPCupsFilter.cpp
+++ b/prnt/hpcups/HPCupsFilter.cpp
@@ -31,7 +31,6 @@
 \*****************************************************************************/
 
 #include "HPCupsFilter.h"
-#include "ImageProcessor.h"
 
 #include <signal.h>
 #include <sys/wait.h>
@@ -637,17 +636,11 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
 
 
     sprintf(hpPreProcessedRasterFile, "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name);
-    image_processor_t* imageProcessor = imageProcessorCreate();
 
     while (cupsRasterReadHeader2(cups_raster, &cups_header))
     {
 	    dbglog("DEBUG: SHIVA inside the while loop");
 
-        IMAGE_PROCESSOR_ERROR result = imageProcessorStartPage(imageProcessor, &cups_header);
-        if (result != IPE_SUCCESS){
-            dbglog("DEBUG: imageProcessorStartPage failed result = %d\n", result);
-        }
-
         current_page_number++;
 
         if (current_page_number == 1) {
@@ -746,12 +739,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
             color_raster = rgbRaster;
             black_raster = kRaster;
 
-            result = imageProcessorProcessLine(imageProcessor, m_pPrinterBuffer, cups_header.cupsBytesPerLine);
-            if (result != IPE_SUCCESS){
-                dbglog("DEBUG: imageProcessorProcessLine failed result = %d\n", result);
-            }
-
-
             if ((y == 0) && !is_ljmono) {
                 //For ljmono, make sure that first line is not a blankRaster line.Otherwise printer
                 //may not skip blank lines before actual data
@@ -781,12 +768,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
             }
         }  // for() loop end
 
-        result = imageProcessorEndPage(imageProcessor);
-        if (result != IPE_SUCCESS){
-                dbglog("DEBUG: imageProcessorEndPage failed result = %d\n", result);
-        }
-
-
         m_Job.NewPage();
         if (err != NO_ERROR) {
             break;
@@ -801,8 +782,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
         rgbRaster = NULL;
     }
 
-    imageProcessorDestroy(imageProcessor);
-
     unlink(hpPreProcessedRasterFile);
     return ret_status;
 }
diff --git a/prnt/hpcups/libImageProcessor-x86_32.so b/prnt/hpcups/libImageProcessor-x86_32.so
deleted file mode 100644
index e08721e01..000000000
--- a/prnt/hpcups/libImageProcessor-x86_32.so
+++ /dev/null
diff --git a/prnt/hpcups/libImageProcessor-x86_64.so b/prnt/hpcups/libImageProcessor-x86_64.so
deleted file mode 100644
index f09913ebd..000000000
--- a/prnt/hpcups/libImageProcessor-x86_64.so
+++ /dev/null