[SCM] print-manager packaging branch, kubuntu_vivid_archive, updated. debian/4.14.0-1-15-g957183d
Jonathan Riddell
jriddell-guest at moszumanska.debian.org
Wed Feb 18 14:51:17 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/print-manager.git;a=commitdiff;h=957183d
The following commit has been merged in the kubuntu_vivid_archive branch:
commit 957183dc248df3bc9c6f3eb874c0b45bf589d2cc
Author: Jonathan Riddell <jr at jriddell.org>
Date: Wed Feb 18 15:51:13 2015 +0100
New upstream snapshot
---
debian/02-add-print-manager.js | 49 ----------------------
debian/changelog | 6 +++
debian/control | 26 +++++++++---
.../patches/kubuntu_ignore_scp_dbus_failures.diff | 18 ++++----
debian/patches/series | 2 +-
debian/rules | 2 +-
6 files changed, 37 insertions(+), 66 deletions(-)
diff --git a/debian/02-add-print-manager.js b/debian/02-add-print-manager.js
deleted file mode 100644
index 3d6548d..0000000
--- a/debian/02-add-print-manager.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- 02-add-print-manager.js - Add print manager plasmoid to the systray
- Copyright (C) 2010-2012 Kevin Kofler <kevin.kofler at chello.at>
- Updated in debian by Maximilino Curia <maxy at debian.org>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
- Portions lifted from 01-kubuntu-10.04.js:
- Harald Sitter, apachelogger at ubuntu.com 2010-04-02
- Jonathan Riddell, jriddell at ubuntu.com 2010-02-18
- Copyright Canonical Ltd, may be copied under the GNU GPL 2 or later
-*/
-
-updated = false;
-
-add_print_manager = function(widget, containment)
-{
- if (updated) return;
- var max = 0;
- widget.currentConfigGroup = new Array("Applets");
- for (var i = 0; i < widget.configGroups.length; ++i) {
- var value = parseInt(widget.configGroups[i]);
- if (value > max) {
- max = value;
- }
- }
- widget.currentConfigGroup = new Array("Applets", max + 1);
- widget.writeConfig("plugin", "org.kde.printmanager");
- print("Print manager plasmoid added to the systray");
- updated = true;
-}
-
-var template = loadTemplate('org.kde.plasma-desktop.findWidgets');
-template.findWidgets('systemtray', add_print_manager);
-
-if (!updated)
- print("No systray found");
-
diff --git a/debian/changelog b/debian/changelog
index 98359a5..0109c69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+print-manager (4:15.04.0~git20150217-0ubuntu1) vivid; urgency=medium
+
+ * New upstream snapshot
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 17 Feb 2015 17:54:58 +0100
+
print-manager (4:14.12.2-0ubuntu1) vivid; urgency=medium
* New upstream release
diff --git a/debian/control b/debian/control
index accbc57..e3501bb 100644
--- a/debian/control
+++ b/debian/control
@@ -5,15 +5,29 @@ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Sune Vuorela <sune at debian.org>, Maximiliano Curia <maxy at debian.org>
Build-Depends: cmake,
debhelper (>= 9),
- kde-sc-dev-latest (>= 4:4.12),
- kdelibs5-dev,
+ extra-cmake-modules,
+ kio-dev,
libcups2-dev (>= 1.5),
+ libkf5config-dev,
+ libkf5configwidgets-dev,
+ libkf5coreaddons-dev,
+ libkf5dbusaddons-dev,
+ libkf5i18n-dev,
+ libkf5iconthemes-dev,
+ libkf5itemviews-dev,
+ libkf5kcmutils-dev,
+ libkf5notifications-dev,
+ libkf5windowsystem-dev,
pkg-config,
- pkg-kde-tools (>= 0.12)
-Standards-Version: 3.9.5
+ pkg-kde-tools (>= 0.12),
+ plasma-framework-dev,
+ qtbase5-dev,
+ qtdeclarative5-dev,
+ qttools5-dev
+Standards-Version: 3.9.6
Homepage: http://www.kde.org/
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kde-applications/print-manager.git/
-Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-applications/print-manager.git
+Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/applications/print-manager.git/
+Vcs-Git: git://anonscm.debian.org/pkg-kde/applications/print-manager.git
Package: print-manager
Architecture: any
diff --git a/debian/patches/kubuntu_ignore_scp_dbus_failures.diff b/debian/patches/kubuntu_ignore_scp_dbus_failures.diff
index 2e5746e..adc0029 100644
--- a/debian/patches/kubuntu_ignore_scp_dbus_failures.diff
+++ b/debian/patches/kubuntu_ignore_scp_dbus_failures.diff
@@ -4,24 +4,24 @@ 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
+Index: print-manager/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 @@
+--- print-manager.orig/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()));
emit loaded();
}
-Index: print-manager-4.10.3/libkcups/SelectMakeModel.cpp
+Index: print-manager/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 @@
+--- print-manager.orig/libkcups/SelectMakeModel.cpp
++++ print-manager/libkcups/SelectMakeModel.cpp
+@@ -244,7 +244,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()));
diff --git a/debian/patches/series b/debian/patches/series
index 21d2b33..4a1f8c8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-activate_password_dialog
kubuntu_ignore_scp_dbus_failures.diff
+activate_password_dialog
diff --git a/debian/rules b/debian/rules
index 6a77e53..b57f3e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,3 +1,3 @@
#!/usr/bin/make -f
-include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
--
print-manager packaging
More information about the pkg-kde-commits
mailing list