From 12fe2cfc4282d7badd816c259f400d268ac04ee3 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Thu, 3 Sep 2015 00:18:47 +0200 Subject: [PATCH 1/6] Removed breaks and replaces Added upstring signing key and use it in watch file Fixed control with cme fix Added linker flags -Wl,--as-needed Removed unused GPL2+ from copyright --- debian/changelog | 16 ++++++--- debian/control | 55 ++++++++++++---------------- debian/copyright | 19 ++-------- debian/rules | 2 +- debian/upstream/signing-key.asc | 63 +++++++++++++++++++++++++++++++++ debian/watch | 3 +- 6 files changed, 103 insertions(+), 55 deletions(-) create mode 100644 debian/upstream/signing-key.asc diff --git a/debian/changelog b/debian/changelog index 13798cc..82654b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,19 @@ +lxqt-policykit (0.9.0+20150807-2) unstable; urgency=medium + + * + * Removed breaks and replaces + * Added upstring signing key and use it in watch file + * Fixed control with cme fix + * Added linker flags -Wl,--as-needed + * removed unused GPL2+ from copyright + + -- Alf Gaida Thu, 03 Sep 2015 00:18:36 +0200 + lxqt-policykit (0.9.0+20150807-1) unstable; urgency=medium [ Alf Gaida ] * Initial release. (Closes: #747607) * initial debian files. - * new release 0.9.0 source/options added packages renamed debian $foo - fixed. - * Some cleanup in debian $foo. - * some changes in debian $foo. - * drop transitional packages. [ Yukiharu YABUKI ] * Added two uploaders. diff --git a/debian/control b/debian/control index f217841..412bff0 100644 --- a/debian/control +++ b/debian/control @@ -1,37 +1,32 @@ Source: lxqt-policykit +Maintainer: LXQt Packaging Team +Uploaders: Alf Gaida , + ChangZhuo Chen (陳昌倬) , + Andrew Lee (李健秋) , + Yukiharu YABUKI Section: x11 Priority: optional -Maintainer: LXQt Packaging Team -Uploaders: - Alf Gaida , - ChangZhuo Chen (陳昌倬) , - Andrew Lee (李健秋) , - Yukiharu YABUKI -Build-Depends: - cmake (>= 3.0.2), - debhelper (>= 9), - libpolkit-agent-1-dev, - libx11-dev, - pkg-config, - libkf5windowsystem-dev (>= 5.9.0), - liblxqt0-dev (>= 0.9.0), - libpolkit-qt5-1-dev (>= 0.112), - libqt5x11extras5-dev (>= 5.3), - libqt5xdg-dev (>= 1.2.0), - qttools5-dev (>= 5.3), - qttools5-dev-tools (>= 5.3), +Build-Depends: cmake (>= 3.0.2), + debhelper (>= 9), + libpolkit-agent-1-dev, + libx11-dev, + pkg-config, + libkf5windowsystem-dev, + liblxqt0-dev, + libpolkit-qt5-1-dev, + libqt5x11extras5-dev, + libqt5xdg-dev, + qttools5-dev, + qttools5-dev-tools Standards-Version: 3.9.6 -Homepage: https://github.com/lxde/lxqt-policykit -Vcs-Git: git://anonscm.debian.org/pkg-lxqt/lxqt-policykit.git Vcs-Browser: http://anonscm.debian.org/cgit/pkg-lxqt/lxqt-policykit.git +Vcs-Git: git://anonscm.debian.org/pkg-lxqt/lxqt-policykit.git +Homepage: https://github.com/lxde/lxqt-policykit Package: lxqt-policykit Architecture: any -Breaks: lxqt-policykit-qt5 (<< 0.9.0) -Replaces: lxqt-policykit-qt5 (<< 0.9.0) -Depends: - ${misc:Depends}, - ${shlibs:Depends}, +Depends: ${misc:Depends}, + ${shlibs:Depends} Description: LXQt authentication agent for PolicyKit The lxqt-policykit D-Bus session bus service that is used to bring up authentication dialogs used for obtaining privileges. @@ -42,15 +37,11 @@ Package: lxqt-policykit-dbg Architecture: any Section: debug Priority: extra -Breaks: lxqt-policykit-qt5-dbg (<< 0.9.0) -Replaces: lxqt-policykit-qt5-dbg (<< 0.9.0) -Depends: - ${misc:Depends}, - lxqt-policykit (= ${binary:Version}), +Depends: ${misc:Depends}, + lxqt-policykit (= ${binary:Version}) Description: LXQt authentication agent for PolicyKit (debug symbols) The lxqt-policykit D-Bus session bus service that is used to bring up authentication dialogs used for obtaining privileges. . This package contains the LXQt policy kit authentication agent with debugging symbols. - diff --git a/debian/copyright b/debian/copyright index ec1501d..09e0adc 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,7 +5,7 @@ Source: https://github.com/lxde/lxqt-policykit Files: * Copyright: 2012-2015 LXQt team 2010-2012 Razor team -License: GPL-2.0+ and LGPL-2.1+ +License: LGPL-2.1+ Files: debian/* Copyright: 2014-2015 Alf Gaida @@ -24,18 +24,5 @@ License: LGPL-2.1+ Lesser General Public License for more details. . On Debian systems, the complete text of the GNU Lesser General - Public License version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1". - -License: GPL-2.0+ - 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. - . - On Debian systems, the complete text of the GNU General Public License - version 2 can be found in "/usr/share/common-licenses/GPL-2". + Public License version 2.1 can be found in + "/usr/share/common-licenses/LGPL-2.1". diff --git a/debian/rules b/debian/rules index 22c6d34..2b1f7be 100755 --- a/debian/rules +++ b/debian/rules @@ -1,11 +1,11 @@ #!/usr/bin/make -f #export DH_VERBOSE=1 +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed %: dh ${@} --buildsystem cmake --parallel - override_dh_auto_install: dh_auto_install -- DESTDIR=$(CURDIR)/debian/lxqt-policykit diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc new file mode 100644 index 0000000..05cd1df --- /dev/null +++ b/debian/upstream/signing-key.asc @@ -0,0 +1,63 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2.0.22 (GNU/Linux) + +mQINBFJevCYBEACx+Hvy+Vsuf+V5jeLUnzjAmHoy8DfTeGWr3ts30IapLHrfi0+U +WpzNnISO77yTr4VNboVZH+GHM/rnPfieODfB4ZW6CZLlInMSKUXcgQsEqXpyBZhA +Ib/SPy2bOfHly1uRJes0uRDsH5+v/hD74sByfnjQlrvI68O6wvGZmDFMNNPVO8+/ +OWBSBNkBuVrrZOMSPsLwQGJ4UtUQ4whburaPJG4VZJc5DLbzJGbEuACc0IAEYJS3 +7AfXVXn4j4Gc9F3o1xTUnbOBnwGPquWwUIm3FM7Ec2OdkvMt3EwvnkMAfeVrq3iE +FDD/KZTxdL0BZH3QD8gB7Jm4v4f3Nkobg6JCvCbcH3wBdZW4mASbwWzfRaDC2zHb +ErTglD7PpShLKZZ0pr9okWZEGw4Ku3q8ALi1JXK/ePTmsBlvkVskOJ3Nnd0avgH4 ++Q/vZoKfH8EhNY745rI+8CE9iv6V9XiSUt4CKEWAENt4A8hq6U2vV+jZv3B6AgD7 +ZjiI59yD4YuYubu8rCnNizTgh1voVw3ietknn/x2H5yH8fByWZ5uL87C0ky/uma6 +ZGbiiAtM4kdkyDMrfRV5nlEG9EKAGPVu5mjeSCrfkETwZ9OFPz1AuDye4ZEXrrcC +iRQ7RX6/GtW18aHER0kzGnfwx5KJzkDrRBY8A2PdXLBcrsN4WpK9EX01PQARAQAB +tCNKZXJvbWUgTGVjbGFuY2hlIDxqZXJvbWVAbGVjbGFuLmNoPokCPwQTAQIAKQUC +Ul68JgIbAwUJAeEzgAcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheAAAoJEDfgrx/a +SPNzSHIP/1ewXcC0TFBcvDD7MrIP7anyNfiWfW7cxkR8GSamkg6HTa6Ndyr1FFjJ +OoDFUP37jWhu59CsHxs2D0zRWJktezfvElscRgqbHcdpIznqsGdI8hXCZafhBGVb +sdAB2LRawcXGxnXt7XajPcSVwLWRE62caBqohznU2iWvI780WNjEbZoA0LhZwaFF +UUPJm8ea9v0IkZVKUyg9WONZ1U7FEG9SaEiSpI8kJdx1fvCwZVDV/NRO5GqnJaho +P1LCne4YdwS6pt1/fRgk32IHxxZfHlLzLHxb6v1JmIg72x28qCmGyK9oFBDbbnYu +6Aq8XbHogOrD5vJM2Pfm2IhV0+JHOjfQbddv8tsAH1M+LI+tToXmg5st1AU3wnTn +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 +=fF8P +-----END PGP PUBLIC KEY BLOCK----- diff --git a/debian/watch b/debian/watch index 4bd846a..ecfea0f 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,3 @@ version=3 -https://github.com/lxde/lxqt-policykit/releases .*/([\d\.]+).tar.gz +opts="pgpsigurlmangle=s/$/.asc/" \ + https://github.com/lxde/lxqt-policykit/releases .*/([\d\.]+).tar.gz From 10b7600fb9d4fd29920b24d10a0ff481fc6aa11b Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Thu, 3 Sep 2015 00:25:32 +0200 Subject: [PATCH 2/6] Cherry-picking upstream version 0.9.0+20150830. Removed breaks and replaces Added upstring signing key and use it in watch file Fixed control with cme fix Added linker flags -Wl,--as-needed removed unused GPL2+ from copyright --- debian/changelog | 6 +-- man/lxqt-policykit-agent.1 | 2 +- src/main.cpp | 4 +- src/policykitagent.cpp | 4 +- src/policykitagent.h | 2 +- src/policykitagentgui.cpp | 2 +- src/policykitagentgui.h | 2 +- translations/lxqt-policykit-agent.ts | 37 +++++++++++----- translations/lxqt-policykit-agent_de.ts | 51 ++++++++++++++++++++++ translations/lxqt-policykit-agent_el.ts | 51 ++++++++++++++++++++++ translations/lxqt-policykit-agent_hu.ts | 2 +- translations/lxqt-policykit-agent_pt.ts | 2 +- translations/lxqt-policykit-agent_ru.ts | 2 +- translations/lxqt-policykit-agent_ru_RU.ts | 2 +- 14 files changed, 142 insertions(+), 27 deletions(-) create mode 100644 translations/lxqt-policykit-agent_de.ts create mode 100644 translations/lxqt-policykit-agent_el.ts diff --git a/debian/changelog b/debian/changelog index 82654b4..b1bcfbc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,13 @@ -lxqt-policykit (0.9.0+20150807-2) unstable; urgency=medium +lxqt-policykit (0.9.0+20150830-1) unstable; urgency=medium - * + * Cherry-pick upstream version 0.9.0+20150830. * Removed breaks and replaces * Added upstring signing key and use it in watch file * Fixed control with cme fix * Added linker flags -Wl,--as-needed * removed unused GPL2+ from copyright - -- Alf Gaida Thu, 03 Sep 2015 00:18:36 +0200 + -- Alf Gaida Thu, 03 Sep 2015 00:25:08 +0200 lxqt-policykit (0.9.0+20150807-1) unstable; urgency=medium diff --git a/man/lxqt-policykit-agent.1 b/man/lxqt-policykit-agent.1 index db4ee26..428ee2b 100644 --- a/man/lxqt-policykit-agent.1 +++ b/man/lxqt-policykit-agent.1 @@ -25,7 +25,7 @@ technologies, ships several core desktop components, all of which are optional: .P These components perform similar actions to those available in other desktop environments, and their name is self-descriptive. They are usually not launched -by hand but automatically, when choosing a LxQt\-Qt session in the Display +by hand but automatically, when choosing a LXQt\-Qt session in the Display Manager. .SH BEHAVIOR The module detected on shares privilege escalation, and maintain a security dialog diff --git a/src/main.cpp b/src/main.cpp index 877ef52..fc7c8b8 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -40,10 +40,10 @@ int main(int argc, char *argv[]) g_type_init(); #endif - LxQt::Application app(argc, argv); + LXQt::Application app(argc, argv); app.setQuitOnLastWindowClosed(false); - LxQtPolicykit::PolicykitAgent agent; + LXQtPolicykit::PolicykitAgent agent; return app.exec(); } diff --git a/src/policykitagent.cpp b/src/policykitagent.cpp index 1d72780..0c12bb8 100644 --- a/src/policykitagent.cpp +++ b/src/policykitagent.cpp @@ -36,7 +36,7 @@ #include "policykitagentgui.h" -namespace LxQtPolicykit +namespace LXQtPolicykit { PolicykitAgent::PolicykitAgent(QObject *parent) @@ -68,7 +68,7 @@ void PolicykitAgent::initiateAuthentication(const QString &actionId, { if (m_inProgress) { - QMessageBox::information(0, tr("PolicyKit Information"), "Another authentization in progress. Please try it again later"); + QMessageBox::information(0, tr("PolicyKit Information"), tr("Another authentization in progress. Please try it again later.")); return; } m_inProgress = true; diff --git a/src/policykitagent.h b/src/policykitagent.h index e908fdc..d39701c 100644 --- a/src/policykitagent.h +++ b/src/policykitagent.h @@ -38,7 +38,7 @@ #include #include -namespace LxQtPolicykit +namespace LXQtPolicykit { class PolicykitAgentGUI; diff --git a/src/policykitagentgui.cpp b/src/policykitagentgui.cpp index dd55ace..1cbdc12 100644 --- a/src/policykitagentgui.cpp +++ b/src/policykitagentgui.cpp @@ -28,7 +28,7 @@ #include #include "policykitagentgui.h" -namespace LxQtPolicykit +namespace LXQtPolicykit { diff --git a/src/policykitagentgui.h b/src/policykitagentgui.h index 63cd620..c757238 100644 --- a/src/policykitagentgui.h +++ b/src/policykitagentgui.h @@ -33,7 +33,7 @@ #include "ui_policykitagentgui.h" -namespace LxQtPolicykit +namespace LXQtPolicykit { class PolicykitAgentGUI : public QDialog, public Ui::PolicykitAgentGUI diff --git a/translations/lxqt-policykit-agent.ts b/translations/lxqt-policykit-agent.ts index dfb1b80..31ee586 100644 --- a/translations/lxqt-policykit-agent.ts +++ b/translations/lxqt-policykit-agent.ts @@ -1,37 +1,50 @@ - + - PolicykitAgentGUI + LXQtPolicykit::PolicykitAgent - Authentication Required + + + PolicyKit Information - Identity: + + Another authentization in progress. Please try it again later. - Password: + + Authorization Failed - - - LxQtPolicykit::PolicykitAgent - PolicyKit Information + + Authorization failed for some reason - Authorization Failed + + PolicyKit Error + + + PolicykitAgentGUI - Authorization failed for some reason + + Authentication Required - PolicyKit Error + + Identity: + + + + + Password: diff --git a/translations/lxqt-policykit-agent_de.ts b/translations/lxqt-policykit-agent_de.ts new file mode 100644 index 0000000..f889855 --- /dev/null +++ b/translations/lxqt-policykit-agent_de.ts @@ -0,0 +1,51 @@ + + + + + LXQtPolicykit::PolicykitAgent + + + + PolicyKit Information + PolicyKit Information + + + + Another authentization in progress. Please try it again later. + Eine andere Authentisierung wird gerade durchgeführt. Bitte später noch einmal versuchen. + + + + Authorization Failed + Autorisierung fehlgeschlagen + + + + Authorization failed for some reason + Autorisierung aus irgendeinem Grund fehlgeschlagen + + + + PolicyKit Error + PolicyKit Fehler + + + + PolicykitAgentGUI + + + Authentication Required + Authentisierung benötigt + + + + Identity: + Identität: + + + + Password: + Kennwort: + + + diff --git a/translations/lxqt-policykit-agent_el.ts b/translations/lxqt-policykit-agent_el.ts new file mode 100644 index 0000000..d229859 --- /dev/null +++ b/translations/lxqt-policykit-agent_el.ts @@ -0,0 +1,51 @@ + + + + + LXQtPolicykit::PolicykitAgent + + + + PolicyKit Information + Πληροφορίες PolicyKit + + + + Another authentization in progress. Please try it again later. + Μια άλλη ταυτοποίηση είναι σε εξέλιξη. Παρακαλώ προσπαθήστε ξανά αργότερα. + + + + Authorization Failed + Η ταυτοποίηση απέτυχε + + + + Authorization failed for some reason + Η ταυτοποίηση για κάποια αιτία απέτυχε + + + + PolicyKit Error + Σφάλμα PolicyKit + + + + PolicykitAgentGUI + + + Authentication Required + Απαιτείται ταυτοποίηση + + + + Identity: + Ταυτότητα: + + + + Password: + Κωδικός πρόσβασης: + + + diff --git a/translations/lxqt-policykit-agent_hu.ts b/translations/lxqt-policykit-agent_hu.ts index a903583..db07a7d 100644 --- a/translations/lxqt-policykit-agent_hu.ts +++ b/translations/lxqt-policykit-agent_hu.ts @@ -17,7 +17,7 @@ - LxQtPolicykit::PolicykitAgent + LXQtPolicykit::PolicykitAgent PolicyKit Information Policykit információ diff --git a/translations/lxqt-policykit-agent_pt.ts b/translations/lxqt-policykit-agent_pt.ts index 2d2ad17..958675b 100644 --- a/translations/lxqt-policykit-agent_pt.ts +++ b/translations/lxqt-policykit-agent_pt.ts @@ -17,7 +17,7 @@ - LxQtPolicykit::PolicykitAgent + LXQtPolicykit::PolicykitAgent PolicyKit Information Informaçoes PolicyKit diff --git a/translations/lxqt-policykit-agent_ru.ts b/translations/lxqt-policykit-agent_ru.ts index 483d857..0024987 100644 --- a/translations/lxqt-policykit-agent_ru.ts +++ b/translations/lxqt-policykit-agent_ru.ts @@ -2,7 +2,7 @@ - LxQtPolicykit::PolicykitAgent + LXQtPolicykit::PolicykitAgent PolicyKit Information Информация PolicyKit diff --git a/translations/lxqt-policykit-agent_ru_RU.ts b/translations/lxqt-policykit-agent_ru_RU.ts index 11b357f..70ce45f 100644 --- a/translations/lxqt-policykit-agent_ru_RU.ts +++ b/translations/lxqt-policykit-agent_ru_RU.ts @@ -2,7 +2,7 @@ - LxQtPolicykit::PolicykitAgent + LXQtPolicykit::PolicykitAgent PolicyKit Information Информация PolicyKit From c4f6b1e6a2ee19a66e42647cbbdf7f85f278839e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ChangZhuo=20Chen=20=28=E9=99=B3=E6=98=8C=E5=80=AC=29?= Date: Sat, 12 Sep 2015 23:40:45 +0800 Subject: [PATCH 3/6] Update maintainer email --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 412bff0..04d10be 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: lxqt-policykit Maintainer: LXQt Packaging Team Uploaders: Alf Gaida , - ChangZhuo Chen (陳昌倬) , + ChangZhuo Chen (陳昌倬) , Andrew Lee (李健秋) , Yukiharu YABUKI Section: x11 From 54ba8ae6d8b69404566b99939ba7ca532f9b5ce4 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Fri, 25 Sep 2015 01:26:54 +0200 Subject: [PATCH 4/6] Switched to experimental because of LXQt namespace change Removed unused GPL2+ from copyright Added AUTHORS to docs Cleaned up .gitignore Added minimum version for liblxqt0-dev (>= 0.9.0+20150911) --- debian/.gitignore | 2 -- debian/changelog | 14 +++++++++----- debian/control | 2 +- debian/docs | 1 + 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/debian/.gitignore b/debian/.gitignore index d207caa..a3713e7 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -5,5 +5,3 @@ /lxqt-policykit/ /lxqt-policykit-dbg/ -/lxqt-policykit-qt5/ -/lxqt-policykit-qt5-dbg diff --git a/debian/changelog b/debian/changelog index b1bcfbc..5d7d8dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,17 @@ -lxqt-policykit (0.9.0+20150830-1) unstable; urgency=medium +lxqt-policykit (0.9.0+20150830-1) experimental; urgency=medium - * Cherry-pick upstream version 0.9.0+20150830. + * Cherry-pick upstream version 0.9.0+20150830. * Removed breaks and replaces * Added upstring signing key and use it in watch file - * Fixed control with cme fix + * Fixed control with cme fix * Added linker flags -Wl,--as-needed - * removed unused GPL2+ from copyright + * Removed unused GPL2+ from copyright + * Added AUTHORS to docs + * Cleaned up .gitignore + * Switched to experimental because of LXQt namespace change + * Added minimum version for liblxqt0-dev (>= 0.9.0+20150911) - -- Alf Gaida Thu, 03 Sep 2015 00:25:08 +0200 + -- Alf Gaida Fri, 25 Sep 2015 01:26:13 +0200 lxqt-policykit (0.9.0+20150807-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index 04d10be..5086618 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Build-Depends: cmake (>= 3.0.2), libx11-dev, pkg-config, libkf5windowsystem-dev, - liblxqt0-dev, + liblxqt0-dev (>= 0.9.0+20150911), libpolkit-qt5-1-dev, libqt5x11extras5-dev, libqt5xdg-dev, diff --git a/debian/docs b/debian/docs index e69de29..62deb04 100644 --- a/debian/docs +++ b/debian/docs @@ -0,0 +1 @@ +AUTHORS From 37a2d5653a00da1c3da64bcedaa29c3353b9fb17 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Fri, 30 Oct 2015 22:16:42 +0100 Subject: [PATCH 5/6] Cherry-picking upstream version 0.9.0+20151024. Adding minimum versions for liblxqt and libqtxdg --- AUTHORS | 2 +- debian/changelog | 8 ++++---- debian/control | 4 ++-- man/lxqt-policykit-agent.1 | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/AUTHORS b/AUTHORS index 190d298..5b94db3 100644 --- a/AUTHORS +++ b/AUTHORS @@ -6,5 +6,5 @@ Copyright: Copyright (c) 2010-2012 Razor team Copyright (c) 2012-2014 LXQt team -License: GPL-2 and LGPL-2.1+ +License: LGPL-2.1+ The full text of the licenses can be found in the 'COPYING' file. diff --git a/debian/changelog b/debian/changelog index 5d7d8dd..8b108c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -lxqt-policykit (0.9.0+20150830-1) experimental; urgency=medium +lxqt-policykit (0.9.0+20151024-1) experimental; urgency=medium - * Cherry-pick upstream version 0.9.0+20150830. + * Cherry-pick upstream version 0.9.0+20151024. * Removed breaks and replaces * Added upstring signing key and use it in watch file * Fixed control with cme fix @@ -9,9 +9,9 @@ lxqt-policykit (0.9.0+20150830-1) experimental; urgency=medium * Added AUTHORS to docs * Cleaned up .gitignore * Switched to experimental because of LXQt namespace change - * Added minimum version for liblxqt0-dev (>= 0.9.0+20150911) + * Added minimum version for liblxqt and libqtxdg - -- Alf Gaida Fri, 25 Sep 2015 01:26:13 +0200 + -- Alf Gaida Fri, 30 Oct 2015 22:16:29 +0100 lxqt-policykit (0.9.0+20150807-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index 5086618..9ecd905 100644 --- a/debian/control +++ b/debian/control @@ -12,10 +12,10 @@ Build-Depends: cmake (>= 3.0.2), libx11-dev, pkg-config, libkf5windowsystem-dev, - liblxqt0-dev (>= 0.9.0+20150911), + liblxqt0-dev (>= 0.9.0+20151026), libpolkit-qt5-1-dev, libqt5x11extras5-dev, - libqt5xdg-dev, + libqt5xdg-dev (>= 1.3.0), qttools5-dev, qttools5-dev-tools Standards-Version: 3.9.6 diff --git a/man/lxqt-policykit-agent.1 b/man/lxqt-policykit-agent.1 index 428ee2b..008856b 100644 --- a/man/lxqt-policykit-agent.1 +++ b/man/lxqt-policykit-agent.1 @@ -34,7 +34,7 @@ that ask for the user's key need for action. The module only are showed on \fBLXQt\fR desktop, but u can create an autostart action for u prefered desktop environment. .SH "REPORTING BUGS" -Report bugs to https://github.com/LXDE/LXQt/issues +Report bugs to https://github.com/lxde/lxqt/issues .SH "SEE ALSO" \fBLXQt\fR it has been tailored for users who value simplicity, speed, and an intuitive interface, also intended for less powerful machines. See: @@ -49,4 +49,4 @@ an intuitive interface, also intended for less powerful machines. See: .P .SH AUTHOR This manual page was created by \fBPICCORO Lenz McKAY\fR \fI\fR -for \fBLXQt\fR project and VENENUX GNU/Linux but can be used by others. +for \fBLXQt\fR project and VENENUX GNU/Linux. From fb68e50814a93616cbe0f07d1958a17ae5ce3cdd Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Wed, 4 Nov 2015 17:13:10 +0100 Subject: [PATCH 6/6] Cherry-picking upstream version 0.10.0. Set minimum version for liblxqt and libqtxdg --- .gitignore | 1 + COPYING => LICENSE | 41 +++++++++----------- debian/changelog | 7 ++++ debian/control | 2 +- debian/copyright | 2 +- translations/lxqt-policykit-agent_hu.ts | 45 ++++++++++++++-------- translations/lxqt-policykit-agent_pt.ts | 45 ++++++++++++++-------- translations/lxqt-policykit-agent_ru.ts | 13 +++++++ translations/lxqt-policykit-agent_ru_RU.ts | 13 +++++++ 9 files changed, 113 insertions(+), 56 deletions(-) create mode 100644 .gitignore rename COPYING => LICENSE (96%) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..378eac2 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +build diff --git a/COPYING b/LICENSE similarity index 96% rename from COPYING rename to LICENSE index a8dd823..20fb9c7 100644 --- a/COPYING +++ b/LICENSE @@ -1,9 +1,8 @@ - GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999 Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -23,8 +22,7 @@ specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations -below. +strategy to use in any particular case, based on the explanations below. When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that @@ -89,9 +87,9 @@ libraries. However, the Lesser license provides advantages in certain special circumstances. For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it -becomes a de-facto standard. To achieve this, non-free programs must -be allowed to use the library. A more frequent case is that a free +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License. @@ -138,8 +136,8 @@ included without limitation in the term "modification".) "Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control -compilation and installation of the library. +interface definition files, plus the scripts used to control compilation +and installation of the library. Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of @@ -305,10 +303,10 @@ of these things: the user installs one, as long as the modified version is interface-compatible with the version that the work was made with. - c) Accompany the work with a written offer, valid for at least - three years, to give the same user the materials specified in - Subsection 6a, above, for a charge no more than the cost of - performing this distribution. + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above @@ -386,10 +384,9 @@ all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library. -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply, and the section as a whole is intended to apply in other -circumstances. +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any @@ -407,11 +404,11 @@ be a consequence of the rest of this License. 12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License -may add an explicit geographical distribution limitation excluding those -countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. 13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. diff --git a/debian/changelog b/debian/changelog index 8b108c6..c356ff5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +lxqt-policykit (0.10.0-1) experimental; urgency=medium + + * Cherry-picking upstream version 0.10.0. + * Set minimum versions for liblxqt and libqtxdg + + -- Alf Gaida Wed, 04 Nov 2015 17:13:03 +0100 + lxqt-policykit (0.9.0+20151024-1) experimental; urgency=medium * Cherry-pick upstream version 0.9.0+20151024. diff --git a/debian/control b/debian/control index 9ecd905..d969657 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Build-Depends: cmake (>= 3.0.2), libx11-dev, pkg-config, libkf5windowsystem-dev, - liblxqt0-dev (>= 0.9.0+20151026), + liblxqt0-dev (>= 0.10.0), libpolkit-qt5-1-dev, libqt5x11extras5-dev, libqt5xdg-dev (>= 1.3.0), diff --git a/debian/copyright b/debian/copyright index 09e0adc..67b7a27 100644 --- a/debian/copyright +++ b/debian/copyright @@ -9,7 +9,7 @@ License: LGPL-2.1+ Files: debian/* Copyright: 2014-2015 Alf Gaida - 2015 Yukiharu YABUKI + 2015 Yukiharu YABUKI License: LGPL-2.1+ License: LGPL-2.1+ diff --git a/translations/lxqt-policykit-agent_hu.ts b/translations/lxqt-policykit-agent_hu.ts index db07a7d..20df8b9 100644 --- a/translations/lxqt-policykit-agent_hu.ts +++ b/translations/lxqt-policykit-agent_hu.ts @@ -1,38 +1,51 @@ - - - PolicykitAgentGUI - - Authentication Required - Hitelesítés kell - - - Identity: - Név: - - - Password: - Jelszó: - - + LXQtPolicykit::PolicykitAgent + + PolicyKit Information Policykit információ + + Another authentization in progress. Please try it again later. + + + + Authorization Failed Hitelesítés sikertelen + Authorization failed for some reason Hitelesítés valami miatt sikertelen + PolicyKit Error Policykit hiba + + PolicykitAgentGUI + + + Authentication Required + Hitelesítés kell + + + + Identity: + Név: + + + + Password: + Jelszó: + + diff --git a/translations/lxqt-policykit-agent_pt.ts b/translations/lxqt-policykit-agent_pt.ts index 958675b..cc56168 100644 --- a/translations/lxqt-policykit-agent_pt.ts +++ b/translations/lxqt-policykit-agent_pt.ts @@ -1,38 +1,51 @@ - - - PolicykitAgentGUI - - Authentication Required - Requer autenticação - - - Identity: - Identidade: - - - Password: - Senha: - - + LXQtPolicykit::PolicykitAgent + + PolicyKit Information Informaçoes PolicyKit + + Another authentization in progress. Please try it again later. + + + + Authorization Failed Falha de autenticação + Authorization failed for some reason A autenticação falhou por alguma razão + PolicyKit Error Erro PolicyKit + + PolicykitAgentGUI + + + Authentication Required + Requer autenticação + + + + Identity: + Identidade: + + + + Password: + Senha: + + diff --git a/translations/lxqt-policykit-agent_ru.ts b/translations/lxqt-policykit-agent_ru.ts index 0024987..1ad2255 100644 --- a/translations/lxqt-policykit-agent_ru.ts +++ b/translations/lxqt-policykit-agent_ru.ts @@ -4,18 +4,28 @@ LXQtPolicykit::PolicykitAgent + + PolicyKit Information Информация PolicyKit + + Another authentization in progress. Please try it again later. + + + + Authorization Failed Авторизация не удалась + Authorization failed for some reason Авторизация не удалась по какой-то причине + PolicyKit Error Ошибка PolicyKit @@ -23,14 +33,17 @@ PolicykitAgentGUI + Authentication Required Требуется аутентификация + Identity: Идентификация: + Password: Пароль: diff --git a/translations/lxqt-policykit-agent_ru_RU.ts b/translations/lxqt-policykit-agent_ru_RU.ts index 70ce45f..06c8602 100644 --- a/translations/lxqt-policykit-agent_ru_RU.ts +++ b/translations/lxqt-policykit-agent_ru_RU.ts @@ -4,18 +4,28 @@ LXQtPolicykit::PolicykitAgent + + PolicyKit Information Информация PolicyKit + + Another authentization in progress. Please try it again later. + + + + Authorization Failed Авторизация не удалась + Authorization failed for some reason Авторизация не удалась по какой-то причине + PolicyKit Error Ошибка PolicyKit @@ -23,14 +33,17 @@ PolicykitAgentGUI + Authentication Required Требуется аутентификация + Identity: Идентификация: + Password: Пароль: