Merge branch 'upstream' into debian

* upstream:
  Imported Upstream version 0.9.0+20150817

CMakeLists.txt

@@ -1,14 +1,18 @@
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)
 project(lxqt-openssh-askpass)
 
 option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF)
 
+include(GNUInstallDirs)
+
 if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE Release)
 endif()
 
 add_definitions(-Wall)
 
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTOUIC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
@@ -17,14 +21,7 @@ find_package(Qt5LinguistTools REQUIRED QUIET)
 
 find_package(lxqt REQUIRED QUIET)
 
-include(${LXQT_USE_FILE})
-
-include_directories (
-    ${LXQT_INCLUDE_DIRS}
-    "${CMAKE_CURRENT_BINARY_DIR}"
-    ${QTX_INCLUDE_DIRS}
-    src
-)
+include(LXQtCompilerSettings NO_POLICY_SCOPE)
 
 set(lxqt-openssh-askpass_HDRS
     src/mainwindow.h
@@ -56,24 +53,22 @@ lxqt_translate_ts(QM_FILES
 lxqt_app_translation_loader(lxqt-openssh_QM_LOADER ${PROJECT_NAME})
 #************************************************
 
-qt5_wrap_cpp(MOCS ${lxqt-openssh-askpass_HDRS})
-qt5_wrap_ui(UIS ${lxqt-openssh-askpass_UIS})
-
 add_executable(lxqt-openssh-askpass
     ${lxqt-openssh-askpass_SRCS}
-    ${UIS}
-    ${RSCS}
     ${TRS}
-    ${MOCS}
     ${QM_FILES}
     ${lxqt-openssh_QM_LOADER}
 )
 target_link_libraries(lxqt-openssh-askpass
     Qt5::Widgets
-    ${LXQT_LIBRARIES}
+    lxqt
 )
 
-INSTALL(TARGETS lxqt-openssh-askpass RUNTIME DESTINATION bin)
+INSTALL(TARGETS
+    lxqt-openssh-askpass
+    RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+    COMPONENT Runtime
+)
 
 
 # building tarball with CPack -------------------------------------------------

man/lxqt-openssh-askpass.1

@@ -1,19 +1,19 @@
-.TH lxqt-openssh-askpass "1" "September 2012" "LxQt\-qt\ 0.5.0" "LxQt\-qt\ 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 \fBLXDE-Qt\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 \fBLXDE-Qt\fR. The openssh askpass module, will perform 
+This module handles openssh security password access for \fBLXQt\fR. The openssh askpass module, will perform 
 security tast over scale accesss privilegies.
 .P
 .P
-The \fBLXDE-Qt modules\fR are desktop independent tools, 
+The \fBLXQt modules\fR are desktop independent tools, 
 and operate as daemons for the local user for desktop specific operations. 
 .P
-\fBLXDE-Qt\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
@@ -27,7 +27,7 @@ technologies, ships several core desktop components, all of which are optional:
 .P
 These components perform similar actions to those available in other desktop
 environments, and their names are self-descriptive.  They are usually not launched
-by hand but automatically, when choosing a \fBLxQt\-qt\fR session in the Display
+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 
@@ -37,20 +37,20 @@ This module are very early stage, and not enabled by default, so you must added
 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 \fBLXDE-Qt\fR desktop, but u can create an autostart action 
+The module only are showed on \fBLXQt\fR desktop, but u can create an autostart action 
 for you prefered desktop environment.
 .SH "REPORTING BUGS"
-Report bugs to https://github.com/LXDE-Qt/LXDE-Qt/issues
+Report bugs to https://github.com/LXDE/LXQt/issues
 .SH "SEE ALSO"
-\fBLXDE-Qt\fR it has been tailored for users who value simplicity, speed, and
+\fBLXQt\fR it 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  LXDE-Qt for manage LXDE-Qt complete environment
+\fBlxqt-session.1\fR  LXQt for manage LXQt complete environment
 .P
-\fBlxqt-policykit-agent.1\fR  LXDE-Qt plolicykit agent module for privilegie scalation.
+\fBlxqt-policykit-agent.1\fR  LXQt plolicykit agent module for privilegie scalation.
 .P
-\fBlxqt-config-session.1\fR  LXDE-Qt application for performing session autostart applications
+\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<mckaygerhard@gmail.com>\fR