diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 378eac2..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -build diff --git a/AUTHORS b/AUTHORS index c498345..f6f28be 100644 --- a/AUTHORS +++ b/AUTHORS @@ -2,7 +2,7 @@ Upstream Authors: LXQt team: http://lxqt.org Copyright: - Copyright (c) 2015 LXQt team + Copyright (c) 2015-2016 LXQt team License: LGPL-2.1+ The full text of the licenses can be found in the 'LICENSE' file. diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e2d7b2..06b5ac5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR) project(lxqt-sudo) option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF) +option(PULL_TRANSLATIONS "Pull translations" ON) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) @@ -47,6 +48,10 @@ lxqt_translate_ts(QM_FILES ${UIS} INSTALL_DIR "${LXQT_TRANSLATIONS_DIR}/${PROJECT_NAME}" + PULL_TRANSLATIONS ${PULL_TRANSLATIONS} + CLEAN_TRANSLATIONS ${CLEAN_TRANSLATIONS} + TRANSLATIONS_REPO ${TRANSLATIONS_REPO} + TRANSLATIONS_REFSPEC ${TRANSLATIONS_REFSPEC} ) lxqt_app_translation_loader(SRCS ${PROJECT_NAME}) diff --git a/debian/changelog b/debian/changelog index 36d25d1..f7a1794 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,23 @@ +lxqt-sudo (0.10.96~7-gccdc1f6-1) experimental; urgency=medium + + * Cherry-picking upstream version 0.10.96~7-gccdc1f6. + * Preparing the upcoming release, switch to experimental + * Added new build dependendies: + - gcc (>= 4:6) + - g++ (>= 4:6) + - libqt5xdgiconloader-dev (>= 1.3.1~) + * Minimum versions added + * Bumped Standards to 3.9.8, no changes needed + * Fixed VCS fields, using https and plain /git/ + * Added Recommends lxqt-sudo-l10n + * Fixed copyrights Format field to https + * Bumped years in copyrights + * Added translation control to rules + * Set CMAKE_BUILD_TYPE=RelWithDebInfo + * Exported LC_ALL=C.UTF-8, make builds reproducible + + -- Alf Gaida Tue, 19 Jul 2016 20:14:55 +0200 + lxqt-sudo (0.10.0-3) unstable; urgency=medium * Remove dbg package in favor of dbgsym. diff --git a/debian/control b/debian/control index 991bced..3e43e27 100644 --- a/debian/control +++ b/debian/control @@ -7,23 +7,27 @@ Section: x11 Priority: optional Build-Depends: debhelper (>= 9), cmake (>= 3.0.2), + gcc (>= 4:6), + g++ (>= 4:6), libkf5windowsystem-dev, - liblxqt0-dev (>= 0.10.0), + liblxqt0-dev (>= 0.10.96~), libqt5x11extras5-dev, - libqt5xdg-dev (>= 1.3.0), + libqt5xdg-dev (>= 1.3.1~), + libqt5xdgiconloader-dev (>= 1.3.1~), libx11-dev, pkg-config, qttools5-dev, qttools5-dev-tools -Standards-Version: 3.9.6 -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-lxqt/lxqt-sudo.git/?h=debian/sid -Vcs-Git: git://anonscm.debian.org/pkg-lxqt/lxqt-sudo.git -b debian/sid +Standards-Version: 3.9.8 +Vcs-Browser: https://anonscm.debian.org/git/pkg-lxqt/lxqt-sudo.git/?h=debian/experimental +Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-sudo.git -b debian/experimental Homepage: https://github.com/lxde/lxqt-sudo Package: lxqt-sudo Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} +Recommends: lxqt-sudo-l10n Description: Graphical QT frontend for plain sudo lxqt-sudo is a graphical QT frontend for plain sudo(8) (for requesting optional password in GUI fashion). When invoked it simply spawns child sudo diff --git a/debian/copyright b/debian/copyright index 6ac9b02..15612a0 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,13 +1,13 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: lxqt-sudo Source: https://github.com/lxde/lxqt-sudo Files: * -Copyright: 2012-2015 LXQt team +Copyright: 2015-2016 LXQt team License: LGPL-2.1+ Files: debian/* -Copyright: 2015 Alf Gaida +Copyright: 2015-2016 Alf Gaida 2015 Andrew Lee (李健秋) 2015 ChangZhuo Chen (陳昌倬) License: LGPL-2.1+ @@ -18,7 +18,7 @@ License: LGPL-2.1+ License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. . - This library is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. diff --git a/debian/gbp.conf b/debian/gbp.conf index ead668a..ffe50a8 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,4 +1,8 @@ [DEFAULT] -debian-branch = debian/sid +debian-branch = debian/experimental upstream-branch = upstream/latest pristine-tar = True + +[import-orig] +# Use git cherrypick -n upstream instead. +merge = False diff --git a/debian/rules b/debian/rules index e8abf41..5858ca7 100755 --- a/debian/rules +++ b/debian/rules @@ -1,8 +1,16 @@ #!/usr/bin/make -f -#export DH_VERBOSE=1 +# export DH_VERBOSE=1 +export LC_ALL=C.UTF-8 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed +export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: - dh ${@} --buildsystem cmake \ + dh ${@} --buildsystem cmake\ --parallel + +override_dh_auto_configure: + dh_auto_configure -- \ + -DPULL_TRANSLATIONS=OFF\ + -DUPDATE_TRANSLATIONS=OFF\ + -DCMAKE_BUILD_TYPE=RelWithDebInfo diff --git a/translations/lxqt-sudo.ts b/translations/lxqt-sudo.ts deleted file mode 100644 index 820df8b..0000000 --- a/translations/lxqt-sudo.ts +++ /dev/null @@ -1,105 +0,0 @@ - - - - - PasswordDialog - - - LXQt sudo - - - - - Command: - - - - - Password: - - - - - <b>%1</b> needs administrative privileges. -Please enter your password. - - - - - Attempt #%1 - - - - - QObject - - - Usage: %1 option [command [arguments...]] - -GUI frontend for %2/%3 - -Arguments: - option: - -h|--help Print this help. - -v|--version Print version information. - -s|--su Use %3(1) as backend. - -d|--sudo Use %2(8) as backend. - command Command to run. - arguments Optional arguments for command. - - - - - - - %1 version %2 - - - - - - Sudo - - - %1: no command to run provided! - - - - - %1: no backend chosen! - - - - - %1: warning - got multiple arguments for %2 backend, squashing into one: %3 - - - - - Failed to fork: %1 - - - - - %1: Failed to exec '%2': %3 - - - - - - Failed to set non-block: %1 - - - - - Failed to fdopen: %1 - - - - - Child '%1' process failed! -%2 - - - - diff --git a/translations/lxqt-sudo_de.ts b/translations/lxqt-sudo_de.ts deleted file mode 100644 index 6a7ebb9..0000000 --- a/translations/lxqt-sudo_de.ts +++ /dev/null @@ -1,122 +0,0 @@ - - - - - PasswordDialog - - - LXQt sudo - LXQt sudo - - - - Command: - Befehl: - - - - Password: - Kennwort: - - - - <b>%1</b> needs administrative privileges. -Please enter your password. - <b>%1</b> benötigt root-Rechte. -Bitte Kennwort eingeben. - - - - Attempt #%1 - Versuch #%1 - - - - QObject - - - Usage: %1 option [command [arguments...]] - -GUI frontend for %2/%3 - -Arguments: - option: - -h|--help Print this help. - -v|--version Print version information. - -s|--su Use %3(1) as backend. - -d|--sudo Use %2(8) as backend. - command Command to run. - arguments Optional arguments for command. - - - Verwendung: %1 Option [Befehl [Argumente...]] - -Graphische Benutzeroberfläche für %2/%3 - -Argumente: - Option: - -h|--help Gibt diese Hilfe aus. - -v|--version Ausgabe der Versionsinformation. - -s|--su Verwendet %3(1) als Backend. - -d|--sudo Verwendet %2(8) als Backend. - Befehl Auszuführender Befehl. - Argumente Argumente zum auszuführenden Befehl. - - - - - - %1 version %2 - - %1 Version %2 - - - - - Sudo - - - %1: no command to run provided! - %1: kein auszuführender Befehl angegeben! - - - - %1: no backend chosen! - %1: kein Backend gewählt! - - - - %1: warning - got multiple arguments for %2 backend, squashing into one: %3 - %1: Warnung - mehrere Argumente für Backend %2 erhalten. %3 wird verwendet - - - - Failed to fork: %1 - Abspalten des Prozesses fehlgeschlagen: %1 - - - - %1: Failed to exec '%2': %3 - - %1: Ausführen von '%2' fehlgeschlagen: -%3 - - - - Failed to set non-block: %1 - Das Setzen von der Option O_NONBLOCK schlug fehl: %1 - - - - Failed to fdopen: %1 - Das Öffnen schlug fehl: %1 - - - - Child '%1' process failed! -%2 - Nachgeordneter Prozess '%1' ist fehlgeschlagen! -%2 - - - diff --git a/translations/lxqt-sudo_el.ts b/translations/lxqt-sudo_el.ts deleted file mode 100644 index 4f0eedd..0000000 --- a/translations/lxqt-sudo_el.ts +++ /dev/null @@ -1,80 +0,0 @@ - - - - - PasswordDialog - - - - LXQt sudo - LXQt sudo - - - - - Command: - Εντολή: - - - - - Password: - Κωδικός πρόσβασης: - - - - <b>%1</b> needs administrative privileges. -Please enter your password. - Το <b>%1</b> απαιτεί προνόμια διαχειριστή. -Παρακαλώ εισαγάγετε τον κωδικό πρόσβασης. - - - - Attempt #%1 - Προσπάθεια #%1 - - - - QObject - - - Usage: %1 command [arguments...] - -GUI frontend for %2 - -Arguments: - command Command to run. - arguments Optional arguments for command. - - - Χρήση: %1 εντολή [ορίσματα...] - -Περιβάλλον συστήματος υποστήριξης του %2 - -Ορίσματα: - εντολή Η εντολή προς εκτέλεση. - ορίσματα Προαιρετικά ορίσματα για την εντολή. - - - - - - %1 version %2 - - %1 έκδοση %2 - - - - - %1: no command to run provided! - %1: δεν παρείχατε κάποια εντολή προς εκτέλεση! - - - - Child '%1' process failed! -%2 - Η θυγατρική διεργασία «%1» απέτυχε! -%2 - - - diff --git a/translations/lxqt-sudo_it.ts b/translations/lxqt-sudo_it.ts deleted file mode 100644 index c02541e..0000000 --- a/translations/lxqt-sudo_it.ts +++ /dev/null @@ -1,94 +0,0 @@ - - - - - Communication - - - %1: Communication - unable to create shared memory(%2B), - %1: Comunicazione - non è stato possibile creare memoria condivisa(%2B), - - - - %1: Communication - password is too long(%2) for aquired shared memory(%3), has to be cut-off... - - %1: Comunicazione - password troppo lunga(%2) per acquisire memoria condivisa(%3) deve essere accorciata... - - - - - PasswordDialog - - - - LXQt sudo - - - - - - Command: - Comando: - - - - - Password: - - - - - <b>%1</b> needs administrative privileges. -Please enter your password. - <b>%1</b> richiede privilegi di amministratore. -Per favore inserire la password. - - - - Attempt #%1 - Tentativo #%1 - - - - QObject - - - Usage: %1 command [arguments...] - -GUI frontend for %2 - -Arguments: - command Command to run. - arguments Optional arguments for command. - - - Uso: %1 comando [argomenti...] - -Frontend grafico per %2 - -Argomenti: - comando Comando da eseguire. - argomenti Argomenti opzionali per il comando. - - - - - %1 version %2 - - %1 versione %2 - - - - - %1: no command to run provided! - %1: non è stato immesso nessun comando da eseguire! - - - - Child '%1' process failed! -%2 - Sottoprocesso %1 fallito! -%2 - - - diff --git a/translations/lxqt-sudo_pl.ts b/translations/lxqt-sudo_pl.ts deleted file mode 100644 index 2606bfe..0000000 --- a/translations/lxqt-sudo_pl.ts +++ /dev/null @@ -1,80 +0,0 @@ - - - - - PasswordDialog - - - - LXQt sudo - LXQt sudo - - - - - Command: - Komenda: - - - - - Password: - Hasło: - - - - <b>%1</b> needs administrative privileges. -Please enter your password. - <b>%1</b> potrzebuje uprawnień administratora. -Proszę wprowadź hasło. - - - - Attempt #%1 - Próba #%1 - - - - QObject - - - Usage: %1 command [arguments...] - -GUI frontend for %2 - -Arguments: - command Command to run. - arguments Optional arguments for command. - - - Sposób użycia: %1 komenda [argumenty...] - -Graficzna nakładka na %2 - -Argumenty: - komenda Komenda do wykonania. - argumenty Opcjonalne argumenty dla komendy. - - - - - - %1 version %2 - - %1 wersja %2 - - - - - %1: no command to run provided! - %1: nie podano komendy do wykonania! - - - - Child '%1' process failed! -%2 - Wykonanie procesu '%1' nie powiodło się! -%2 - - - diff --git a/translations/lxqt-sudo_sk.ts b/translations/lxqt-sudo_sk.ts deleted file mode 100644 index 3e1cb20..0000000 --- a/translations/lxqt-sudo_sk.ts +++ /dev/null @@ -1,121 +0,0 @@ - - - - - PasswordDialog - - - LXQt sudo - LXQt sudo - - - - Command: - Príkaz: - - - - Password: - Heslo: - - - - <b>%1</b> needs administrative privileges. -Please enter your password. - <b>%1</b> vyžaduje práva administrátora. -Prosím, zadajte svoje heslo. - - - - Attempt #%1 - Pokus č. %1 - - - - QObject - - - Usage: %1 option [command [arguments...]] - -GUI frontend for %2/%3 - -Arguments: - option: - -h|--help Print this help. - -v|--version Print version information. - -s|--su Use %3(1) as backend. - -d|--sudo Use %2(8) as backend. - command Command to run. - arguments Optional arguments for command. - - - Použitie: %1 option [command [arguments...]] - -GUI frontend pre %2/%3 - -Parametre: - option: - -h|--help Zobraziť pomoc. - -v|--version Zobraziť verziu. - -s|--su Použiť %3(1) ako backend. - -d|--sudo Použíť %2(8) ako backend. - command Príkaz na spustenie. - arguments Parametre príkazu. - - - - - - %1 version %2 - - %1 verzia %2 - - - - - Sudo - - - %1: no command to run provided! - %1: žiaden príkaz na spustenie! - - - - %1: no backend chosen! - %1: nevybratý backend! - - - - %1: warning - got multiple arguments for %2 backend, squashing into one: %3 - %1: upozornenie - zadaných viacero parametrov pre %2 backend, zlúčené do jedného: %3 - - - - Failed to fork: %1 - Zlyhal fork: %1 - - - - %1: Failed to exec '%2': %3 - - %1: Zlyhal exec '%2': %3 - - - - Failed to set non-block: %1 - Zlyhalo nastavenie non-block: %1 - - - - Failed to fdopen: %1 - Zlyhal fdopen: %1 - - - - Child '%1' process failed! -%2 - Dcérsky '%1' process zlyhal! -%2 - - - diff --git a/translations/lxqt-sudo_zh_TW.ts b/translations/lxqt-sudo_zh_TW.ts deleted file mode 100644 index 4a71a88..0000000 --- a/translations/lxqt-sudo_zh_TW.ts +++ /dev/null @@ -1,79 +0,0 @@ - - - - - PasswordDialog - - - - LXQt sudo - LXQt sudo - - - - - Command: - 指令： - - - - - Password: - 密碼： - - - - <b>%1</b> needs administrative privileges. -Please enter your password. - <b>%1</b> 需要管理員權限 -請輸入您的密碼 - - - - Attempt #%1 - 嘗試 %1 - - - - QObject - - - Usage: %1 command [arguments...] - -GUI frontend for %2 - -Arguments: - command Command to run. - arguments Optional arguments for command. - - -用法：%1 指令 [選項...] - -%2 的圖型前端 - -選項： - 指令 要執行的指令 - 選項 給指令的選項 - - - - - - %1 version %2 - - %1 版本 %s - - - - %1: no command to run provided! - %1：沒有可執行的指令 - - - - Child '%1' process failed! -%2 - 子執行序'%1'執行失敗！ -%2 - - -