Cherry-picking upstream release 0.11.1.

* Removed some build dependencies
  - cmake
  - liblxqt0-dev
  - libqt5xdg-dev
  - libqt5xdgiconloader-dev
  - pkg-config
  - qttools5-dev
  - qttools5-dev-tools
* Added build dependency lxqt-build-tools (>= 0.3.0)

.gitignore

@@ -1,2 +0,0 @@
-build
-*.kdev4

CHANGELOG

@@ -1,7 +1,15 @@
 
-lxqt-qtplugin-0.11.0 / 2016-09-24
+lxqt-qtplugin-0.11.1 / 2016-12-11
 =================================
 
+  * Use lxqt-build-tools
+  * Use the new lxqt-build-tools package
+  * Remove cpack (#14)
+
+0.11.0 / 2016-09-24
+===================
+
+  * Release 0.11.0: Add changelog
   * Add Qt5XdgIconLoader as dependency (#13)
   * Update README.md
   * statusnotifieritem: Correctly handle menu

CMakeLists.txt

@@ -1,28 +1,25 @@
 cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)
 project(lxqt-qtplugin)
 
+include(GNUInstallDirs)
+
+set(LXQTBT_MINIMUM_VERSION "0.1.0")
+
+set(CMAKE_AUTOMOC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-set(CMAKE_AUTOMOC ON)
 
 find_package(Qt5Widgets REQUIRED QUIET)
 find_package(Qt5LinguistTools REQUIRED QUIET)
 find_package(Qt5DBus REQUIRED QUIET)
 find_package(dbusmenu-qt5 REQUIRED QUIET)
-
+find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED)
-find_package(lxqt REQUIRED QUIET)
 find_package(Qt5XdgIconLoader REQUIRED QUIET)
 
 include(LXQtCompilerSettings NO_POLICY_SCOPE)
 
-add_subdirectory(src)
+if(NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE Release)
+endif()
 
-# building tarball with CPack -------------------------------------------------
+add_subdirectory(src)
-include(InstallRequiredSystemLibraries)
-set(CPACK_PACKAGE_VERSION_MAJOR ${LXQT_MAJOR_VERSION})
-set(CPACK_PACKAGE_VERSION_MINOR ${LXQT_MINOR_VERSION})
-set(CPACK_PACKAGE_VERSION_PATCH ${LXQT_PATCH_VERSION})
-set(CPACK_GENERATOR TBZ2)
-set(CPACK_SOURCE_GENERATOR TBZ2)
-set(CPACK_SOURCE_IGNORE_FILES /build/;.gitignore;.*~;.git;.kdev4;temp)
-include(CPack)

debian/changelog

@@ -1,3 +1,18 @@
+lxqt-qtplugin (0.11.1-1) unstable; urgency=medium
+
+  * Cherry-picking upstream release 0.11.1.
+  * Removed some build dependencies
+    - cmake
+    - liblxqt0-dev
+    - libqt5xdg-dev
+    - libqt5xdgiconloader-dev
+    - pkg-config
+    - qttools5-dev
+    - qttools5-dev-tools
+  * Added build dependency lxqt-build-tools (>= 0.3.0)
+
+ -- Alf Gaida <agaida@siduction.org>  Mon, 12 Dec 2016 01:38:34 +0100
+
 lxqt-qtplugin (0.11.0-3) unstable; urgency=medium
 
   * Cherry-picking upstream release 0.11.0.

debian/control

@@ -6,19 +6,13 @@ Uploaders: Alf Gaida <agaida@siduction.org>,
 Section: x11
 Priority: optional
 Build-Depends: debhelper (>= 10),
-               cmake (>= 3.0.2),
                libdbusmenu-qt5-dev,
                libkf5windowsystem-dev,
-               liblxqt0-dev (>= 0.11.0),
                libqt5svg5-dev,
                libqt5x11extras5-dev,
-               libqt5xdg-dev (>= 2.0.0),
-               libqt5xdgiconloader-dev,
                libx11-dev,
-               pkg-config,
+               lxqt-build-tools (>= 0.3.0),
                qtbase5-private-dev,
-               qttools5-dev,
-               qttools5-dev-tools
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/lxqt-qtplugin.git/?h=debian/sid
 Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-qtplugin.git -b debian/sid

src/CMakeLists.txt

@@ -30,7 +30,6 @@ target_link_libraries(qtlxqt
     Qt5::Widgets
     Qt5::DBus
     dbusmenu-qt5
-    lxqt
     Qt5XdgIconLoader
 )