[SCM] print-manager packaging branch, kubuntu_unstable, updated. debian/4.14.0-1-17-g62eeec4
Harald Sitter
apachelogger-guest at moszumanska.debian.org
Mon Jan 19 12:58:20 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-applications/print-manager.git;a=commitdiff;h=62eeec4
The following commit has been merged in the kubuntu_unstable branch:
commit 62eeec49f904f11aeefc2993fb0c881f7f2527c0
Author: Harald Sitter <sitter at kde.org>
Date: Mon Jan 19 13:56:56 2015 +0100
remove legacy patch
---
.../patches/kubuntu_ignore_scp_dbus_failures.diff | 32 ----------------------
1 file changed, 32 deletions(-)
diff --git a/debian/patches/kubuntu_ignore_scp_dbus_failures.diff b/debian/patches/kubuntu_ignore_scp_dbus_failures.diff
deleted file mode 100644
index 2e5746e..0000000
--- a/debian/patches/kubuntu_ignore_scp_dbus_failures.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-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
More information about the pkg-kde-commits
mailing list