diff --git a/CMakeLists.txt b/CMakeLists.txt index f6acc77..4053e1c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.25.0) project(DDM - VERSION 0.2.0 + VERSION 0.3.1 LANGUAGES CXX C) set(CMAKE_INCLUDE_CURRENT_DIR ON) @@ -11,11 +11,7 @@ set(CMAKE_AUTORCC ON) SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) # Set version -set(DDM_VERSION_MAJOR 0) -set(DDM_VERSION_MINOR 20) -set(DDM_VERSION_PATCH 0) -set(DDM_VERSION_STRING "${DDM_VERSION_MAJOR}.${DDM_VERSION_MINOR}.${DDM_VERSION_PATCH}") -add_compile_definitions("DDM_VERSION=\"${DDM_VERSION_STRING}\"") +add_compile_definitions("DDM_VERSION=\"${DDM_VERSION}\"") # Standard installation paths include(GNUInstallDirs) @@ -72,7 +68,7 @@ pkg_check_modules(Systemd REQUIRED systemd) pkg_check_modules(LIBXAU REQUIRED "xau") # TreelandProtocols -find_package(TreelandProtocols 0.5.0 REQUIRED) +find_package(TreelandProtocols 0.5.3 REQUIRED) find_package(Qt6 CONFIG REQUIRED Core DBus Gui Qml Quick QuickControls2 LinguistTools Test QuickTest) qt_standard_project_setup(REQUIRES 6.6) @@ -192,7 +188,7 @@ configure_package_config_file( # Configure version file write_basic_package_version_file( "${CMAKE_CURRENT_BINARY_DIR}/data/DDMConfigVersion.cmake" - VERSION ${DDM_VERSION_STRING} + VERSION ${DDM_VERSION} COMPATIBILITY SameMajorVersion ) diff --git a/data/DDMConfig.cmake.in b/data/DDMConfig.cmake.in index 2a47273..05fecc5 100644 --- a/data/DDMConfig.cmake.in +++ b/data/DDMConfig.cmake.in @@ -4,7 +4,7 @@ set(DDM_VERSION_MAJOR @DDM_VERSION_MAJOR@) set(DDM_VERSION_MINOR @DDM_VERSION_MINOR@) set(DDM_VERSION_PATCH @DDM_VERSION_PATCH@) -set(DDM_VERSION @DDM_VERSION_STRING@) +set(DDM_VERSION @DDM_VERSION@) # 导入 Auth 和 Common 模块的配置文件 include("${CMAKE_CURRENT_LIST_DIR}/CommonConfig.cmake") diff --git a/data/man/ddm-state.conf.rst.in b/data/man/ddm-state.conf.rst.in index 1814131..6e695e7 100644 --- a/data/man/ddm-state.conf.rst.in +++ b/data/man/ddm-state.conf.rst.in @@ -7,7 +7,7 @@ ddm configuration ----------------- :Date: Dec 2025 -:Version: ddm @DDM_VERSION_STRING@ +:Version: ddm @DDM_VERSION@ :Manual section: 5 :Manual group: ddm diff --git a/data/man/ddm.conf.rst.in b/data/man/ddm.conf.rst.in index 326fe89..33d0055 100644 --- a/data/man/ddm.conf.rst.in +++ b/data/man/ddm.conf.rst.in @@ -7,7 +7,7 @@ ddm display manager configuration ---------------------------------- :Date: Dec 2025 -:Version: ddm @DDM_VERSION_STRING@ +:Version: ddm @DDM_VERSION@ :Manual section: 5 :Manual group: ddm diff --git a/data/man/ddm.rst.in b/data/man/ddm.rst.in index 4b06981..cebc5d0 100644 --- a/data/man/ddm.rst.in +++ b/data/man/ddm.rst.in @@ -7,7 +7,7 @@ DDM --- :Date: Dec 2025 -:Version: ddm @DDM_VERSION_STRING@ +:Version: ddm @DDM_VERSION@ :Manual section: 1 :Manual group: ddm diff --git a/debian/changelog b/debian/changelog index 1c7dbae..02a1084 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +ddm (0.3.1) unstable; urgency=medium + + * fix: fix cannot login more than 1 user + * fix: fix treeland-protocol name + * fix: fix user cannot login after logout once + + -- rewine Thu, 15 Jan 2026 10:58:46 +0800 + ddm (0.3.0) unstable; urgency=medium * fix: fix flash black on login