From fb8423fdca569a8b01d9e8dcba1fb4d4ce5b6b83 Mon Sep 17 00:00:00 2001 From: Jonathan White Date: Sat, 24 Oct 2020 10:58:23 -0400 Subject: [PATCH] Bump version to 2.7.0 --- CHANGELOG.md | 8 ++++++++ CMakeLists.txt | 4 ++-- docs/CMakeLists.txt | 11 ++++++----- docs/GettingStarted.adoc | 1 - docs/UserGuide.adoc | 1 - docs/man/keepassxc-cli.1.adoc | 1 + docs/man/keepassxc.1.adoc | 1 + docs/topics/.sharedheader | 1 - snap/snapcraft.yaml | 2 +- 9 files changed, 19 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fc2eb2e2cb..69a3737568 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## 2.7.0 (in development) + +### Added + +### Changed + +### Fixed + ## 2.6.2 (2020-10-21) ### Added diff --git a/CMakeLists.txt b/CMakeLists.txt index 2bf59f1113..29acf794ca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -99,8 +99,8 @@ if(NOT WITH_XC_NETWORKING AND WITH_XC_UPDATECHECK) endif() set(KEEPASSXC_VERSION_MAJOR "2") -set(KEEPASSXC_VERSION_MINOR "6") -set(KEEPASSXC_VERSION_PATCH "2") +set(KEEPASSXC_VERSION_MINOR "7") +set(KEEPASSXC_VERSION_PATCH "0") set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION_MAJOR}.${KEEPASSXC_VERSION_MINOR}.${KEEPASSXC_VERSION_PATCH}") set(OVERRIDE_VERSION "" CACHE STRING "Override the KeePassXC Version for Snapshot builds") diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index dec7a2a37e..7ba9f15ecb 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -21,21 +21,22 @@ message(STATUS "Using asciidoctor: ${ASCIIDOCTOR_EXE}") set(DOC_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(OUT_DIR ${CMAKE_CURRENT_BINARY_DIR}) +set(REV -a revnumber=${KEEPASSXC_VERSION}) # Build html documentation on all platforms file(GLOB html_depends ${DOC_DIR}/topics/* ${DOC_DIR}/styles/* ${DOC_DIR}/images/*) add_custom_command(OUTPUT KeePassXC_GettingStarted.html - COMMAND ${ASCIIDOCTOR_EXE} -D ${OUT_DIR} -o KeePassXC_GettingStarted.html ${DOC_DIR}/GettingStarted.adoc + COMMAND ${ASCIIDOCTOR_EXE} -D ${OUT_DIR} -o KeePassXC_GettingStarted.html ${REV} ${DOC_DIR}/GettingStarted.adoc DEPENDS ${html_depends} ${DOC_DIR}/GettingStarted.adoc VERBATIM) add_custom_command(OUTPUT KeePassXC_UserGuide.html - COMMAND ${ASCIIDOCTOR_EXE} -D ${OUT_DIR} -o KeePassXC_UserGuide.html ${DOC_DIR}/UserGuide.adoc + COMMAND ${ASCIIDOCTOR_EXE} -D ${OUT_DIR} -o KeePassXC_UserGuide.html ${REV} ${DOC_DIR}/UserGuide.adoc DEPENDS ${html_depends} ${DOC_DIR}/UserGuide.adoc WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} VERBATIM) file(GLOB styles_depends ${DOC_DIR}/styles/*) add_custom_command(OUTPUT KeePassXC_KeyboardShortcuts.html - COMMAND ${ASCIIDOCTOR_EXE} -D ${OUT_DIR} -o KeePassXC_KeyboardShortcuts.html ${DOC_DIR}/topics/KeyboardShortcuts.adoc + COMMAND ${ASCIIDOCTOR_EXE} -D ${OUT_DIR} -o KeePassXC_KeyboardShortcuts.html ${REV} ${DOC_DIR}/topics/KeyboardShortcuts.adoc DEPENDS ${DOC_DIR}/topics/KeyboardShortcuts.adoc ${styles_depends} VERBATIM) @@ -50,11 +51,11 @@ install(FILES # Build Man Pages on Linux and macOS if(UNIX) add_custom_command(OUTPUT keepassxc.1 - COMMAND ${ASCIIDOCTOR_EXE} -D ${OUT_DIR} -b manpage -a revnumber=${KEEPASSXC_VERSION} ${DOC_DIR}/man/keepassxc.1.adoc + COMMAND ${ASCIIDOCTOR_EXE} -D ${OUT_DIR} -b manpage ${REV} ${DOC_DIR}/man/keepassxc.1.adoc DEPENDS ${DOC_DIR}/man/keepassxc.1.adoc VERBATIM) add_custom_command(OUTPUT keepassxc-cli.1 - COMMAND ${ASCIIDOCTOR_EXE} -D ${OUT_DIR} -b manpage -a revnumber=${KEEPASSXC_VERSION} ${DOC_DIR}/man/keepassxc-cli.1.adoc + COMMAND ${ASCIIDOCTOR_EXE} -D ${OUT_DIR} -b manpage ${REV} ${DOC_DIR}/man/keepassxc-cli.1.adoc DEPENDS ${DOC_DIR}/man/keepassxc-cli.1.adoc VERBATIM) add_custom_target(manpages ALL DEPENDS keepassxc.1 keepassxc-cli.1) diff --git a/docs/GettingStarted.adoc b/docs/GettingStarted.adoc index 8235ed3b9f..5135e09e2c 100644 --- a/docs/GettingStarted.adoc +++ b/docs/GettingStarted.adoc @@ -1,6 +1,5 @@ = KeePassXC: Getting Started Guide KeePassXC Team -v2.6.0 :data-uri: :linkcss!: :homepage: https://keepassxc.org diff --git a/docs/UserGuide.adoc b/docs/UserGuide.adoc index f879ce99b2..439bcd4171 100644 --- a/docs/UserGuide.adoc +++ b/docs/UserGuide.adoc @@ -1,6 +1,5 @@ = KeePassXC: User Guide KeePassXC Team -v2.6.0 :data-uri: :homepage: https://keepassxc.org :icons: font diff --git a/docs/man/keepassxc-cli.1.adoc b/docs/man/keepassxc-cli.1.adoc index 7cd36cca3a..d3aba6120e 100644 --- a/docs/man/keepassxc-cli.1.adoc +++ b/docs/man/keepassxc-cli.1.adoc @@ -15,6 +15,7 @@ // along with this program. If not, see . = keepassxc-cli(1) +KeePassXC Team :docdate: 2020-08-31 :doctype: manpage :mansource: KeePassXC {revnumber} diff --git a/docs/man/keepassxc.1.adoc b/docs/man/keepassxc.1.adoc index a5e64def67..3d222b6f36 100644 --- a/docs/man/keepassxc.1.adoc +++ b/docs/man/keepassxc.1.adoc @@ -15,6 +15,7 @@ // along with this program. If not, see . = keepassxc(1) +KeePassXC Team :docdate: 2020-08-31 :doctype: manpage :mansource: KeePassXC {revnumber} diff --git a/docs/topics/.sharedheader b/docs/topics/.sharedheader index 715ec3c0f1..c639a39be7 100644 --- a/docs/topics/.sharedheader +++ b/docs/topics/.sharedheader @@ -1,5 +1,4 @@ KeePassXC Team -v2.6.0 :data-uri: :homepage: https://keepassxc.org :stylesheet: ../styles/dark.css diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 90a369d350..1aed910c96 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,5 +1,5 @@ name: keepassxc -version: 2.6.2 +version: 2.7.0 grade: stable summary: Community-driven port of the Windows application “KeePass Password Safe” description: |