diff --git a/AUTHORS b/AUTHORS index a66be6d..abb6e1f 100644 --- a/AUTHORS +++ b/AUTHORS @@ -4,7 +4,7 @@ Upstream Authors: Copyright: Copyright (c) 2010-2012 Razor team - Copyright (c) 2012-2016 LXQt team + Copyright (c) 2012-2017 LXQt team License: LGPL-2.1+ The full text of the licenses can be found in the 'COPYING' file. diff --git a/CHANGELOG b/CHANGELOG index 9a7e3fd..d635391 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,7 +1,35 @@ -lxqt-policykit-0.11.1 / 2017-01-01 +lxqt-policykit-0.12.0 / 2017-10-21 ================================== + * Set patch version + * Don't export github templates + * Updated Lithuanian translation + * Drops Qt5Core_VERSION_STRING + * Added QCommandLineParser and basic cli interface to lxqt-policykit-agent + * Added default CMAKE_BUILD_TYPE and LXQT_POLKITAGENT_PATCH_VERSION + * Fixes a FTBFS in superbuild mode + * Added merged autostart to CMakeLists.txt + * Updated *_da.desktop files and removed *_da_DK.desktop files + * Update desktop entries and Replace fr_FR by fr + * Update Greek translation (el) Remove country variant from language code + * CMake: Adds Runtime and Devel install COMPONENTs + * Coding style changes + * Updates the build system to use the Targets infrastructure + * Drops hardcoded /etc/xdg paths + * Updated german translation, replaced Qt4 by Qt in all xsession/translations + * Updates translations infrastructure + * Update the required minimum cmake version + * remove dead template lines switch OnlyShowIn from Razor -> LXQt stringchanges LxQt -> LXQt + * Support lxqt-session and add necessary xdg autostart desktop entry files. + * Fix typo and correct some sentences + * Fixed some more typos + * Bump year + +0.11.1 / 2017-01-01 +=================== + + * Release 0.11.1: Update changelog * Make CMakeLists.txt more uniform. * Remove cpack (#25) diff --git a/CMakeLists.txt b/CMakeLists.txt index 36404ea..e9ae412 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,12 +18,22 @@ message(STATUS "polkit agent: ${POLKIT_AGENT_INCLUDE_DIRS} ${POLKIT_AGENT_LIBRAR set(POLKIT_AGENT_BINARY_DIR "${CMAKE_INSTALL_BINDIR}" CACHE FILEPATH "Directory for install polkit agent") find_package(PolkitQt5-1 REQUIRED) -find_package(Qt5LinguistTools REQUIRED QUIET) +find_package(Qt5LinguistTools REQUIRED) find_package(Qt5Widgets REQUIRED) -message(STATUS "Building with Qt${Qt5Core_VERSION_STRING}") +message(STATUS "Building with Qt${Qt5Core_VERSION}") find_package(lxqt REQUIRED) +if(NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE Release) +endif() + +# Patch Version +set(LXQT_POLKITAGENT_PATCH_VERSION 0) + +set(LXQT_POLKITAGENT_VERSION ${LXQT_MAJOR_VERSION}.${LXQT_MINOR_VERSION}.${LXQT_POLKITAGENT_PATCH_VERSION}) +add_definitions("-DLXQT_POLKITAGENT_VERSION=\"${LXQT_POLKITAGENT_VERSION}\"") + include(LXQtCompilerSettings NO_POLICY_SCOPE) # Deal with a bug in polkit-qt5 @@ -108,3 +118,7 @@ install(TARGETS DESTINATION "${POLKIT_AGENT_BINARY_DIR}" COMPONENT Runtime ) + +# merged from lxqt-common +add_subdirectory(autostart) + diff --git a/autostart/CMakeLists.txt b/autostart/CMakeLists.txt new file mode 100644 index 0000000..cdb2e12 --- /dev/null +++ b/autostart/CMakeLists.txt @@ -0,0 +1,17 @@ +cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR) + +file(GLOB DESKTOP_FILES_IN *.desktop.in) + +# Translations ********************************** +lxqt_translate_desktop(DESKTOP_FILES + SOURCES + ${DESKTOP_FILES_IN} +) +add_custom_target(lxqt_policykit_autostart_desktop_files ALL DEPENDS ${DESKTOP_FILES}) +#************************************************ + +install(FILES + ${DESKTOP_FILES} + DESTINATION "${LXQT_ETC_XDG_DIR}/autostart" + COMPONENT Runtime +) diff --git a/autostart/lxqt-policykit-agent.desktop.in b/autostart/lxqt-policykit-agent.desktop.in new file mode 100644 index 0000000..fff6af2 --- /dev/null +++ b/autostart/lxqt-policykit-agent.desktop.in @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=PolicyKit Handler +TryExec=lxqt-policykit-agent +Exec=lxqt-policykit-agent +OnlyShowIn=LXQt; +X-LXQt-Module=true + +#TRANSLATIONS_DIR=translations diff --git a/autostart/translations/lxqt-policykit-agent_ar.desktop b/autostart/translations/lxqt-policykit-agent_ar.desktop new file mode 100644 index 0000000..b8d4474 --- /dev/null +++ b/autostart/translations/lxqt-policykit-agent_ar.desktop @@ -0,0 +1,2 @@ +# Translations +Name[ar]=معالج وحدة السِّياسة بوليسي كيت diff --git a/autostart/translations/lxqt-policykit-agent_cs.desktop b/autostart/translations/lxqt-policykit-agent_cs.desktop new file mode 100644 index 0000000..84e8daf --- /dev/null +++ b/autostart/translations/lxqt-policykit-agent_cs.desktop @@ -0,0 +1,2 @@ +# Translations +Name[cs]=Zacházení s politikami diff --git a/autostart/translations/lxqt-policykit-agent_cs_CZ.desktop b/autostart/translations/lxqt-policykit-agent_cs_CZ.desktop new file mode 100644 index 0000000..8234241 --- /dev/null +++ b/autostart/translations/lxqt-policykit-agent_cs_CZ.desktop @@ -0,0 +1,2 @@ +# Translations +Name[cs_CZ]=Zacházení s politikami diff --git a/autostart/translations/lxqt-policykit-agent_da.desktop b/autostart/translations/lxqt-policykit-agent_da.desktop new file mode 100644 index 0000000..2f42696 --- /dev/null +++ b/autostart/translations/lxqt-policykit-agent_da.desktop @@ -0,0 +1,2 @@ +# Translations +Name[da]=PolicyKit-håndtering diff --git a/autostart/translations/lxqt-policykit-agent_de.desktop b/autostart/translations/lxqt-policykit-agent_de.desktop new file mode 100644 index 0000000..806e785 --- /dev/null +++ b/autostart/translations/lxqt-policykit-agent_de.desktop @@ -0,0 +1,3 @@ +# Translations +Name[de]=PolicyKit-Steuerung +Comment[de]=Authentifizierungsagent für PolicyKit diff --git a/autostart/translations/lxqt-policykit-agent_el.desktop b/autostart/translations/lxqt-policykit-agent_el.desktop new file mode 100644 index 0000000..f636415 --- /dev/null +++ b/autostart/translations/lxqt-policykit-agent_el.desktop @@ -0,0 +1,2 @@ +# Translations +Name[el]=Διαχειριστής PolicyKit diff --git a/autostart/translations/lxqt-policykit-agent_eo.desktop b/autostart/translations/lxqt-policykit-agent_eo.desktop new file mode 100644 index 0000000..f6ea9bb --- /dev/null +++ b/autostart/translations/lxqt-policykit-agent_eo.desktop @@ -0,0 +1,2 @@ +# Translations +Name[eo]=Traktilo de PolicyKit diff --git a/autostart/translations/lxqt-policykit-agent_es.desktop b/autostart/translations/lxqt-policykit-agent_es.desktop new file mode 100644 index 0000000..b9ad163 --- /dev/null +++ b/autostart/translations/lxqt-policykit-agent_es.desktop @@ -0,0 +1,2 @@ +# Translations +Name[es]=Manipulador de PolicyKit diff --git a/autostart/translations/lxqt-policykit-agent_es_VE.desktop b/autostart/translations/lxqt-policykit-agent_es_VE.desktop new file mode 100644 index 0000000..37fc042 --- /dev/null +++ b/autostart/translations/lxqt-policykit-agent_es_VE.desktop @@ -0,0 +1,2 @@ +# Translations +Name[es_VE]=Encargado del Kit de politicas diff --git a/autostart/translations/lxqt-policykit-agent_eu.desktop b/autostart/translations/lxqt-policykit-agent_eu.desktop new file mode 100644 index 0000000..7e35523 --- /dev/null +++ b/autostart/translations/lxqt-policykit-agent_eu.desktop @@ -0,0 +1,2 @@ +# Translations +Name[eu]=PolicyKit maneiatzailea diff --git a/autostart/translations/lxqt-policykit-agent_fi.desktop b/autostart/translations/lxqt-policykit-agent_fi.desktop new file mode 100644 index 0000000..941387f --- /dev/null +++ b/autostart/translations/lxqt-policykit-agent_fi.desktop @@ -0,0 +1,2 @@ +# Translations +Name[fi]=PolicyKit-käsittelijä diff --git a/autostart/translations/lxqt-policykit-agent_fr.desktop b/autostart/translations/lxqt-policykit-agent_fr.desktop new file mode 100644 index 0000000..49aad1a --- /dev/null +++ b/autostart/translations/lxqt-policykit-agent_fr.desktop @@ -0,0 +1,2 @@ +# Translations +Name[fr]=Gestionnaire de PolicyKit diff --git a/autostart/translations/lxqt-policykit-agent_hu.desktop b/autostart/translations/lxqt-policykit-agent_hu.desktop new file mode 100644 index 0000000..16776e2 --- /dev/null +++ b/autostart/translations/lxqt-policykit-agent_hu.desktop @@ -0,0 +1,2 @@ +# Translations +Name[hu]=PolicyKit-kezelő diff --git a/autostart/translations/lxqt-policykit-agent_it_IT.desktop b/autostart/translations/lxqt-policykit-agent_it_IT.desktop new file mode 100644 index 0000000..754ec21 --- /dev/null +++ b/autostart/translations/lxqt-policykit-agent_it_IT.desktop @@ -0,0 +1,2 @@ +# Translations +Name[it_IT]=Gestore di PolicyKit diff --git a/autostart/translations/lxqt-policykit-agent_ja.desktop b/autostart/translations/lxqt-policykit-agent_ja.desktop new file mode 100644 index 0000000..4f2758e --- /dev/null +++ b/autostart/translations/lxqt-policykit-agent_ja.desktop @@ -0,0 +1,2 @@ +# Translations +Name[ja]=PolicyKitハンドラ diff --git a/autostart/translations/lxqt-policykit-agent_lt.desktop b/autostart/translations/lxqt-policykit-agent_lt.desktop new file mode 100644 index 0000000..2a379b4 --- /dev/null +++ b/autostart/translations/lxqt-policykit-agent_lt.desktop @@ -0,0 +1,2 @@ +# Translations +Name[lt]=PolicyKit doroklė diff --git a/autostart/translations/lxqt-policykit-agent_nl.desktop b/autostart/translations/lxqt-policykit-agent_nl.desktop new file mode 100644 index 0000000..e8d9e14 --- /dev/null +++ b/autostart/translations/lxqt-policykit-agent_nl.desktop @@ -0,0 +1,2 @@ +# Translations +Name[nl]=PolicyKit Handler diff --git a/autostart/translations/lxqt-policykit-agent_pl_PL.desktop b/autostart/translations/lxqt-policykit-agent_pl_PL.desktop new file mode 100644 index 0000000..5c2becf --- /dev/null +++ b/autostart/translations/lxqt-policykit-agent_pl_PL.desktop @@ -0,0 +1,2 @@ +# Translations +Name[pl_PL]=PolicyKit Handler diff --git a/autostart/translations/lxqt-policykit-agent_pt.desktop b/autostart/translations/lxqt-policykit-agent_pt.desktop new file mode 100644 index 0000000..9d408b0 --- /dev/null +++ b/autostart/translations/lxqt-policykit-agent_pt.desktop @@ -0,0 +1,2 @@ +# Translations +Name[pt]=Gestor de políticas diff --git a/autostart/translations/lxqt-policykit-agent_pt_BR.desktop b/autostart/translations/lxqt-policykit-agent_pt_BR.desktop new file mode 100644 index 0000000..0697957 --- /dev/null +++ b/autostart/translations/lxqt-policykit-agent_pt_BR.desktop @@ -0,0 +1,2 @@ +# Translations +Name[pt_BR]=Manipulador PolicyKit diff --git a/autostart/translations/lxqt-policykit-agent_ru.desktop b/autostart/translations/lxqt-policykit-agent_ru.desktop new file mode 100644 index 0000000..f2ca79b --- /dev/null +++ b/autostart/translations/lxqt-policykit-agent_ru.desktop @@ -0,0 +1,2 @@ +# Translations +Name[ru]= политики комплект Обработчик diff --git a/autostart/translations/lxqt-policykit-agent_ru_RU.desktop b/autostart/translations/lxqt-policykit-agent_ru_RU.desktop new file mode 100644 index 0000000..8dfa8af --- /dev/null +++ b/autostart/translations/lxqt-policykit-agent_ru_RU.desktop @@ -0,0 +1,2 @@ +# Translations +Name[ru_RU]=Обработчик PolicyKit diff --git a/autostart/translations/lxqt-policykit-agent_sl.desktop b/autostart/translations/lxqt-policykit-agent_sl.desktop new file mode 100644 index 0000000..6247d5f --- /dev/null +++ b/autostart/translations/lxqt-policykit-agent_sl.desktop @@ -0,0 +1,2 @@ +# Translations +Name[sl]=Upravljalnik PolicyKit diff --git a/autostart/translations/lxqt-policykit-agent_th_TH.desktop b/autostart/translations/lxqt-policykit-agent_th_TH.desktop new file mode 100644 index 0000000..a14b662 --- /dev/null +++ b/autostart/translations/lxqt-policykit-agent_th_TH.desktop @@ -0,0 +1,2 @@ +# Translations +Name[th_TH]=ตัวจัดการ PolicyKit diff --git a/autostart/translations/lxqt-policykit-agent_tr.desktop b/autostart/translations/lxqt-policykit-agent_tr.desktop new file mode 100644 index 0000000..ada364a --- /dev/null +++ b/autostart/translations/lxqt-policykit-agent_tr.desktop @@ -0,0 +1,2 @@ +# Translations +Name[tr]=PolicyKit İşleyici diff --git a/autostart/translations/lxqt-policykit-agent_uk.desktop b/autostart/translations/lxqt-policykit-agent_uk.desktop new file mode 100644 index 0000000..ebc928f --- /dev/null +++ b/autostart/translations/lxqt-policykit-agent_uk.desktop @@ -0,0 +1,2 @@ +# Translations +Name[uk]=Маніпулятор PolicyKit diff --git a/autostart/translations/lxqt-policykit-agent_zh_CN.desktop b/autostart/translations/lxqt-policykit-agent_zh_CN.desktop new file mode 100644 index 0000000..ad7d0fe --- /dev/null +++ b/autostart/translations/lxqt-policykit-agent_zh_CN.desktop @@ -0,0 +1,2 @@ +# Translations +Name[zh_CN]=PolicyKit 处理器 diff --git a/autostart/translations/lxqt-policykit-agent_zh_TW.desktop b/autostart/translations/lxqt-policykit-agent_zh_TW.desktop new file mode 100644 index 0000000..eed020f --- /dev/null +++ b/autostart/translations/lxqt-policykit-agent_zh_TW.desktop @@ -0,0 +1,2 @@ +# Translations +Name[zh_TW]=PolicyKit處理器 diff --git a/debian/changelog b/debian/changelog index 2670c9f..d2a9731 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +lxqt-policykit (0.12.0-1) experimental; urgency=medium + + * Cherry-picking upstream release 0.12.0. + * Switched to experimental + * Bumped Standards to 4.1.1 - no changes needed + * Bumped liblxqt dependency to >= 0.12.0 + * Added Breaks/Replaces for lxqt-common << 0.12.0 + + -- Alf Gaida Tue, 24 Oct 2017 18:56:53 +0200 + lxqt-policykit (0.11.1-2) unstable; urgency=medium * Bump Standards to 4.0.0 - no changes needed diff --git a/debian/control b/debian/control index 1cfa082..224a194 100644 --- a/debian/control +++ b/debian/control @@ -8,15 +8,15 @@ Section: x11 Priority: optional Build-Depends: debhelper (>= 10), libkf5windowsystem-dev, - liblxqt0-dev (>= 0.11.1), + liblxqt0-dev (>= 0.12.0), libpolkit-agent-1-dev, libpolkit-qt5-1-dev, libqt5svg5-dev, libqt5x11extras5-dev, libx11-dev -Standards-Version: 4.0.0 -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/lxqt-policykit.git/?h=debian/sid -Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-policykit.git -b debian/sid +Standards-Version: 4.1.1 +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/lxqt-policykit.git/?h=debian/experimental +Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-policykit.git -b debian/experimental Homepage: https://github.com/lxde/lxqt-policykit Package: lxqt-policykit @@ -26,6 +26,8 @@ Depends: ${misc:Depends}, lxqt-session Recommends: lxqt-policykit-l10n Suggests: lxqt | lxqt-core +Breaks: lxqt-common (<< 0.12.0) +Replaces: lxqt-common (<< 0.12.0) Provides: polkit-1-auth-agent Description: LXQt authentication agent for PolicyKit The lxqt-policykit D-Bus session bus service that is used to diff --git a/man/lxqt-policykit-agent.1 b/man/lxqt-policykit-agent.1 index 72501f4..f20cf3a 100644 --- a/man/lxqt-policykit-agent.1 +++ b/man/lxqt-policykit-agent.1 @@ -6,13 +6,14 @@ lxqt-policykit-agent \- Polkit agent for \fBLXQt\fR: the faster and lighter QT D [\fICurrently No command line arguments\fR] .br .SH DESCRIPTION -This module handles policykit for \fBLXQt\fR. The polkit module, will perform -security tast over scale action privilegies. +This module handles policykit for \fBLXQt\fR. The authentication agent is used to make the user of +a session prove that the user of the session really is the user (by authenticating as the user) or +an administrative user (by authenticating as a administrator). .P -The \fBLXQt modules\fR are desktop independent tools, -and operate as daemons for the local user for desktop specific operations. +The \fBLXQt modules\fR are desktop independent tools and operate as daemons +for the local user for desktop specific operations. .P -\fBLXQt\fR is an advanced, easy-to-use, and fast desktop environment based on Qt +\fBLXQt\fR is an advanced, easy-to-use and fast desktop environment based on Qt technologies, ships several core desktop components, all of which are optional: .P * Panel @@ -24,26 +25,26 @@ technologies, ships several core desktop components, all of which are optional: * Display manager handler .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 +environments and their name is self-descriptive. They are usually not launched +by hand but automatically, when choosing a LXQt session in the Display Manager. .SH BEHAVIOR -The module detected on shares privilege escalation, and maintain a security dialog +The module detected on shares privilege escalation and maintain a security dialog that ask for the user's key need for action. .SH AUTOSTART -The module only are showed on \fBLXQt\fR desktop, but u can create an autostart action -for u preferred desktop environment. +The module is only shown in \fBLXQt\fR desktop, but one can create an autostart action +for other desktop environments. .SH "REPORTING BUGS" 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: +\fBLXQt\fR has been tailored for users who value simplicity, speed and +an intuitive interface, it's also intended for less powerful machines. See: .\" any module must refers to session app, for more info on start it .P \fBlxqt-session.1\fR LXQt for manage LXQt complete environment .P -\fBstart-lxqt.1\fR LXQt display management independient starup. +\fBstart-lxqt.1\fR LXQt display management independent startup. .P \fBlxqt-config-session.1\fR LXQt application for performing session autostart applications .P diff --git a/src/main.cpp b/src/main.cpp index fc7c8b8..b21fead 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -31,6 +31,7 @@ #include #include +#include #include "policykitagent.h" @@ -41,9 +42,18 @@ int main(int argc, char *argv[]) #endif LXQt::Application app(argc, argv); - app.setQuitOnLastWindowClosed(false); + QCommandLineParser parser; + parser.setApplicationDescription(QStringLiteral("LXQt Policykit Agent")); + const QString VERINFO = QStringLiteral(LXQT_POLKITAGENT_VERSION + "\nliblxqt " LXQT_VERSION + "\nQt " QT_VERSION_STR); + app.setApplicationVersion(VERINFO); + parser.addVersionOption(); + parser.addHelpOption(); + parser.process(app); + LXQtPolicykit::PolicykitAgent agent; return app.exec(); }