Cherry-picking upstream release 0.11.1.

* Removed some build dependencies:
  - cmake
  - libqt5xdg-dev
  - libqt5xdgiconloader-dev
  - libx11-dev
  - pkg-config
  - qttools5-dev
  - qttools5-dev-tools
* Bumped build dependency liblxqt0-dev (>= 0.11.1)
* Bumped years in d/copyright
* Fixed d/gbp.conf

CHANGELOG

@@ -1,7 +1,13 @@
 
-lxqt-sudo-0.11.0 / 2016-09-24
+lxqt-sudo-0.11.1 / 2017-01-01
 =============================
 
+  * Make CMakeLists.txt more uniform.
+
+0.11.0 / 2016-09-24
+===================
+
+  * Release 0.11.0: Add changelog
   * Add README.md
   * build: Forward translations parameters
   * ts-files removal (#21)

CMakeLists.txt

@@ -2,20 +2,21 @@ cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)
 
 project(lxqt-sudo)
 
+include(GNUInstallDirs)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
 option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF)
 option(PULL_TRANSLATIONS "Pull translations" ON)
 
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
+find_package(Qt5Widgets REQUIRED)
-set(CMAKE_AUTOMOC ON)
+message(STATUS "Building with Qt${Qt5Core_VERSION_STRING}")
-set(CMAKE_AUTOUIC ON)
 
-include(GNUInstallDirs)
+find_package(lxqt REQUIRED)
-
-find_package(Qt5Widgets REQUIRED QUIET)
-find_package(lxqt REQUIRED QUIET)
 
 include(LXQtCompilerSettings NO_POLICY_SCOPE)
-include(LXQtTranslate)
 
 set ( LINK_LXSU "lxsu")
 set ( LINK_LXSUDO "lxsudo")
@@ -38,20 +39,30 @@ set( UIS
     passworddialog.ui
 )
 
+if(NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE Release)
+endif()
 
 # Translations **********************************
+include(LXQtTranslate)
+
 lxqt_translate_ts(QM_FILES
-    UPDATE_TRANSLATIONS ${UPDATE_TRANSLATIONS}
+    UPDATE_TRANSLATIONS
+        ${UPDATE_TRANSLATIONS}
     SOURCES
         ${HDRS}
         ${SRCS}
         ${UIS}
     INSTALL_DIR
         "${LXQT_TRANSLATIONS_DIR}/${PROJECT_NAME}"
-    PULL_TRANSLATIONS ${PULL_TRANSLATIONS}
+    PULL_TRANSLATIONS
-    CLEAN_TRANSLATIONS ${CLEAN_TRANSLATIONS}
+        ${PULL_TRANSLATIONS}
-    TRANSLATIONS_REPO ${TRANSLATIONS_REPO}
+    CLEAN_TRANSLATIONS
-    TRANSLATIONS_REFSPEC ${TRANSLATIONS_REFSPEC}
+        ${CLEAN_TRANSLATIONS}
+    TRANSLATIONS_REPO
+        ${TRANSLATIONS_REPO}
+    TRANSLATIONS_REFSPEC
+        ${TRANSLATIONS_REFSPEC}
 )
 
 lxqt_app_translation_loader(SRCS ${PROJECT_NAME})

debian/.gitignore

@@ -4,4 +4,3 @@
 /files
 
 /lxqt-sudo/
-/lxqt-sudo-dbg/

debian/changelog

@@ -1,3 +1,20 @@
+lxqt-sudo (0.11.1-1) unstable; urgency=medium
+
+  * Cherry-picking upstream release 0.11.1.
+  * Removed some build dependencies:
+    - cmake
+    - libqt5xdg-dev
+    - libqt5xdgiconloader-dev
+    - libx11-dev
+    - pkg-config
+    - qttools5-dev
+    - qttools5-dev-tools
+  * Bumped build dependency liblxqt0-dev (>= 0.11.1)
+  * Bumped years in d/copyright
+  * Fixed d/gbp.conf
+
+ -- Alf Gaida <agaida@siduction.org>  Mon, 02 Jan 2017 16:54:12 +0100
+
 lxqt-sudo (0.11.0-2) unstable; urgency=medium
 
   * Cherry-picking upstream release 0.11.0

debian/control

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

debian/copyright

@@ -3,11 +3,11 @@ Upstream-Name: lxqt-sudo
 Source: https://github.com/lxde/lxqt-sudo
 
 Files: *
-Copyright: 2015-2016 LXQt team
+Copyright: 2015-2017 LXQt team
 License: LGPL-2.1+
 
 Files: debian/*
-Copyright: 2015-2016 Alf Gaida <agaida@siduction.org>
+Copyright: 2015-2017 Alf Gaida <agaida@siduction.org>
            2015      Andrew Lee (李健秋) <ajqlee@debian.org>
            2015      ChangZhuo Chen (陳昌倬) <czchen@debian.org>
 License: LGPL-2.1+

debian/gbp.conf

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

debian/rules

@@ -10,6 +10,6 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		-DPULL_TRANSLATIONS=OFF\
+		-DPULL_TRANSLATIONS=OFF \
-		-DUPDATE_TRANSLATIONS=OFF\
+		-DUPDATE_TRANSLATIONS=OFF \
 		-DCMAKE_BUILD_TYPE=RelWithDebInfo