Cherry-picking upstream version 0.10.0.

Set minimum version for liblxqt and libqtxdg
2015-11-04 17:13:10 +01:00 · 2015-11-04 17:13:10 +01:00 · fb68e50814
commit fb68e50814
parent 37a2d5653a
9 changed files with 113 additions and 56 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1 @@
+build
--- a/41
+++ b/41
@ -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.
--- 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 <agaida@siduction.org>  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.
--- 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),
--- a/debian/copyright
+++ b/debian/copyright
@ -9,7 +9,7 @@ License: LGPL-2.1+

 Files: debian/*
 Copyright: 2014-2015 Alf Gaida <agaida@siduction.org>
-           2015 Yukiharu YABUKI <yyabuki@debian.org>
+           2015      Yukiharu YABUKI <yyabuki@debian.org>
 License: LGPL-2.1+

 License: LGPL-2.1+
--- a/translations/lxqt-policykit-agent_hu.ts
+++ b/translations/lxqt-policykit-agent_hu.ts
@ -1,38 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="en_US">
-<context>
-    <name>PolicykitAgentGUI</name>
-    <message>
-        <source>Authentication Required</source>
-        <translation>Hitelesítés kell</translation>
-    </message>
-    <message>
-        <source>Identity:</source>
-        <translation>Név:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Jelszó:</translation>
-    </message>
-</context>
+<TS version="2.1" language="en_US">
 <context>
    <name>LXQtPolicykit::PolicykitAgent</name>
    <message>
+        <location filename="../src/policykitagent.cpp" line="71"/>
+        <location filename="../src/policykitagent.cpp" line="149"/>
        <source>PolicyKit Information</source>
        <translation>Policykit információ</translation>
    </message>
    <message>
+        <location filename="../src/policykitagent.cpp" line="71"/>
+        <source>Another authentization in progress. Please try it again later.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/policykitagent.cpp" line="132"/>
        <source>Authorization Failed</source>
        <translation>Hitelesítés sikertelen</translation>
    </message>
    <message>
+        <location filename="../src/policykitagent.cpp" line="132"/>
        <source>Authorization failed for some reason</source>
        <translation>Hitelesítés valami miatt sikertelen</translation>
    </message>
    <message>
+        <location filename="../src/policykitagent.cpp" line="144"/>
        <source>PolicyKit Error</source>
        <translation>Policykit hiba</translation>
    </message>
 </context>
+<context>
+    <name>PolicykitAgentGUI</name>
+    <message>
+        <location filename="../src/policykitagentgui.ui" line="14"/>
+        <source>Authentication Required</source>
+        <translation>Hitelesítés kell</translation>
+    </message>
+    <message>
+        <location filename="../src/policykitagentgui.ui" line="55"/>
+        <source>Identity:</source>
+        <translation>Név:</translation>
+    </message>
+    <message>
+        <location filename="../src/policykitagentgui.ui" line="65"/>
+        <source>Password:</source>
+        <translation>Jelszó:</translation>
+    </message>
+</context>
 </TS>
--- a/translations/lxqt-policykit-agent_pt.ts
+++ b/translations/lxqt-policykit-agent_pt.ts
@ -1,38 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="pt">
-<context>
-    <name>PolicykitAgentGUI</name>
-    <message>
-        <source>Authentication Required</source>
-        <translation>Requer autenticação</translation>
-    </message>
-    <message>
-        <source>Identity:</source>
-        <translation>Identidade:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Senha:</translation>
-    </message>
-</context>
+<TS version="2.1" language="pt">
 <context>
    <name>LXQtPolicykit::PolicykitAgent</name>
    <message>
+        <location filename="../src/policykitagent.cpp" line="71"/>
+        <location filename="../src/policykitagent.cpp" line="149"/>
        <source>PolicyKit Information</source>
        <translation>Informaçoes PolicyKit</translation>
    </message>
    <message>
+        <location filename="../src/policykitagent.cpp" line="71"/>
+        <source>Another authentization in progress. Please try it again later.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/policykitagent.cpp" line="132"/>
        <source>Authorization Failed</source>
        <translation>Falha de autenticação</translation>
    </message>
    <message>
+        <location filename="../src/policykitagent.cpp" line="132"/>
        <source>Authorization failed for some reason</source>
        <translation>A autenticação falhou por alguma razão</translation>
    </message>
    <message>
+        <location filename="../src/policykitagent.cpp" line="144"/>
        <source>PolicyKit Error</source>
        <translation>Erro PolicyKit</translation>
    </message>
 </context>
+<context>
+    <name>PolicykitAgentGUI</name>
+    <message>
+        <location filename="../src/policykitagentgui.ui" line="14"/>
+        <source>Authentication Required</source>
+        <translation>Requer autenticação</translation>
+    </message>
+    <message>
+        <location filename="../src/policykitagentgui.ui" line="55"/>
+        <source>Identity:</source>
+        <translation>Identidade:</translation>
+    </message>
+    <message>
+        <location filename="../src/policykitagentgui.ui" line="65"/>
+        <source>Password:</source>
+        <translation>Senha:</translation>
+    </message>
+</context>
 </TS>
--- a/translations/lxqt-policykit-agent_ru.ts
+++ b/translations/lxqt-policykit-agent_ru.ts
@ -4,18 +4,28 @@
 <context>
    <name>LXQtPolicykit::PolicykitAgent</name>
    <message>
+        <location filename="../src/policykitagent.cpp" line="71"/>
+        <location filename="../src/policykitagent.cpp" line="149"/>
        <source>PolicyKit Information</source>
        <translation>Информация PolicyKit</translation>
    </message>
    <message>
+        <location filename="../src/policykitagent.cpp" line="71"/>
+        <source>Another authentization in progress. Please try it again later.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/policykitagent.cpp" line="132"/>
        <source>Authorization Failed</source>
        <translation>Авторизация не удалась</translation>
    </message>
    <message>
+        <location filename="../src/policykitagent.cpp" line="132"/>
        <source>Authorization failed for some reason</source>
        <translation>Авторизация не удалась по какой-то причине</translation>
    </message>
    <message>
+        <location filename="../src/policykitagent.cpp" line="144"/>
        <source>PolicyKit Error</source>
        <translation>Ошибка PolicyKit</translation>
    </message>
@ -23,14 +33,17 @@
 <context>
    <name>PolicykitAgentGUI</name>
    <message>
+        <location filename="../src/policykitagentgui.ui" line="14"/>
        <source>Authentication Required</source>
        <translation>Требуется аутентификация</translation>
    </message>
    <message>
+        <location filename="../src/policykitagentgui.ui" line="55"/>
        <source>Identity:</source>
        <translation>Идентификация:</translation>
    </message>
    <message>
+        <location filename="../src/policykitagentgui.ui" line="65"/>
        <source>Password:</source>
        <translation>Пароль:</translation>
    </message>
--- a/translations/lxqt-policykit-agent_ru_RU.ts
+++ b/translations/lxqt-policykit-agent_ru_RU.ts
@ -4,18 +4,28 @@
 <context>
    <name>LXQtPolicykit::PolicykitAgent</name>
    <message>
+        <location filename="../src/policykitagent.cpp" line="71"/>
+        <location filename="../src/policykitagent.cpp" line="149"/>
        <source>PolicyKit Information</source>
        <translation>Информация PolicyKit</translation>
    </message>
    <message>
+        <location filename="../src/policykitagent.cpp" line="71"/>
+        <source>Another authentization in progress. Please try it again later.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/policykitagent.cpp" line="132"/>
        <source>Authorization Failed</source>
        <translation>Авторизация не удалась</translation>
    </message>
    <message>
+        <location filename="../src/policykitagent.cpp" line="132"/>
        <source>Authorization failed for some reason</source>
        <translation>Авторизация не удалась по какой-то причине</translation>
    </message>
    <message>
+        <location filename="../src/policykitagent.cpp" line="144"/>
        <source>PolicyKit Error</source>
        <translation>Ошибка PolicyKit</translation>
    </message>
@ -23,14 +33,17 @@
 <context>
    <name>PolicykitAgentGUI</name>
    <message>
+        <location filename="../src/policykitagentgui.ui" line="14"/>
        <source>Authentication Required</source>
        <translation>Требуется аутентификация</translation>
    </message>
    <message>
+        <location filename="../src/policykitagentgui.ui" line="55"/>
        <source>Identity:</source>
        <translation>Идентификация:</translation>
    </message>
    <message>
+        <location filename="../src/policykitagentgui.ui" line="65"/>
        <source>Password:</source>
        <translation>Пароль:</translation>
    </message>