[SCM] print-manager packaging branch, master, updated. debian/15.12.0-1-11-g6991767

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 9578e9a60f6fd48218349b34fccd4e0463ba3fc9
Author: Automatic packaging <maxy+jenkins at gnuservers.com.ar>
Date:   Wed Apr 13 12:03:55 2016 +0200

    Refresh patches
---
 debian/patches/activate_password_dialog            | 17 ++++++++---
 .../patches/kubuntu_ignore_scp_dbus_failures.diff  | 34 ++++++++++++----------
 2 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/debian/patches/activate_password_dialog b/debian/patches/activate_password_dialog
index f7a1ffb..64fb901 100644
--- a/debian/patches/activate_password_dialog
+++ b/debian/patches/activate_password_dialog
@@ -1,8 +1,17 @@
-Index: print-manager/libkcups/KCupsPasswordDialog.cpp
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Wed, 13 Apr 2016 12:03:42 +0200
+Subject: activate_password_dialog
+
 ===================================================================
---- print-manager.orig/libkcups/KCupsPasswordDialog.cpp	2014-08-14 07:54:49.223994145 -0300
-+++ print-manager/libkcups/KCupsPasswordDialog.cpp	2014-08-18 12:28:12.092612954 -0300
-@@ -44,7 +44,7 @@
+---
+ libkcups/KCupsPasswordDialog.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libkcups/KCupsPasswordDialog.cpp b/libkcups/KCupsPasswordDialog.cpp
+index f1ffc45..f6bae01 100644
+--- a/libkcups/KCupsPasswordDialog.cpp
++++ b/libkcups/KCupsPasswordDialog.cpp
+@@ -44,7 +44,7 @@ void KCupsPasswordDialog::exec(const QString &username, bool wrongPassword)
  {
      QPointer<KPasswordDialog> dialog = new KPasswordDialog(0L, KPasswordDialog::ShowUsernameLine);
      dialog->setPrompt(i18n("Enter an username and a password to complete the task"));
diff --git a/debian/patches/kubuntu_ignore_scp_dbus_failures.diff b/debian/patches/kubuntu_ignore_scp_dbus_failures.diff
index adc0029..25cc144 100644
--- a/debian/patches/kubuntu_ignore_scp_dbus_failures.diff
+++ b/debian/patches/kubuntu_ignore_scp_dbus_failures.diff
@@ -1,14 +1,18 @@
-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>
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Wed, 13 Apr 2016 12:03:41 +0200
+Subject: kubuntu_ignore_scp_dbus_failures
+
 ====================================================================
-Index: print-manager/add-printer/DevicesModel.cpp
-===================================================================
---- print-manager.orig/add-printer/DevicesModel.cpp
-+++ print-manager/add-printer/DevicesModel.cpp
-@@ -340,7 +340,7 @@ void DevicesModel::getGroupedDevicesFail
+---
+ add-printer/DevicesModel.cpp | 2 +-
+ libkcups/SelectMakeModel.cpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/add-printer/DevicesModel.cpp b/add-printer/DevicesModel.cpp
+index a3d762f..c6797dd 100644
+--- a/add-printer/DevicesModel.cpp
++++ b/add-printer/DevicesModel.cpp
+@@ -340,7 +340,7 @@ void DevicesModel::getGroupedDevicesFailed(const QDBusError &error, const QDBusM
  {
      qWarning() << error <<  message;
      groupedDevicesFallback();
@@ -17,11 +21,11 @@ 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
-@@ -244,7 +244,7 @@ void SelectMakeModel::getBestDriversFail
+diff --git a/libkcups/SelectMakeModel.cpp b/libkcups/SelectMakeModel.cpp
+index cc3aa67..7f9ea59 100644
+--- a/libkcups/SelectMakeModel.cpp
++++ b/libkcups/SelectMakeModel.cpp
+@@ -244,7 +244,7 @@ void SelectMakeModel::getBestDriversFailed(const QDBusError &error, const QDBusM
      // Show the PPDs anyway
      m_gotBestDrivers = true;
      ui->messageWidget->setText(i18n("Failed to search for a recommended driver: '%1'", error.message()));

-- 
print-manager packaging