Cherry-picking upstream release 0.11.1.

* Removed build dependencies:
  - cmake
  - libqt5xdg-dev
  - pkg-config
  - qttools5-dev
  - qttools5-dev-tools
* Added build dependency lxqt-build-tools (>= 0.3.0)
* Added dependency openbox
* fixed gbp branch to debian/sid

.gitignore

@@ -1,3 +0,0 @@
-build
-*.kdev4
-src/translations/obconf-qt

CHANGELOG

@@ -1,7 +1,18 @@
 
-obconf-qt-0.11.0 / 2016-09-24
+obconf-qt-0.11.1 / 2016-12-11
 =============================
 
+  * Create obconf-qt_fr.desktop
+  * Use the LXQtCompilerSettings
+  * Use lxqt-build-tools translation modules
+  * Use the new lxqt-build-tools package
+  * Remove cpack (#22)
+  * README.md: Update dependencies
+
+0.11.0 / 2016-09-24
+===================
+
+  * Release 0.11.0: Add changelog
   * Bump version to 0.2.0 (#20)
   * Extend README.md
   * occured -> occurred

CMakeLists.txt

@@ -1,14 +1,13 @@
 project(obconf-qt)
 # newer cmake is required for CMAKE_AUTOMOC Qt support
-cmake_minimum_required(VERSION 2.8.6)
+cmake_minimum_required(VERSION 2.8.12)
 
 find_program(SED_PROGRAM sed)
 
-# additional cmake files
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
-
 include(GNUInstallDirs)
 
+set(LXQTBT_MINIMUM_VERSION "0.1.0")
+
 # Support Qt4 for the time being
 option(USE_QT4 "Build with Qt4." $ENV{USE_QT4})
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
@@ -27,8 +26,7 @@ else()
   message(STATUS "Building with Qt${Qt5Core_VERSION_STRING}")
 endif()
 
-#Note: no run-time dependency on liblxqt, just a build dependency for lxqt_translate_ts/desktop
+find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED)
-find_package(lxqt REQUIRED)
 
 find_package(PkgConfig)
 pkg_check_modules(GLIB REQUIRED
@@ -40,6 +38,10 @@ pkg_check_modules(OPENBOX REQUIRED
   obt-3.5
 )
 
+include(LXQtTranslateTs)
+include(LXQtTranslateDesktop)
+include(LXQtCompilerSettings)
+
 # add src subdirectory
 add_subdirectory(src)
 
@@ -48,19 +50,3 @@ install(
   FILES data/obconf-qt.png
   DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/48x48/apps"
 )
-
-# building tarball with CPack -------------------------------------------------
-# To create a source distribution, type:
-# make package_source
-include (InstallRequiredSystemLibraries)
-set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
-set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
-set (CPACK_PACKAGE_VENDOR "")
-set (CPACK_PACKAGE_VERSION_MAJOR "0")
-set (CPACK_PACKAGE_VERSION_MINOR "2")
-set (CPACK_PACKAGE_VERSION_PATCH "0")
-set (CPACK_GENERATOR TBZ2)
-set (CPACK_SOURCE_GENERATOR TBZ2)
-set (CPACK_SOURCE_IGNORE_FILES /build/;.gitignore;.*~;.git;.kdev4;temp)
-# set (CPACK_SOURCE_PACKAGE_FILE_NAME pcmanfm-qt.0.1.0.tar.gz)
-include (CPack)

README.md

@@ -10,8 +10,8 @@ It is maintained by the LXQt project but can be used independently from this des
 
 ### Compiling source code
 
-Runtime dependencies are xkbcommon, qtx11extras, xdg-utils, hicolor-icon-theme and Openbox.   
+Runtime dependencies are Qt X11 Extras, gtk-update-icon-cache, hicolor-icon-theme and Openbox.   
-Additional build dependencies are CMake and optionally Git to pull latest VCS checkouts. The localization files were outsourced to repository [lxqt-l10n](https://github.com/lxde/lxqt-l10n) so the corresponding dependencies are needed, too. Please refer to this repository's `README.md` for further information.   
+Additional build dependencies are CMake and [liblxqt](https://github.com/lxde/liblxqt), optionally Git to pull latest VCS checkouts. The localization files were outsourced to repository [lxqt-l10n](https://github.com/lxde/lxqt-l10n) so the corresponding dependencies are needed, too. Please refer to this repository's `README.md` for further information.   
 
 Code configuration is handled by CMake. CMake variable `CMAKE_INSTALL_PREFIX` has to be set to `/usr` on most operating systems.   
 

cmake/LXQtTranslateDesktop.cmake

@@ -1,107 +0,0 @@
-#=============================================================================
-# The lxqt_translate_desktop() function was copied from the the
-# LXQt LxQtTranste.cmake
-#
-# Original Author: Alexander Sokolov <sokoloff.a@gmail.com>
-#
-# funtion lxqt_translate_desktop(_RESULT
-#                           SOURCES <sources>
-#                           [TRANSLATION_DIR] translation_directory
-#                    )
-#     Output:
-#       _RESULT The generated .desktop (.desktop) files
-#
-#     Input:
-#
-#       SOURCES List of input desktop files (.destktop.in) to be translated
-#               (merged), relative to the CMakeList.txt.
-#
-#       TRANSLATION_DIR Optional path to the directory with the .ts files,
-#                        relative to the CMakeList.txt. Defaults to
-#                        "translations".
-#
-#=============================================================================
-
-function(lxqt_translate_desktop _RESULT)
-    # Parse arguments ***************************************
-    set(oneValueArgs TRANSLATION_DIR)
-    set(multiValueArgs SOURCES)
-
-    cmake_parse_arguments(_ARGS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-    # check for unknown arguments
-    set(_UNPARSED_ARGS ${_ARGS_UNPARSED_ARGUMENTS})
-    if (NOT ${_UNPARSED_ARGS} STREQUAL "")
-        MESSAGE(FATAL_ERROR
-          "Unknown arguments '${_UNPARSED_ARGS}'.\n"
-          "See lxqt_translate_desktop() documenation for more information.\n"
-        )
-    endif()
-
-    if (NOT DEFINED _ARGS_SOURCES)
-        set(${_RESULT} "" PARENT_SCOPE)
-        return()
-    else()
-        set(_sources ${_ARGS_SOURCES})
-    endif()
-
-    if (NOT DEFINED _ARGS_TRANSLATION_DIR)
-        set(_translationDir "translations")
-    else()
-        set(_translationDir ${_ARGS_TRANSLATION_DIR})
-    endif()
-
-
-    get_filename_component (_translationDir ${_translationDir} ABSOLUTE)
-
-    foreach (_inFile ${_sources})
-        get_filename_component(_inFile   ${_inFile} ABSOLUTE)
-        get_filename_component(_fileName ${_inFile} NAME_WE)
-        #Extract the real extension ............
-        get_filename_component(_fileExt  ${_inFile} EXT)
-        string(REPLACE ".in" "" _fileExt ${_fileExt})
-        #.......................................
-        set(_outFile "${CMAKE_CURRENT_BINARY_DIR}/${_fileName}${_fileExt}")
-
-        file(GLOB _translations
-            ${_translationDir}/${_fileName}_*${_fileExt}
-            ${_translationDir}/local/${_fileName}_*${_fileExt}
-        )
-
-        set(_pattern "'\\[.*]\\s*='")
-        if (_translations)
-            add_custom_command(OUTPUT ${_outFile}
-                COMMAND grep -v -a "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile}
-                COMMAND grep -h -a ${_pattern} ${_translations} >> ${_outFile}
-                COMMENT "Generating ${_fileName}${_fileExt}"
-            )
-        else()
-            add_custom_command(OUTPUT ${_outFile}
-                COMMAND grep -v -a "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile}
-                COMMENT "Generating ${_fileName}${_fileExt}"
-            )
-        endif()
-
-        set(__result ${__result} ${_outFile})
-
-
-        # TX file ***********************************************
-        set(_txFile "${CMAKE_BINARY_DIR}/tx/${_fileName}${_fileExt}.tx.sh")
-        string(REPLACE "${CMAKE_SOURCE_DIR}/" "" _tx_translationDir ${_translationDir})
-        string(REPLACE "${CMAKE_SOURCE_DIR}/" "" _tx_inFile ${_inFile})
-        string(REPLACE "." "" _fileType ${_fileExt})
-
-        file(WRITE ${_txFile}
-            "[ -f ${_inFile} ] || exit 0\n"
-            "echo '[lxde-qt.${_fileName}_${_fileType}]'\n"
-            "echo 'type = DESKTOP'\n"
-            "echo 'source_lang = en'\n"
-            "echo 'source_file = ${_tx_inFile}'\n"
-            "echo 'file_filter = ${_tx_translationDir}/${_fileName}_<lang>${_fileExt}'\n"
-            "echo ''\n"
-        )
-
-    endforeach()
-
-    set(${_RESULT} ${__result} PARENT_SCOPE)
-endfunction(lxqt_translate_desktop)

debian/changelog

@@ -1,3 +1,18 @@
+obconf-qt (0.11.1-1) unstable; urgency=medium
+
+  * Cherry-picking upstream release 0.11.1.
+  * Removed build dependencies:
+    - cmake
+    - libqt5xdg-dev
+    - pkg-config
+    - qttools5-dev
+    - qttools5-dev-tools
+  * Added build dependency lxqt-build-tools (>= 0.3.0)
+  * Added dependency openbox
+  * fixed gbp branch to debian/sid
+
+ -- Alf Gaida <agaida@siduction.org>  Sun, 11 Dec 2016 20:12:06 +0100
+
 obconf-qt (0.11.0-2) unstable; urgency=medium
 
   * Cherry-picking upstream release 0.11.0.

debian/control

@@ -6,16 +6,12 @@ Uploaders: Alf Gaida <agaida@siduction.org>,
 Section: utils
 Priority: optional
 Build-Depends: debhelper (>= 10),
-               cmake (>= 3.0.2),
                libkf5windowsystem-dev,
                liblxqt0-dev (>= 0.11.0),
                libqt5svg5-dev,
                libqt5x11extras5-dev,
-               libqt5xdg-dev (>= 2.0.0),
+               lxqt-build-tools (>= 0.3.0),
-               openbox-dev,
+               openbox-dev
-               pkg-config,
-               qttools5-dev,
-               qttools5-dev-tools
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/obconf-qt.git/?h=debian/sid
 Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/obconf-qt.git -b debian/sid
@@ -24,7 +20,8 @@ Homepage: https://github.com/lxde/obconf-qt
 Package: obconf-qt
 Architecture: any
 Depends: ${misc:Depends},
-         ${shlibs:Depends}
+         ${shlibs:Depends},
+         openbox
 Recommends: obconf-qt-l10n
 Description: Openbox configuration with a Qt interface
  obconf-qt is an utility to configure openbox with a Qt interface.

debian/gbp.conf

@@ -1,5 +1,5 @@
 [DEFAULT]
-debian-branch = debian/experimental
+debian-branch = debian/sid
 upstream-branch = upstream/latest
 pristine-tar = True
 

src/CMakeLists.txt

@@ -1,5 +1,5 @@
 # set visibility to hidden to hide symbols, unlesss they're exporeted manually in the code
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_KEYWORDS -fno-exceptions")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_KEYWORDS")
 
 if(USE_QT4)
     set(QTX_INCLUDE_DIRS ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTDBUS_DIR})
@@ -57,7 +57,6 @@ add_custom_command(
 
 # add translation for obconf-qt
 option (UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF)
-include(LXQtTranslateTs)
 lxqt_translate_ts(QM_FILES
   USE_QT4
     ${USE_QT4}
@@ -79,7 +78,6 @@ lxqt_translate_ts(QM_FILES
 )
 
 # install a desktop entry file
-include(LXQtTranslateDesktop)
 lxqt_translate_desktop(DESKTOP_FILES
     TRANSLATION_DIR "translations"
     SOURCES obconf-qt.desktop.in

src/translations/obconf-qt_fr.desktop

@@ -0,0 +1,3 @@
+Name[fr]=Gestionnaire de fenêtres Openbox
+GenericName[fr]=Paramétrage de Openbox
+Comment[fr]=Paramétrage du gestionnaire de fenêtres Openbox (Version Qt)