[SCM] print-manager packaging branch, master, updated. debian/16.04.1-2-3-geb7e813

[Didier Raboud]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/print-manager.git;a=commitdiff;h=eb7e813

The following commit has been merged in the master branch:
commit eb7e813434c16830f452c2cabd674a3e3796ad66
Author: Didier Raboud <odyx at debian.org>
Date:   Sat Oct 8 18:19:05 2016 +0200

    Backport upstream patch to fix FTBFS against CUPS >= 2.2
    
    Closes: #838738
---
 debian/changelog                                   |  3 +++
 .../971e759-fix-FTBFS-against-cups-2.2.patch       | 25 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 29 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 32a1d6f..f0c33ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ print-manager (4:16.08.0-1~1.gbpa1d5f8) UNRELEASED; urgency=medium
   * UNRELEASED
   * UNRELEASED
 
+  [ Didier Raboud ]
+  * Backport upstream patch to fix FTBFS against CUPS >= 2.2 (Closes: #838738)
+
  -- Maximiliano Curia <jenkins at gnuservers.com.ar>  Thu, 18 Aug 2016 23:02:13 +0200
 
 print-manager (4:16.04.1-2) unstable; urgency=medium
diff --git a/debian/patches/971e759-fix-FTBFS-against-cups-2.2.patch b/debian/patches/971e759-fix-FTBFS-against-cups-2.2.patch
new file mode 100644
index 0000000..7739b8a
--- /dev/null
+++ b/debian/patches/971e759-fix-FTBFS-against-cups-2.2.patch
@@ -0,0 +1,25 @@
+From 971e75934bc64627226d61565f68aff3c9b0000b Mon Sep 17 00:00:00 2001
+From: Rex Dieter <rdieter at math.unl.edu>
+Date: Mon, 12 Sep 2016 11:58:12 -0500
+Subject: [PATCH] fix FTBFS against cups-2.2
+
+cupsGetPPD2 moved to cups/ppd.h
+
+BUG: 366483
+FIXED-IN: 16.08.2
+---
+ libkcups/KCupsRequest.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libkcups/KCupsRequest.cpp b/libkcups/KCupsRequest.cpp
+index 39a5cf5..3625bec 100644
+--- a/libkcups/KCupsRequest.cpp
++++ b/libkcups/KCupsRequest.cpp
+@@ -29,6 +29,7 @@
+ #include <QStringBuilder>
+ 
+ #include <cups/adminutil.h>
++#include <cups/ppd.h>
+ 
+ #define CUPS_DATADIR    "/usr/share/cups"
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 4a1f8c8..0b9c459 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 kubuntu_ignore_scp_dbus_failures.diff
 activate_password_dialog
+971e759-fix-FTBFS-against-cups-2.2.patch

-- 
print-manager packaging