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
7 years ago · cf9fde6f79
parent 8b584fd0c7
commit cf9fde6f79
7 changed files with 44 additions and 35 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +0,0 @@
-build
-translations/lxqt-policykit
--- a/9
+++ b/9
@ -1,7 +1,14 @@

-lxqt-policykit-0.11.0 / 2016-09-24
+lxqt-policykit-0.11.1 / 2017-01-01
 ==================================

+  * Make CMakeLists.txt more uniform.
+  * Remove cpack (#25)
+
+0.11.0 / 2016-09-24
+===================
+
+  * Release 0.11.0: Add changelog
  * agentGui: Use default icon
  * agentGui: Choose current user in identities combo
  * agentGui: Handle setting the prompt correctly
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,28 +1,30 @@
 cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)
-project(lxqt-policykit-agent)

-option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF)
+project(lxqt-policykit-agent)

 include(GNUInstallDirs)

+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
+option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF)
+
 find_package(PkgConfig)
 pkg_check_modules(POLKIT_AGENT REQUIRED polkit-agent-1)
 message(STATUS "polkit agent: ${POLKIT_AGENT_INCLUDE_DIRS} ${POLKIT_AGENT_LIBRARIES}")

 set(POLKIT_AGENT_BINARY_DIR "${CMAKE_INSTALL_BINDIR}" CACHE FILEPATH "Directory for install polkit agent")

-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-
 find_package(PolkitQt5-1 REQUIRED)
-find_package(Qt5Widgets REQUIRED QUIET)
 find_package(Qt5LinguistTools REQUIRED QUIET)
-find_package(lxqt REQUIRED QUIET)
+find_package(Qt5Widgets REQUIRED)
+message(STATUS "Building with Qt${Qt5Core_VERSION_STRING}")
+
+find_package(lxqt REQUIRED)

 include(LXQtCompilerSettings NO_POLICY_SCOPE)
-include(LXQtTranslate)

 # Deal with a bug in polkit-qt5
 if (NOT IS_ABSOLUTE "${POLKITQT-1_INCLUDE_DIR}")
@ -58,7 +60,9 @@ set(lxqt-policykit-agent_UI
    src/policykitagentgui.ui
 )

-# Translations
+# Translations **********************************
+include(LXQtTranslate)
+
 lxqt_translate_ts(lxqt-policykit-agent_QM_FILES
    UPDATE_TRANSLATIONS
        ${UPDATE_TRANSLATIONS}
@ -81,6 +85,7 @@ lxqt_translate_ts(lxqt-policykit-agent_QM_FILES
 )

 lxqt_app_translation_loader(QM_LOADER ${PROJECT_NAME})
+#************************************************

 add_executable(lxqt-policykit-agent
    ${lxqt-policykit-agent_SRCS}
@ -103,13 +108,3 @@ install(TARGETS
    DESTINATION "${POLKIT_AGENT_BINARY_DIR}"
    COMPONENT Runtime
 )
-
-# building tarball with CPack -------------------------------------------------
-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)
--- a/debian/.gitignore
+++ b/debian/.gitignore
@ -4,4 +4,3 @@
 /files

 /lxqt-policykit/
-/lxqt-policykit-dbg/
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,19 @@
+lxqt-policykit (0.11.1-1) UNRELEASED; 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
+
+ -- Alf Gaida <agaida@siduction.org>  Mon, 02 Jan 2017 14:41:24 +0100
+
 lxqt-policykit (0.11.0-4) unstable; urgency=medium

  * Provides: polkit-1-auth-agent (Closes: #842268)
--- a/debian/control
+++ b/debian/control
@ -7,19 +7,13 @@ 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),
               libpolkit-agent-1-dev,
               libpolkit-qt5-1-dev,
               libqt5svg5-dev,
               libqt5x11extras5-dev,
-               libqt5xdg-dev (>= 2.0.0),
-               libqt5xdgiconloader-dev (>= 2.0.0),
-               libx11-dev,
-               pkg-config,
-               qttools5-dev,
-               qttools5-dev-tools
+               libx11-dev
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/lxqt-policykit.git/?h=debian/sid
 Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-policykit.git -b debian/sid
--- a/debian/copyright
+++ b/debian/copyright
@ -3,12 +3,12 @@ Upstream-Name: lxqt-policykit
 Source: https://github.com/lxde/lxqt-policykit

 Files: *
-Copyright: 2012-2016 LXQt team
+Copyright: 2012-2017 LXQt team
           2010-2012 Razor team
 License: LGPL-2.1+

 Files: debian/*
-Copyright: 2014-2016 Alf Gaida <agaida@siduction.org>
+Copyright: 2014-2017 Alf Gaida <agaida@siduction.org>
           2015      Yukiharu YABUKI <yyabuki@debian.org>
 License: LGPL-2.1+