Cherry-picking upstream release 0.11.1.

* Removed some build dependencies: -cmake -libqt5xdg-dev -libqt5xdgiconloader-dev -pkg-config -qttools5-dev -qttools5-dev-tools * Bumped build dependency liblxqt0-dev (>= 0.11.1) * Bumped years in d/copyright
7 years ago · 5d6c9c6b1b
parent 1e0db70b11
commit 5d6c9c6b1b
6 changed files with 38 additions and 33 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +0,0 @@
-build
-translations/lxqt-openssh-askpass
--- a/9
+++ b/9
@ -1,7 +1,14 @@

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

+  * Make CMakeLists.txt more uniform.
+  * Remove cpack (#21)
+
+0.11.0 / 2016-09-24
+===================
+
+  * Release 0.11.0: Add changelog
  * Rework README.md
  * build: Use external translations
  * ts-files removal (#19)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,25 +1,23 @@
 cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)
+
 project(lxqt-openssh-askpass)

-option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF)
+add_definitions(-Wall)

 include(GNUInstallDirs)

-if(NOT CMAKE_BUILD_TYPE)
-    set(CMAKE_BUILD_TYPE Release)
-endif()
-
-add_definitions(-Wall)
-
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTOUIC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)

-find_package(Qt5Widgets REQUIRED QUIET)
+option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF)
+
 find_package(Qt5LinguistTools REQUIRED QUIET)
+find_package(Qt5Widgets REQUIRED)
+message(STATUS "Building with Qt${Qt5Core_VERSION_STRING}")

-find_package(lxqt REQUIRED QUIET)
+find_package(lxqt REQUIRED)

 include(LXQtCompilerSettings NO_POLICY_SCOPE)

@ -36,6 +34,10 @@ set(lxqt-openssh-askpass_UIS
    src/mainwindow.ui
 )

+if(NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE Release)
+endif()
+
 # Translations **********************************
 include(LXQtTranslate)

@ -77,14 +79,3 @@ INSTALL(TARGETS
    RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
    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/changelog
+++ b/debian/changelog
@ -1,3 +1,18 @@
+lxqt-openssh-askpass (0.11.1-1) unstable; urgency=medium
+
+  * Cherry-picking upstream release 0.11.1.
+  * Removed some build dependencies:
+    -cmake
+    -libqt5xdg-dev
+    -libqt5xdgiconloader-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:19:37 +0100
+
 lxqt-openssh-askpass (0.11.0-2) unstable; urgency=medium

  * Cherry-picking upstream release 0.11.0.
--- a/debian/control
+++ b/debian/control
@ -8,17 +8,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),
-               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-openssh-askpass.git/?h=debian/sid
 Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-openssh-askpass.git -b debian/sid
--- a/debian/copyright
+++ b/debian/copyright
@ -3,12 +3,12 @@ Upstream-Name: lxqt-openssh-askpass
 Source: https://github.com/lxde/lxqt-openssh-askpass

 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      ChangZhuo Chen (陳昌倬) <czchen@debian.org>
           2015      Andrew Lee (李健秋) <ajqlee@debian.org>
           2015      Yukiharu YABUKI <yyabuki@debian.org>