merge patched-debian/master into debian/master

9 files changed, 57 insertions, 9 deletions

diff --git a/backend/org.cups.usb-quirks b/backend/org.cups.usb-quirks
index 0586602ab..44d6bb8cb 100644
--- a/backend/org.cups.usb-quirks
+++ b/backend/org.cups.usb-quirks
@@ -293,3 +293,9 @@
 
 # Lexmark E120n (Issue #5478)
 0x043d 0x00cc no-reattach
+
+# All Xerox printers (Issue #5523)
+0x0924 no-reattach
+
+# Dymo 450 Turbo (Issue #5521)
+0x0922 0x0021 unidir
diff --git a/debian/.git-dpm b/debian/.git-dpm
index 891824daf..2c3bb50f9 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-3a541d1cb57989a954984fb70ba5e45a65eeeaa6
-3a541d1cb57989a954984fb70ba5e45a65eeeaa6
+2fb6d0075ed13f2fd03a8600a6ecb0892818116b
+2fb6d0075ed13f2fd03a8600a6ecb0892818116b
 25b2338346ef3abbb93ea88476887cba7b2b86f8
 25b2338346ef3abbb93ea88476887cba7b2b86f8
 cups_2.2.10.orig.tar.gz
diff --git a/debian/patches/0040-Add-USB-quirks-rule-for-Xerox-printers-Issue-5523.patch b/debian/patches/0040-Add-USB-quirks-rule-for-Xerox-printers-Issue-5523.patch
new file mode 100644
index 000000000..515af009d
--- /dev/null
+++ b/debian/patches/0040-Add-USB-quirks-rule-for-Xerox-printers-Issue-5523.patch
@@ -0,0 +1,20 @@
+From f8eac850dfbdb4a8d6a02f4d5eb2a473e7b088b4 Mon Sep 17 00:00:00 2001
+From: Michael R Sweet <michael.r.sweet@gmail.com>
+Date: Tue, 19 Feb 2019 11:11:54 -0500
+Subject: Add USB quirks rule for Xerox printers (Issue #5523)
+
+---
+ backend/org.cups.usb-quirks | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/backend/org.cups.usb-quirks b/backend/org.cups.usb-quirks
+index 0586602ab..77233ea18 100644
+--- a/backend/org.cups.usb-quirks
++++ b/backend/org.cups.usb-quirks
+@@ -293,3 +293,6 @@
+ 
+ # Lexmark E120n (Issue #5478)
+ 0x043d 0x00cc no-reattach
++
++# All Xerox printers (Issue #5523)
++0x0924 no-reattach
diff --git a/debian/patches/0041-Add-a-USB-quirks-rule-for-the-DYMO-450-Turbo-Issue-5.patch b/debian/patches/0041-Add-a-USB-quirks-rule-for-the-DYMO-450-Turbo-Issue-5.patch
new file mode 100644
index 000000000..ad790c8b8
--- /dev/null
+++ b/debian/patches/0041-Add-a-USB-quirks-rule-for-the-DYMO-450-Turbo-Issue-5.patch
@@ -0,0 +1,20 @@
+From d4d7ff4dad47ad4d278ca2c84efd602354a4e627 Mon Sep 17 00:00:00 2001
+From: Michael R Sweet <michael.r.sweet@gmail.com>
+Date: Thu, 21 Feb 2019 09:54:59 -0500
+Subject: Add a USB quirks rule for the DYMO 450 Turbo (Issue #5521)
+
+---
+ backend/org.cups.usb-quirks | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/backend/org.cups.usb-quirks b/backend/org.cups.usb-quirks
+index 77233ea18..44d6bb8cb 100644
+--- a/backend/org.cups.usb-quirks
++++ b/backend/org.cups.usb-quirks
+@@ -296,3 +296,6 @@
+ 
+ # All Xerox printers (Issue #5523)
+ 0x0924 no-reattach
++
++# Dymo 450 Turbo (Issue #5521)
++0x0922 0x0021 unidir
diff --git a/debian/patches/0040-Fix-compile-error-on-Linux-Issue-5483.patch b/debian/patches/0042-Fix-compile-error-on-Linux-Issue-5483.patch
index d85382709..d7810fd01 100644
--- a/debian/patches/0040-Fix-compile-error-on-Linux-Issue-5483.patch
+++ b/debian/patches/0042-Fix-compile-error-on-Linux-Issue-5483.patch
@@ -1,4 +1,4 @@
-From 6a6ba891dfe51dcfda58bfebf71f3bbbcb014583 Mon Sep 17 00:00:00 2001
+From 6f2402e51d47e9cebe27eec5bfdb0e5543127e2a Mon Sep 17 00:00:00 2001
 From: Michael R Sweet <michael.r.sweet@gmail.com>
 Date: Mon, 21 Jan 2019 11:54:58 -0500
 Subject: Fix compile error on Linux (Issue #5483)
diff --git a/debian/patches/0041-Stop-parsing-the-Emulators-keywords-in-PPD-files-Iss.patch b/debian/patches/0043-Stop-parsing-the-Emulators-keywords-in-PPD-files-Iss.patch
index 40d96ed9f..95378ee79 100644
--- a/debian/patches/0041-Stop-parsing-the-Emulators-keywords-in-PPD-files-Iss.patch
+++ b/debian/patches/0043-Stop-parsing-the-Emulators-keywords-in-PPD-files-Iss.patch
@@ -1,4 +1,4 @@
-From 4e956a93177237e3fd75574efb0bb1d6ae017e5c Mon Sep 17 00:00:00 2001
+From fb2f9b86fabc11f9b0fad804199064bdd555201e Mon Sep 17 00:00:00 2001
 From: Michael R Sweet <michael.r.sweet@gmail.com>
 Date: Mon, 21 Jan 2019 13:44:43 -0500
 Subject: Stop parsing the Emulators keywords in PPD files (Issue #5475)
diff --git a/debian/patches/0042-Fix-potential-unaligned-accesses-in-the-string-pool-.patch b/debian/patches/0044-Fix-potential-unaligned-accesses-in-the-string-pool-.patch
index 26c1336ba..5f77f3cc8 100644
--- a/debian/patches/0042-Fix-potential-unaligned-accesses-in-the-string-pool-.patch
+++ b/debian/patches/0044-Fix-potential-unaligned-accesses-in-the-string-pool-.patch
@@ -1,4 +1,4 @@
-From 285ff5788b33ae73ebf73656ceb9a6a912e0d0c9 Mon Sep 17 00:00:00 2001
+From ffbb46708544f6408bc72f200aa7365ba1222f97 Mon Sep 17 00:00:00 2001
 From: Michael R Sweet <michael.r.sweet@gmail.com>
 Date: Mon, 21 Jan 2019 14:21:57 -0500
 Subject: Fix potential unaligned accesses in the string pool (Issue #5474)
diff --git a/debian/patches/manpage-translations.patch b/debian/patches/manpage-translations.patch
index 05397aa84..4acf22f9b 100644
--- a/debian/patches/manpage-translations.patch
+++ b/debian/patches/manpage-translations.patch
@@ -1,4 +1,4 @@
-From 3a541d1cb57989a954984fb70ba5e45a65eeeaa6 Mon Sep 17 00:00:00 2001
+From 2fb6d0075ed13f2fd03a8600a6ecb0892818116b Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:50 +0200
 Subject: po4a infrastructure and translations for manpages.
diff --git a/debian/patches/series b/debian/patches/series
index 42969e2cf..545f4ee60 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -37,7 +37,9 @@ debianize_cups-config.patch
 0037-Use-the-same-requested-attributes-values-for-all-IPP.patch
 0038-Add-a-USB-quirk-rule-for-the-Lexmark-E120n-Issue-547.patch
 0039-Updated-the-USB-quirks-rule-for-Zebra-label-printers.patch
-0040-Fix-compile-error-on-Linux-Issue-5483.patch
-0041-Stop-parsing-the-Emulators-keywords-in-PPD-files-Iss.patch
-0042-Fix-potential-unaligned-accesses-in-the-string-pool-.patch
+0040-Add-USB-quirks-rule-for-Xerox-printers-Issue-5523.patch
+0041-Add-a-USB-quirks-rule-for-the-DYMO-450-Turbo-Issue-5.patch
+0042-Fix-compile-error-on-Linux-Issue-5483.patch
+0043-Stop-parsing-the-Emulators-keywords-in-PPD-files-Iss.patch
+0044-Fix-potential-unaligned-accesses-in-the-string-pool-.patch
 manpage-translations.patch