[SCM] print-manager packaging branch, kubuntu_unstable, updated. debian/4.14.0-1-31-g8863717

[Kubuntu CI (Harald Sitter)]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 88637171b764db8ba7dd61329b417b9629f309d4
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Mar 11 15:10:48 2015 -0700

    Revert patch changes.
---
 debian/changelog                                     | 6 ++++++
 debian/patches/kubuntu_ignore_scp_dbus_failures.diff | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0c72a90..135909a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+print-manager (4:15.04.0~git20150217-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Revert patch changes. 
+
+ -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 11 Mar 2015 15:10:16 -0700
+
 print-manager (4:15.04.0~git20150217-0ubuntu1) vivid; urgency=medium
 
   * New upstream snapshot
diff --git a/debian/patches/kubuntu_ignore_scp_dbus_failures.diff b/debian/patches/kubuntu_ignore_scp_dbus_failures.diff
index b9943d2..7a3e30f 100644
--- a/debian/patches/kubuntu_ignore_scp_dbus_failures.diff
+++ b/debian/patches/kubuntu_ignore_scp_dbus_failures.diff
@@ -10,7 +10,7 @@ Index: print-manager/add-printer/DevicesModel.cpp
 +++ print-manager/add-printer/DevicesModel.cpp
 @@ -340,7 +340,7 @@ void DevicesModel::getGroupedDevicesFail
  {
-     kWarning() << error <<  message;
+     qWarning() << error <<  message;
      groupedDevicesFallback();
 -    emit errorMessage(i18n("Failed to group devices: '%1'",error.message()));
 +    //    emit errorMessage(i18n("Failed to group devices: '%1'",error.message()));
@@ -21,7 +21,7 @@ Index: print-manager/libkcups/SelectMakeModel.cpp
 ===================================================================
 --- print-manager.orig/libkcups/SelectMakeModel.cpp
 +++ print-manager/libkcups/SelectMakeModel.cpp
-@@ -247,7 +247,7 @@ void SelectMakeModel::getBestDriversFail
+@@ -250,7 +250,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()));

-- 
print-manager packaging