From 8ebe16be06b612813611c79f2c70d2322bf0f100 Mon Sep 17 00:00:00 2001 From: Yukiharu YABUKI Date: Thu, 20 Aug 2015 03:53:06 +0900 Subject: [PATCH 1/6] Releasing debian version 0.9.0+20150817-1. Signed-off-by: Yukiharu YABUKI --- debian/changelog | 43 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 40 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index c922da5..cccdbc1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,42 @@ -lxqt-openssh-askpass (0.9.0+20150817-1) unstable; urgency=low +lxqt-openssh-askpass (0.9.0+20150817-1) unstable; urgency=medium - * Initial release (Closes: #747603) + [ Alf Gaida ] + * Initial release. (Closes: #747603) + * initial debian files. + - Upstream version 0.8.0. + - Min liblxqt-qt5-0-dev version 0.8.0. + - Min Qt version 5.3.2. + - bump standards to 3.9.6. + - lintian-override for manpage warning added. + * new relaese 0.9.0 fixed debian $foo added source/options. + * Some cleanup in debian $foo. + * some changes in debian $foo. + * drop transitional packages. - -- ChangZhuo Chen (陳昌倬) Mon, 17 Aug 2015 23:40:43 +0800 + [ ChangZhuo Chen (陳昌倬) ] + * Reformat control. + * Imported Upstream version 0.9.0+20150817. + * Fix copyright format. + * Add manpage. + * Update copyright. + * Fix manpage typo. + * Add local-options. + * Use -Wl,--as-needed. + * Update control. + * Update changelog. + + [ Andrew Lee (李健秋) ] + * Added myself as Uploader. + * Warpped lines in copyright. + * Drop GPL-2+ license from copyright as it hasn't been mentioned + anywhere in headers. + * Sorting build-depends. + * Removing whitespaces at EOL and EOF. + + [ Yukiharu YABUKI ] + * Remove unnecessary white spaces and hyphenation. + * Added copyright holder in debian/*. + * Added new uploader. + * Improve man page. + + -- Yukiharu YABUKI Thu, 20 Aug 2015 03:41:10 +0900 From 4467477e9462de8da30cdd12c57fd26db45ef543 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Wed, 2 Sep 2015 23:30:30 +0200 Subject: [PATCH 2/6] Cherry-picking upstream version 0.9.0+20150830. Removed typo.patch, applied upstream Added upstream signing key and used it in watch file --- debian/changelog | 8 ++++ debian/patches/series | 1 - debian/patches/typo.patch | 32 ------------- debian/upstream/signing-key.asc | 63 +++++++++++++++++++++++++ debian/watch | 3 +- man/lxqt-openssh-askpass.1 | 8 ++-- src/main.cpp | 2 +- translations/lxqt-openssh-askpass_el.ts | 22 +++++++++ 8 files changed, 100 insertions(+), 39 deletions(-) delete mode 100644 debian/patches/typo.patch create mode 100644 debian/upstream/signing-key.asc create mode 100644 translations/lxqt-openssh-askpass_el.ts diff --git a/debian/changelog b/debian/changelog index cccdbc1..8c732fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +lxqt-openssh-askpass (0.9.0+20150830-1) unstable; urgency=medium + + * Cherry-picking upstream version 0.9.0+20150830. + * Removed typo.patch, applied upstream + * Added upstream signing key and used it in watch file + + -- Alf Gaida Wed, 02 Sep 2015 23:38:08 +0200 + lxqt-openssh-askpass (0.9.0+20150817-1) unstable; urgency=medium [ Alf Gaida ] diff --git a/debian/patches/series b/debian/patches/series index f8034c8..4d44891 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -typo.patch manpage-improvement.patch diff --git a/debian/patches/typo.patch b/debian/patches/typo.patch deleted file mode 100644 index b8261ec..0000000 --- a/debian/patches/typo.patch +++ /dev/null @@ -1,32 +0,0 @@ -Description: Fix manpage typo ---- -Forwarded: https://github.com/lxde/lxqt-openssh-askpass/pull/11 ---- lxqt-openssh-askpass-0.9.0+20150817.orig/man/lxqt-openssh-askpass.1 -+++ lxqt-openssh-askpass-0.9.0+20150817/man/lxqt-openssh-askpass.1 -@@ -7,7 +7,7 @@ lxqt-openssh-askpass \- Password access - .br - .SH DESCRIPTION - This module handles openssh security password access for \fBLXQt\fR. The openssh askpass module, will perform --security tast over scale accesss privilegies. -+security tast over scale access privilegies. - .P - .P - The \fBLXQt modules\fR are desktop independent tools, -@@ -30,7 +30,7 @@ environments, and their names are self-d - by hand but automatically, when choosing a \fBLXQt\fR session in the Display - Manager. - .SH BEHAVIOR --The module detected on shares privilege accesss, and maintain a security dialog -+The module detected on shares privilege access, and maintain a security dialog - that ask for the user's key need for access over another machine host. - .P - This module are very early stage, and not enabled by default, so you must added a env -@@ -38,7 +38,7 @@ by the \fBlxqt\-settings\fR application - with \fBlxqt\-openssh\-askpass\fR value, openssl and openssh-client packages must be required. - .SH AUTOSTART - The module only are showed on \fBLXQt\fR desktop, but u can create an autostart action --for you prefered desktop environment. -+for you preferred desktop environment. - .SH "REPORTING BUGS" - Report bugs to https://github.com/LXDE/LXQt/issues - .SH "SEE ALSO" 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 b4c36e0..fb3601c 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,3 @@ version=3 -https://github.com/lxde/lxqt-openssh-askpass/releases .*/([\d\.]+).tar.gz +opts="pgpsigurlmangle=s/$/.asc/" \ + https://github.com/lxde/lxqt-openssh-askpass/releases .*/([\d\.]+).tar.gz diff --git a/man/lxqt-openssh-askpass.1 b/man/lxqt-openssh-askpass.1 index 300b432..04411ff 100644 --- a/man/lxqt-openssh-askpass.1 +++ b/man/lxqt-openssh-askpass.1 @@ -1,4 +1,4 @@ -.TH lxqt-openssh-askpass "1" "September 2012" "LXQt\ 0.5.0" "LxQt\ Module" +.TH lxqt-openssh-askpass "1" "September 2012" "LXQt\ 0.5.0" "LXQt\ Module" .SH NAME lxqt-openssh-askpass \- Password access over ssh module of \fBLXQt\fR: the faster and lighter QT Desktop Environment .SH SYNOPSIS @@ -7,7 +7,7 @@ lxqt-openssh-askpass \- Password access over ssh module of \fBLXQt\fR: the faste .br .SH DESCRIPTION This module handles openssh security password access for \fBLXQt\fR. The openssh askpass module, will perform -security tast over scale accesss privilegies. +security tast over scale access privilegies. .P .P The \fBLXQt modules\fR are desktop independent tools, @@ -30,7 +30,7 @@ environments, and their names are self-descriptive. They are usually not launch by hand but automatically, when choosing a \fBLXQt\fR session in the Display Manager. .SH BEHAVIOR -The module detected on shares privilege accesss, and maintain a security dialog +The module detected on shares privilege access, and maintain a security dialog that ask for the user's key need for access over another machine host. .P This module are very early stage, and not enabled by default, so you must added a env @@ -38,7 +38,7 @@ by the \fBlxqt\-settings\fR application as \fISSH_ASKPASS=\fR with \fBlxqt\-openssh\-askpass\fR value, openssl and openssh-client packages must be required. .SH AUTOSTART The module only are showed on \fBLXQt\fR desktop, but u can create an autostart action -for you prefered desktop environment. +for you preferred desktop environment. .SH "REPORTING BUGS" Report bugs to https://github.com/LXDE/LXQt/issues .SH "SEE ALSO" diff --git a/src/main.cpp b/src/main.cpp index a664e6e..b324293 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -31,7 +31,7 @@ int main(int argc, char *argv[]) { - LxQt::Application a(argc, argv); + LXQt::Application a(argc, argv); // TODO/FIXME: maybe a better algorithm? QString prompt; diff --git a/translations/lxqt-openssh-askpass_el.ts b/translations/lxqt-openssh-askpass_el.ts new file mode 100644 index 0000000..8c7cc78 --- /dev/null +++ b/translations/lxqt-openssh-askpass_el.ts @@ -0,0 +1,22 @@ + + + + + MainWindow + + OpenSSH Authentication Passphrase request + Αίτηση συνθηματικού ταυτοποίησης OpenSSH + + + Enter your SSH passphrase for request: + Εισαγάγετε το συνθηματικό σας SSH για αίτηση: + + + + QObject + + unknown request + άγνωστη αίτηση + + + From 71697688d5c29af5fdf7afc8c857eda169f77ee0 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:34:29 +0800 Subject: [PATCH 3/6] Update maintainer email --- debian/control | 2 +- debian/copyright | 2 +- debian/patches/manpage-improvement.patch | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index ffe4d48..d755fc2 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: lxqt-openssh-askpass Maintainer: LXQt Packaging Team Uploaders: Alf Gaida , - ChangZhuo Chen (陳昌倬) , + ChangZhuo Chen (陳昌倬) , Andrew Lee (李健秋) , Yukiharu YABUKI Section: x11 diff --git a/debian/copyright b/debian/copyright index 653d2be..edb477e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -9,7 +9,7 @@ License: LGPL-2.1+ Files: debian/* Copyright: 2014-2015 Alf Gaida - 2015 ChangZhuo Chen (陳昌倬) + 2015 ChangZhuo Chen (陳昌倬) 2015 Andrew Lee (李健秋) 2015 Yukiharu YABUKI License: LGPL-2.1+ diff --git a/debian/patches/manpage-improvement.patch b/debian/patches/manpage-improvement.patch index cc2dc14..6ce8a6e 100644 --- a/debian/patches/manpage-improvement.patch +++ b/debian/patches/manpage-improvement.patch @@ -8,7 +8,7 @@ Description: lxqt-openssh-askpass (0.9.0+20150817-1) unstable; urgency=low . * Initial release (Closes: #747603) -Author: ChangZhuo Chen (陳昌倬) +Author: ChangZhuo Chen (陳昌倬) Bug-Debian: https://bugs.debian.org/747603 --- From 64d4ba8fe16349a08be6812ec1746d4cfac52563 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Fri, 25 Sep 2015 00:40:06 +0200 Subject: [PATCH 4/6] Switched to experimental because of LXQt namespace change Added minimum version for liblxqt0-dev (>= 0.9.0+20150911) Cleaned up .gitignore --- debian/.gitignore | 2 -- debian/changelog | 7 +++++-- debian/control | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/debian/.gitignore b/debian/.gitignore index 10cc394..a803ffc 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -5,5 +5,3 @@ /lxqt-openssh-askpass/ /lxqt-openssh-askpass-dbg/ -/lxqt-openssh-askpass-qt5/ -/lxqt-openssh-askpass-qt5-dbg/ diff --git a/debian/changelog b/debian/changelog index 8c732fe..50db5c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,13 @@ -lxqt-openssh-askpass (0.9.0+20150830-1) unstable; urgency=medium +lxqt-openssh-askpass (0.9.0+20150830-1) experimental; urgency=medium * Cherry-picking upstream version 0.9.0+20150830. * Removed typo.patch, applied upstream * Added upstream signing key and used it in watch file + * Cleaned up .gitignore + * Switched to experimental because of LXQt namespace change + * Added minimum version for liblxqt0-dev (>= 0.9.0+20150911) - -- Alf Gaida Wed, 02 Sep 2015 23:38:08 +0200 + -- Alf Gaida Fri, 25 Sep 2015 00:39:37 +0200 lxqt-openssh-askpass (0.9.0+20150817-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index d755fc2..2fe27e2 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Priority: optional Build-Depends: debhelper (>= 9), cmake (>= 3.0.2), libkf5windowsystem-dev, - liblxqt0-dev, + liblxqt0-dev (>= 0.9.0+20150911), libqt5x11extras5-dev, libqt5xdg-dev, libx11-dev, From 5ae23944e975cb5f7f6cb8cda8e4c1442bc2e9f3 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Fri, 30 Oct 2015 21:00:03 +0100 Subject: [PATCH 5/6] Adding upstream version 0.9.0+20151017. Added minimum version for liblxqt and libqtxdg Remove typo patch, applied upstream --- debian/changelog | 8 ++--- debian/control | 4 +-- debian/copyright | 4 +-- debian/patches/manpage-improvement.patch | 39 ------------------------ debian/patches/series | 1 - man/lxqt-openssh-askpass.1 | 22 ++++++------- 6 files changed, 19 insertions(+), 59 deletions(-) delete mode 100644 debian/patches/manpage-improvement.patch delete mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index 50db5c5..edfd70f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,13 @@ -lxqt-openssh-askpass (0.9.0+20150830-1) experimental; urgency=medium +lxqt-openssh-askpass (0.9.0+20151017-1) experimental; urgency=medium - * Cherry-picking upstream version 0.9.0+20150830. + * Cherry-picking upstream version 0.9.0+20151017. * Removed typo.patch, applied upstream * Added upstream signing key and used it in watch file * 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 00:39:37 +0200 + -- Alf Gaida Fri, 30 Oct 2015 20:56:24 +0100 lxqt-openssh-askpass (0.9.0+20150817-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index 2fe27e2..6570fb2 100644 --- a/debian/control +++ b/debian/control @@ -9,9 +9,9 @@ Priority: optional Build-Depends: debhelper (>= 9), cmake (>= 3.0.2), libkf5windowsystem-dev, - liblxqt0-dev (>= 0.9.0+20150911), + liblxqt0-dev (>= 0.9.0+20151026), libqt5x11extras5-dev, - libqt5xdg-dev, + libqt5xdg-dev (>= 1.3.0), libx11-dev, pkg-config, qttools5-dev, diff --git a/debian/copyright b/debian/copyright index edb477e..a93fb0e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -9,9 +9,9 @@ License: LGPL-2.1+ Files: debian/* Copyright: 2014-2015 Alf Gaida - 2015 ChangZhuo Chen (陳昌倬) + 2015 ChangZhuo Chen (陳昌倬) 2015 Andrew Lee (李健秋) - 2015 Yukiharu YABUKI + 2015 Yukiharu YABUKI License: LGPL-2.1+ License: LGPL-2.1+ diff --git a/debian/patches/manpage-improvement.patch b/debian/patches/manpage-improvement.patch deleted file mode 100644 index 6ce8a6e..0000000 --- a/debian/patches/manpage-improvement.patch +++ /dev/null @@ -1,39 +0,0 @@ -Description: - TODO: Put a short summary on the line above and replace this paragraph - with a longer explanation of this change. Complete the meta-information - with other relevant fields (see below for details). To make it easier, the - information below has been extracted from the changelog. Adjust it or drop - it. - . - lxqt-openssh-askpass (0.9.0+20150817-1) unstable; urgency=low - . - * Initial release (Closes: #747603) -Author: ChangZhuo Chen (陳昌倬) -Bug-Debian: https://bugs.debian.org/747603 - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: https://bugs.debian.org/ -Bug-Ubuntu: https://launchpad.net/bugs/ -Forwarded: -Reviewed-By: -Last-Update: - ---- lxqt-openssh-askpass-0.9.0+20150817.orig/man/lxqt-openssh-askpass.1 -+++ lxqt-openssh-askpass-0.9.0+20150817/man/lxqt-openssh-askpass.1 -@@ -30,8 +30,8 @@ environments, and their names are self-d - by hand but automatically, when choosing a \fBLXQt\fR session in the Display - Manager. - .SH BEHAVIOR --The module detected on shares privilege access, and maintain a security dialog --that ask for the user's key need for access over another machine host. -+The module detected on shares privilege access, and maintain a security dialog -+ that ask for the user's key need for access over another machine host. - .P - This module are very early stage, and not enabled by default, so you must added a env - by the \fBlxqt\-settings\fR application as \fISSH_ASKPASS=\fR diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 4d44891..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -manpage-improvement.patch diff --git a/man/lxqt-openssh-askpass.1 b/man/lxqt-openssh-askpass.1 index 04411ff..07d1212 100644 --- a/man/lxqt-openssh-askpass.1 +++ b/man/lxqt-openssh-askpass.1 @@ -1,17 +1,17 @@ .TH lxqt-openssh-askpass "1" "September 2012" "LXQt\ 0.5.0" "LXQt\ Module" .SH NAME -lxqt-openssh-askpass \- Password access over ssh module of \fBLXQt\fR: the faster and lighter QT Desktop Environment +lxqt-openssh-askpass \- Password access over ssh module of \fBLXQt\fR: the faster and lighter Qt Desktop Environment .SH SYNOPSIS .B lxqt-openssh-askpass [\fICurrently No command line arguments\fR] .br .SH DESCRIPTION This module handles openssh security password access for \fBLXQt\fR. The openssh askpass module, will perform -security tast over scale access privilegies. +security tasks over scale access privileges. .P .P The \fBLXQt modules\fR are desktop independent tools, -and operate as daemons for the local user for desktop specific operations. +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 technologies, ships several core desktop components, all of which are optional: @@ -30,28 +30,28 @@ environments, and their names are self-descriptive. They are usually not launch by hand but automatically, when choosing a \fBLXQt\fR session in the Display Manager. .SH BEHAVIOR -The module detected on shares privilege access, and maintain a security dialog -that ask for the user's key need for access over another machine host. +The module detected on shares privilege access, and maintains a security dialog +that asks for the user's key needed for access over another machine host. .P -This module are very early stage, and not enabled by default, so you must added a env +This module is very early stage, and not enabled by default, so you must added an env by the \fBlxqt\-settings\fR application as \fISSH_ASKPASS=\fR with \fBlxqt\-openssh\-askpass\fR value, openssl and openssh-client packages must be required. .SH AUTOSTART -The module only are showed on \fBLXQt\fR desktop, but u can create an autostart action -for you preferred desktop environment. +The module is only showed on \fBLXQt\fR desktop, but you can create an autostart action +for your preferred desktop environment. .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 +\fBLXQt\fR has been tailored for users who value simplicity, speed, and an intuitive interface, also intended for less powerful machines. See also: .\" 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 -\fBlxqt-policykit-agent.1\fR LXQt plolicykit agent module for privilegie scalation. +\fBlxqt-policykit-agent.1\fR LXQt policykit agent module for privilege scalation .P \fBlxqt-config-session.1\fR LXQt application for performing session autostart applications .P .SH AUTHOR This manual page was created by \fBPICCORO Lenz McKAY\fR \fI\fR -for project and VENENUX GNU/Linux but can be used by others. +for a project and VENENUX GNU/Linux but can be used by others. From d8e69b4c005388f8e2d3c1826c649a601c635af6 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Wed, 4 Nov 2015 01:26:17 +0100 Subject: [PATCH 6/6] Cherry-picking upstream version 0.10.0. Set minimum version for liblxqt and libqtxdg fix debian/docs --- COPYING => LICENSE | 41 ++++++++++------------ README | 13 ------- README.md | 13 +++++++ debian/changelog | 8 +++++ debian/control | 2 +- debian/docs | 2 +- translations/lxqt-openssh-askpass.ts | 5 ++- translations/lxqt-openssh-askpass_de.ts | 5 ++- translations/lxqt-openssh-askpass_el.ts | 3 ++ translations/lxqt-openssh-askpass_pt.ts | 5 ++- translations/lxqt-openssh-askpass_ru.ts | 3 ++ translations/lxqt-openssh-askpass_ru_RU.ts | 3 ++ 12 files changed, 63 insertions(+), 40 deletions(-) rename COPYING => LICENSE (96%) delete mode 100644 README create mode 100644 README.md 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/README b/README deleted file mode 100644 index 9e34849..0000000 --- a/README +++ /dev/null @@ -1,13 +0,0 @@ -This is a very small helper app for ssh-agent. - -Example setup: - -- run the lxqt-config-session. -- add new item into the "Environment (Advanced)" - SSH_ASKPASS=lxqt-openssh-askpass --if you want to register your keys on session startup add new item to "Autostart" tab. For example: - name: ssh-add - command: ssh-add - wait for system tray: false -- logout/login/enjoy - diff --git a/README.md b/README.md new file mode 100644 index 0000000..77abf6e --- /dev/null +++ b/README.md @@ -0,0 +1,13 @@ +# lxqt-openssh-askpass + +This is a very small helper app for ssh-agent. + +Example setup: + +- Run the lxqt-config-session. +- Add new item into the "Environment (Advanced)": `SSH_ASKPASS=lxqt-openssh-askpass` +- If you want to register your keys on session startup add new item to "Autostart" tab. For example: + - name: ssh-add + - command: ssh-add + - wait for system tray: false +- logout/login/enjoy diff --git a/debian/changelog b/debian/changelog index edfd70f..6819ef6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +lxqt-openssh-askpass (0.10.0-1) experimental; urgency=medium + + * Cherry-picking upstream version 0.10.0. + * Set minimum versions for libqtxdg and liblxqt + * fix debian/docs (README -> README.md) + + -- Alf Gaida Wed, 04 Nov 2015 01:24:13 +0100 + lxqt-openssh-askpass (0.9.0+20151017-1) experimental; urgency=medium * Cherry-picking upstream version 0.9.0+20151017. diff --git a/debian/control b/debian/control index 6570fb2..b89eecd 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Priority: optional Build-Depends: debhelper (>= 9), cmake (>= 3.0.2), libkf5windowsystem-dev, - liblxqt0-dev (>= 0.9.0+20151026), + liblxqt0-dev (>= 0.10.0), libqt5x11extras5-dev, libqt5xdg-dev (>= 1.3.0), libx11-dev, diff --git a/debian/docs b/debian/docs index 6f12db5..0b6e0f3 100644 --- a/debian/docs +++ b/debian/docs @@ -1,2 +1,2 @@ AUTHORS -README +README.md diff --git a/translations/lxqt-openssh-askpass.ts b/translations/lxqt-openssh-askpass.ts index 5f812b7..33daa70 100644 --- a/translations/lxqt-openssh-askpass.ts +++ b/translations/lxqt-openssh-askpass.ts @@ -1,13 +1,15 @@ - + MainWindow + OpenSSH Authentication Passphrase request + Enter your SSH passphrase for request: @@ -15,6 +17,7 @@ QObject + unknown request diff --git a/translations/lxqt-openssh-askpass_de.ts b/translations/lxqt-openssh-askpass_de.ts index 1753fb6..16f0bca 100644 --- a/translations/lxqt-openssh-askpass_de.ts +++ b/translations/lxqt-openssh-askpass_de.ts @@ -1,13 +1,15 @@ - + MainWindow + OpenSSH Authentication Passphrase request Abfrage der OpenSSH Authentisierungs-Passphrase + Enter your SSH passphrase for request: SSH-Passphrase eingeben: @@ -15,6 +17,7 @@ QObject + unknown request Unbekannte Abfrage diff --git a/translations/lxqt-openssh-askpass_el.ts b/translations/lxqt-openssh-askpass_el.ts index 8c7cc78..10f9e22 100644 --- a/translations/lxqt-openssh-askpass_el.ts +++ b/translations/lxqt-openssh-askpass_el.ts @@ -4,10 +4,12 @@ MainWindow + OpenSSH Authentication Passphrase request Αίτηση συνθηματικού ταυτοποίησης OpenSSH + Enter your SSH passphrase for request: Εισαγάγετε το συνθηματικό σας SSH για αίτηση: @@ -15,6 +17,7 @@ QObject + unknown request άγνωστη αίτηση diff --git a/translations/lxqt-openssh-askpass_pt.ts b/translations/lxqt-openssh-askpass_pt.ts index 5c89c68..8d3ed5b 100644 --- a/translations/lxqt-openssh-askpass_pt.ts +++ b/translations/lxqt-openssh-askpass_pt.ts @@ -1,13 +1,15 @@ - + MainWindow + OpenSSH Authentication Passphrase request Pedido de senha de autenticação OpenSSH + Enter your SSH passphrase for request: Escreva a sua senha SSH para o pedido: @@ -15,6 +17,7 @@ QObject + unknown request pedido desconhecido diff --git a/translations/lxqt-openssh-askpass_ru.ts b/translations/lxqt-openssh-askpass_ru.ts index 307fe99..d8f0779 100644 --- a/translations/lxqt-openssh-askpass_ru.ts +++ b/translations/lxqt-openssh-askpass_ru.ts @@ -4,10 +4,12 @@ MainWindow + OpenSSH Authentication Passphrase request Запрос пароля для аутентификации по OpenSSH + Enter your SSH passphrase for request: Введите ваш SSH-пароль для запроса: @@ -15,6 +17,7 @@ QObject + unknown request неизвестный запрос diff --git a/translations/lxqt-openssh-askpass_ru_RU.ts b/translations/lxqt-openssh-askpass_ru_RU.ts index 8f75a7b..f87b6d5 100644 --- a/translations/lxqt-openssh-askpass_ru_RU.ts +++ b/translations/lxqt-openssh-askpass_ru_RU.ts @@ -4,10 +4,12 @@ MainWindow + OpenSSH Authentication Passphrase request Запрос пароля для аутентификации по OpenSSH + Enter your SSH passphrase for request: Введите ваш SSH-пароль для запроса: @@ -15,6 +17,7 @@ QObject + unknown request неизвестный запрос