Cherry-picking upstream version 0.3.2.

* Switched Architecture any --> all

CHANGELOG

@@ -1,7 +1,15 @@
 
-lxqt-build-tools-0.3.1 / 2017-01-01
+lxqt-build-tools-0.3.2 / 2017-01-14
 ===================================
 
+  * Bump version to 0.3.2 - finally the build tools are arch: all (#15)
+  * Warnings (#16)
+  * Remove arched bits from version.cmake-file (#14)
+
+0.3.1 / 2017-01-01
+==================
+
+  * Release 0.3.1: Update changelog
   * Bump LXQT_PATCH_VERSION and build tools version (#13)
   * 32 64 bit ness (#12)
   * Use "gcc-ar" and "gcc-ranlib" tools when building static libs with gcc link-time optimization. (#11)

CMakeLists.txt

@@ -6,8 +6,8 @@ option(WITH_XDG_DIRS_FALLBACK "Use our XDG_CONFIG_DIRS fallback" ON)
 
 set(LXQT_BUILD_TOOLS_MAJOR_VERSION 0)
 set(LXQT_BUILD_TOOLS_MINOR_VERSION 3)
-set(LXQT_BUILD_TOOLS_PATCH_VERSION 1)
+set(LXQT_BUILD_TOOLS_PATCH_VERSION 2)
-set(LXQT_BUILD_TOOLS_VERSION ${LXQT_BUILD_TOOLS_MAJOR_VERSION}.${LXQT_BUILD_TOOLS_MINOR_VERSION}${LXQT_BUILD_TOOLS_PATCH_VERSION})
+set(LXQT_BUILD_TOOLS_VERSION ${LXQT_BUILD_TOOLS_MAJOR_VERSION}.${LXQT_BUILD_TOOLS_MINOR_VERSION}.${LXQT_BUILD_TOOLS_PATCH_VERSION})
 
 set(LXQT_MAJOR_VERSION 0)
 set(LXQT_MINOR_VERSION 11)
@@ -101,10 +101,10 @@ configure_file(
 )
 
 # The package version file is common to superbuild and installable mode
-write_basic_package_version_file(
+configure_file(
-    "${CMAKE_BINARY_DIR}/lxqt-build-tools-config-version.cmake"
+    "${CMAKE_CURRENT_SOURCE_DIR}/lxqt-build-tools-config-version.cmake.in"
-    VERSION ${LXQT_BUILD_TOOLS_VERSION}
+    "${CMAKE_CURRENT_BINARY_DIR}/lxqt-build-tools-config-version.cmake"
-    COMPATIBILITY AnyNewerVersion
+    @ONLY
 )
 
 install(FILES

README.md

@@ -18,4 +18,4 @@ To build run `make`, to install `make install` which accepts variable `DESTDIR`
 
 ## Packagers
 
-Please keep in mind that lxqt-build-tools are arch dependend - the package picks up **32/64bit-ness** at build time of the package - so the package has to be built for the respective architecture, arch: all will **not** fly.
+This package is arch-independent now.  You can simply package it as `BuildArch: noarch` (rpm) or `arch: all` (deb).

cmake/modules/LXQtCompilerSettings.cmake

@@ -103,14 +103,20 @@ endif()
 #-----------------------------------------------------------------------------
 # Common warning flags
 #-----------------------------------------------------------------------------
-set(__LXQT_COMMON_WARNING_FLAGS "-Wall")
+set(__LXQT_COMMON_WARNING_FLAGS "-Wall -Wextra -Wchar-subscripts -Wno-long-long -Wpointer-arith -Wundef -Wformat-security")
 
 
 #-----------------------------------------------------------------------------
 # Warning flags
 #-----------------------------------------------------------------------------
 if (CMAKE_COMPILER_IS_GNUCXX OR LXQT_COMPILER_IS_CLANGCXX)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${__LXQT_COMMON_WARNING_FLAGS}")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${__LXQT_COMMON_WARNING_FLAGS} -Wnon-virtual-dtor -Woverloaded-virtual -Wpedantic")
+endif()
+
+if (LXQT_COMPILER_IS_CLANGCXX)
+    # qCDebug(), qCWarning, etc trigger a very verbose warning, about.... nothing. Disable it.
+    # Found when building lxqt-session.
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-gnu-zero-variadic-macro-arguments")
 endif()
 
 

debian/changelog

@@ -1,3 +1,10 @@
+lxqt-build-tools (0.3.2-1) unstable; urgency=medium
+
+  * Cherry-picking upstream version 0.3.2.
+  * Switched Architecture any --> all  
+
+ -- Alf Gaida <agaida@siduction.org>  Sat, 14 Jan 2017 00:55:40 +0100
+
 lxqt-build-tools (0.3.1-1) unstable; urgency=medium
 
   * Cherry-picking upstream version 0.3.1.

debian/control

@@ -13,7 +13,7 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-build-tools.git -b debian/
 Homepage: https://github.com/lxde/lxqt-build-tools
 
 Package: lxqt-build-tools
-Architecture: any
+Architecture: all
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          cmake (>= 3.0.2),

lxqt-build-tools-config-version.cmake.in

@@ -0,0 +1,10 @@
+set(PACKAGE_VERSION "@LXQT_BUILD_TOOLS_VERSION@")
+
+if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
+  set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+  set(PACKAGE_VERSION_COMPATIBLE TRUE)
+  if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
+    set(PACKAGE_VERSION_EXACT TRUE)
+  endif()
+endif()