[SCM] print-manager packaging branch, kubuntu_vivid_archive, updated. debian/4.14.0-1-4-g20500a1

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 20500a17cd3899ca1a3159fadacc347d43746f58
Author: Scarlett Clark <sgclark at kubuntu.org>
Date:   Mon Nov 24 07:33:02 2014 -0800

    Add missing Kubuntu patch
---
 .../patches/kubuntu_ignore_scp_dbus_failures.diff  | 32 ++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/debian/patches/kubuntu_ignore_scp_dbus_failures.diff b/debian/patches/kubuntu_ignore_scp_dbus_failures.diff
new file mode 100644
index 0000000..2e5746e
--- /dev/null
+++ b/debian/patches/kubuntu_ignore_scp_dbus_failures.diff
@@ -0,0 +1,32 @@
+Description: ignore_scp_dbus_failures
+ add ignore_scp_dbus_failures.diff for LP: #902762
+Forwarded: not-needed
+Origin: vendor, https://bugs.launchpad.net/ubuntu/+source/system-config-printer/+bug/902762
+Author: Jonathon Riddell <jr at kubuntu.org>
+====================================================================
+Index: print-manager-4.10.3/add-printer/DevicesModel.cpp
+===================================================================
+--- print-manager-4.10.3.orig/add-printer/DevicesModel.cpp	2013-05-25 00:21:30.000000000 +0000
++++ print-manager-4.10.3/add-printer/DevicesModel.cpp	2013-05-25 00:21:30.000000000 +0000
+@@ -341,7 +341,7 @@
+ {
+     kWarning() << error <<  message;
+     groupedDevicesFallback();
+-    emit errorMessage(i18n("Failed to group devices: '%1'",error.message()));
++    //    emit errorMessage(i18n("Failed to group devices: '%1'",error.message()));
+     emit loaded();
+ }
+ 
+Index: print-manager-4.10.3/libkcups/SelectMakeModel.cpp
+===================================================================
+--- print-manager-4.10.3.orig/libkcups/SelectMakeModel.cpp	2013-05-25 00:21:30.000000000 +0000
++++ print-manager-4.10.3/libkcups/SelectMakeModel.cpp	2013-05-25 00:21:30.000000000 +0000
+@@ -247,7 +247,7 @@
+     // Show the PPDs anyway
+     m_gotBestDrivers = true;
+     ui->messageWidget->setText(i18n("Failed to search for a recommended driver: '%1'", error.message()));
+-    ui->messageWidget->animatedShow();
++    //ui->messageWidget->animatedShow();
+     setModelData();
+ }
+ 

-- 
print-manager packaging