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

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 62e8c50bc3b7deee359ddac59b876cb3c8a04201
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Mar 11 14:33:18 2015 -0700

    Fuzz again
---
 debian/changelog                                     | 1 +
 debian/patches/kubuntu_ignore_scp_dbus_failures.diff | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a1321c5..ab73de9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ print-manager (4:14.12.3-0ubuntu1) UNRELEASED; urgency=medium
 
   * New upstream release 
   * Fix fuzz in patch kubuntu_ignore_scp_dbus_failures. 
+  * Fuzz again 
 
  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 11 Mar 2015 14:19:05 -0700
 
diff --git a/debian/patches/kubuntu_ignore_scp_dbus_failures.diff b/debian/patches/kubuntu_ignore_scp_dbus_failures.diff
index 7a3e30f..b9943d2 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
  {
-     qWarning() << error <<  message;
+     kWarning() << 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
-@@ -250,7 +250,7 @@ void SelectMakeModel::getBestDriversFail
+@@ -247,7 +247,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