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

Harald Sitter apachelogger-guest at moszumanska.debian.org
Mon Mar 9 14:57:20 UTC 2015


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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit ab13f4b5bb5382d6a0317efdf63d885e9e0a2ea6
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Dec 1 13:27:31 2014 +0100

    kde frameworks5 port
---
 debian/02-add-print-manager.js          | 49 ---------------------------------
 debian/changelog                        |  6 ++++
 debian/control                          | 24 ++++++++++++----
 debian/meta/upstream_scm.json           |  3 ++
 debian/patches/activate_password_dialog | 13 ---------
 debian/patches/series                   |  1 -
 debian/print-manager.install            |  1 -
 debian/print-manager.lintian-overrides  |  2 --
 debian/rules                            |  2 +-
 9 files changed, 29 insertions(+), 72 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 e351701..9daaa7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+print-manager (4:4.50.0-0ubuntu1) UNRELEASED; urgency=medium
+
+  * KDE Frameworks 5 port
+
+ -- Harald Sitter <apachelogger at kubuntu.org>  Mon, 01 Dec 2014 13:25:04 +0100
+
 print-manager (4:4.14.0-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index d9f8d0b..bfd733f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,29 @@
 Source: print-manager
 Section: kde
 Priority: optional
-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+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 (>= 4:4.11),
+               extra-cmake-modules,
+               kio-dev,
                libcups2-dev (>= 1.5),
+               libkf5config-dev,
+               libkf5configwidgets-dev,
+               libkf5dbusaddons-dev,
+               libkf5i18n-dev,
+               libkf5iconthemes-dev,
+               libkf5itemviews-dev,
+               libkf5kcmutils-dev,
+               libkf5notifications-dev,
+               libkf5widgetsaddons-dev,
+               libkf5windowsystem-dev,
                pkg-config,
-               pkg-kde-tools (>= 0.12)
+               pkg-kde-tools (>= 0.12),
+               plasma-framework-dev,
+               qtbase5-dev,
+               qtdeclarative5-dev,
+               qttools5-dev
 Standards-Version: 3.9.5
 Homepage: http://www.kde.org/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/print-manager.git
@@ -18,7 +32,7 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/print-manager.git
 Package: print-manager
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: cups, system-config-printer
+Recommends: cups, system-config-printer-udev
 Description: printer configuration and monitoring tools
  This package provides a KDE configuration module and a Plasma widget for
  installing and configuring printers, and monitoring printers, print jobs and
diff --git a/debian/meta/upstream_scm.json b/debian/meta/upstream_scm.json
new file mode 100644
index 0000000..aa3c0eb
--- /dev/null
+++ b/debian/meta/upstream_scm.json
@@ -0,0 +1,3 @@
+{
+    "branch" : "frameworks"
+}
diff --git a/debian/patches/activate_password_dialog b/debian/patches/activate_password_dialog
deleted file mode 100644
index f7a1ffb..0000000
--- a/debian/patches/activate_password_dialog
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: print-manager/libkcups/KCupsPasswordDialog.cpp
-===================================================================
---- 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 @@
- {
-     QPointer<KPasswordDialog> dialog = new KPasswordDialog(0L, KPasswordDialog::ShowUsernameLine);
-     dialog->setPrompt(i18n("Enter an username and a password to complete the task"));
--    dialog->setModal(false);
-+    dialog->setModal(true);
-     dialog->setUsername(username);
-     if (wrongPassword) {
-         dialog->showErrorMessage(QString(), KPasswordDialog::UsernameError);
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 1f451ea..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-activate_password_dialog
diff --git a/debian/print-manager.install b/debian/print-manager.install
deleted file mode 100644
index a1933a7..0000000
--- a/debian/print-manager.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/02-add-print-manager.js /usr/share/kde4/apps/plasma-desktop/updates/
diff --git a/debian/print-manager.lintian-overrides b/debian/print-manager.lintian-overrides
deleted file mode 100644
index 533ab4b..0000000
--- a/debian/print-manager.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# Private library
-print-manager: postinst-must-call-ldconfig usr/lib/libkcupslib.so
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