Cherry-picking upstream version 0.10.0.

Set minimum version for liblxqt and libqtxdg
fix debian/docs

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
+strategy to use in any particular case, based on the explanations below.
-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
+encourage the widest possible use of a certain library, so that it becomes
-becomes a de-facto standard.  To achieve this, non-free programs must
+a de-facto standard.  To achieve this, non-free programs must be
-be allowed to use the library.  A more frequent case is that a free
+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
+interface definition files, plus the scripts used to control compilation
-compilation and installation of the library.
+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
+    c) Accompany the work with a written offer, valid for at
-    three years, to give the same user the materials specified in
+    least three years, to give the same user the materials
-    Subsection 6a, above, for a charge no more than the cost of
+    specified in Subsection 6a, above, for a charge no more
-    performing this distribution.
+    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
+If any portion of this section is held invalid or unenforceable under any
-any particular circumstance, the balance of the section is intended to
+particular circumstance, the balance of the section is intended to apply,
-apply, and the section as a whole is intended to apply in other
+and the section as a whole is intended to apply in other circumstances.
-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
+original copyright holder who places the Library under this License may add
-may add an explicit geographical distribution limitation excluding those
+an explicit geographical distribution limitation excluding those countries,
-countries, so that distribution is permitted only in or among
+so that distribution is permitted only in or among countries not thus
-countries not thus excluded.  In such case, this License incorporates
+excluded.  In such case, this License incorporates the limitation as if
-the limitation as if written in the body of this License.
+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.

README

@@ -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
-

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

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 <agaida@siduction.org>  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.

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,

debian/docs

@@ -1,2 +1,2 @@
 AUTHORS
-README
+README.md

translations/lxqt-openssh-askpass.ts

@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="en_US">
+<TS version="2.1" language="en_US">
 <context>
     <name>MainWindow</name>
     <message>
+        <location filename="../src/mainwindow.ui" line="14"/>
         <source>OpenSSH Authentication Passphrase request</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../src/mainwindow.ui" line="20"/>
         <source>Enter your SSH passphrase for request:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15,6 +17,7 @@
 <context>
     <name>QObject</name>
     <message>
+        <location filename="../src/main.cpp" line="39"/>
         <source>unknown request</source>
         <translation type="unfinished"></translation>
     </message>

translations/lxqt-openssh-askpass_de.ts

@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="de">
+<TS version="2.1" language="de">
 <context>
     <name>MainWindow</name>
     <message>
+        <location filename="../src/mainwindow.ui" line="14"/>
         <source>OpenSSH Authentication Passphrase request</source>
         <translation>Abfrage der OpenSSH Authentisierungs-Passphrase</translation>
     </message>
     <message>
+        <location filename="../src/mainwindow.ui" line="20"/>
         <source>Enter your SSH passphrase for request:</source>
         <translation>SSH-Passphrase eingeben:</translation>
     </message>
@@ -15,6 +17,7 @@
 <context>
     <name>QObject</name>
     <message>
+        <location filename="../src/main.cpp" line="39"/>
         <source>unknown request</source>
         <translation>Unbekannte Abfrage</translation>
     </message>

translations/lxqt-openssh-askpass_el.ts

@@ -4,10 +4,12 @@
 <context>
     <name>MainWindow</name>
     <message>
+        <location filename="../src/mainwindow.ui" line="14"/>
         <source>OpenSSH Authentication Passphrase request</source>
         <translation>Αίτηση συνθηματικού ταυτοποίησης OpenSSH</translation>
     </message>
     <message>
+        <location filename="../src/mainwindow.ui" line="20"/>
         <source>Enter your SSH passphrase for request:</source>
         <translation>Εισαγάγετε το συνθηματικό σας SSH για αίτηση:</translation>
     </message>
@@ -15,6 +17,7 @@
 <context>
     <name>QObject</name>
     <message>
+        <location filename="../src/main.cpp" line="39"/>
         <source>unknown request</source>
         <translation>άγνωστη αίτηση</translation>
     </message>

translations/lxqt-openssh-askpass_pt.ts

@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="pt">
+<TS version="2.1" language="pt">
 <context>
     <name>MainWindow</name>
     <message>
+        <location filename="../src/mainwindow.ui" line="14"/>
         <source>OpenSSH Authentication Passphrase request</source>
         <translation>Pedido de senha de autenticação OpenSSH</translation>
     </message>
     <message>
+        <location filename="../src/mainwindow.ui" line="20"/>
         <source>Enter your SSH passphrase for request:</source>
         <translation>Escreva a sua senha SSH para o pedido:</translation>
     </message>
@@ -15,6 +17,7 @@
 <context>
     <name>QObject</name>
     <message>
+        <location filename="../src/main.cpp" line="39"/>
         <source>unknown request</source>
         <translation>pedido desconhecido</translation>
     </message>

translations/lxqt-openssh-askpass_ru.ts

@@ -4,10 +4,12 @@
 <context>
     <name>MainWindow</name>
     <message>
+        <location filename="../src/mainwindow.ui" line="14"/>
         <source>OpenSSH Authentication Passphrase request</source>
         <translation>Запрос пароля для аутентификации по OpenSSH</translation>
     </message>
     <message>
+        <location filename="../src/mainwindow.ui" line="20"/>
         <source>Enter your SSH passphrase for request:</source>
         <translation>Введите ваш SSH-пароль для запроса:</translation>
     </message>
@@ -15,6 +17,7 @@
 <context>
     <name>QObject</name>
     <message>
+        <location filename="../src/main.cpp" line="39"/>
         <source>unknown request</source>
         <translation>неизвестный запрос</translation>
     </message>

translations/lxqt-openssh-askpass_ru_RU.ts

@@ -4,10 +4,12 @@
 <context>
     <name>MainWindow</name>
     <message>
+        <location filename="../src/mainwindow.ui" line="14"/>
         <source>OpenSSH Authentication Passphrase request</source>
         <translation>Запрос пароля для аутентификации по OpenSSH</translation>
     </message>
     <message>
+        <location filename="../src/mainwindow.ui" line="20"/>
         <source>Enter your SSH passphrase for request:</source>
         <translation>Введите ваш SSH-пароль для запроса:</translation>
     </message>
@@ -15,6 +17,7 @@
 <context>
     <name>QObject</name>
     <message>
+        <location filename="../src/main.cpp" line="39"/>
         <source>unknown request</source>
         <translation>неизвестный запрос</translation>
     </message>