Jose Manuel Santamaria Lema has proposed merging ~panfaust/kubuntu-packaging/+git/print-manager:work into ~kubuntu-packagers/kubuntu-packaging/+git/print-manager:kubuntu_yakkety_archive.
Requested reviews: Kubuntu Packagers (kubuntu-packagers) For more details, see: https://code.launchpad.net/~panfaust/kubuntu-packaging/+git/print-manager/+merge/302743 CUPS 2.2 was uploaded recently to yakkety, triggering an FTBFS in print-manager. I made a very simple patch which fixes the problem. This patch wasn't submitted to upstream yet, but we should. -- Your team Kubuntu Packagers is requested to review the proposed merge of ~panfaust/kubuntu-packaging/+git/print-manager:work into ~kubuntu-packagers/kubuntu-packaging/+git/print-manager:kubuntu_yakkety_archive.
diff --git a/debian/changelog b/debian/changelog index 747249f..517e048 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,10 @@ print-manager (4:16.04.3-0ubuntu1) UNRELEASED; urgency=medium * New upstream release (16.04.2) * New upstream release (16.04.3) + [ José Manuel Santamaría Lema ] + * Refresh kubuntu_ignore_scp_dbus_failures.diff + * Add kubuntu_fix_ftbfs_cups22.diff to avoid FTBFS'ing with CUPS 2.2 + -- Clive Johnston <[email protected]> Fri, 08 Jul 2016 01:40:24 +0100 print-manager (4:15.12.3-0ubuntu1) xenial; urgency=medium diff --git a/debian/patches/kubuntu_fix_ftbfs_cups22.diff b/debian/patches/kubuntu_fix_ftbfs_cups22.diff new file mode 100644 index 0000000..28ee376 --- /dev/null +++ b/debian/patches/kubuntu_fix_ftbfs_cups22.diff @@ -0,0 +1,13 @@ +Author: José Manuel Santamaría Lema <[email protected]> +Description: This patch avoids failing to build against CUPS 2.2 +Forwarded: no +--- 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/kubuntu_ignore_scp_dbus_failures.diff b/debian/patches/kubuntu_ignore_scp_dbus_failures.diff index 7a3e30f..f4cec47 100644 --- a/debian/patches/kubuntu_ignore_scp_dbus_failures.diff +++ b/debian/patches/kubuntu_ignore_scp_dbus_failures.diff @@ -4,10 +4,8 @@ Forwarded: not-needed Origin: vendor, https://bugs.launchpad.net/ubuntu/+source/system-config-printer/+bug/902762 Author: Jonathon Riddell <[email protected]> ==================================================================== -Index: print-manager/add-printer/DevicesModel.cpp -=================================================================== ---- print-manager.orig/add-printer/DevicesModel.cpp -+++ print-manager/add-printer/DevicesModel.cpp +--- a/add-printer/DevicesModel.cpp ++++ b/add-printer/DevicesModel.cpp @@ -340,7 +340,7 @@ void DevicesModel::getGroupedDevicesFail { qWarning() << error << message; @@ -17,11 +15,9 @@ Index: print-manager/add-printer/DevicesModel.cpp emit loaded(); } -Index: print-manager/libkcups/SelectMakeModel.cpp -=================================================================== ---- print-manager.orig/libkcups/SelectMakeModel.cpp -+++ print-manager/libkcups/SelectMakeModel.cpp -@@ -250,7 +250,7 @@ void SelectMakeModel::getBestDriversFail +--- a/libkcups/SelectMakeModel.cpp ++++ b/libkcups/SelectMakeModel.cpp +@@ -244,7 +244,7 @@ void SelectMakeModel::getBestDriversFail // Show the PPDs anyway m_gotBestDrivers = true; ui->messageWidget->setText(i18n("Failed to search for a recommended driver: '%1'", error.message())); diff --git a/debian/patches/series b/debian/patches/series index 4a1f8c8..a43eeca 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ kubuntu_ignore_scp_dbus_failures.diff activate_password_dialog +kubuntu_fix_ftbfs_cups22.diff
-- kubuntu-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
