Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
)

Expand Down
2 changes: 1 addition & 1 deletion data/DDMConfig.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion data/man/ddm-state.conf.rst.in
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ddm configuration
-----------------

:Date: Dec 2025
:Version: ddm @DDM_VERSION_STRING@
:Version: ddm @DDM_VERSION@
:Manual section: 5
:Manual group: ddm

Expand Down
2 changes: 1 addition & 1 deletion data/man/ddm.conf.rst.in
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion data/man/ddm.rst.in
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ DDM
---

:Date: Dec 2025
:Version: ddm @DDM_VERSION_STRING@
:Version: ddm @DDM_VERSION@
:Manual section: 1
:Manual group: ddm

Expand Down
8 changes: 8 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -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 <luhongxu@uniontech.com> Thu, 15 Jan 2026 10:58:46 +0800

ddm (0.3.0) unstable; urgency=medium

* fix: fix flash black on login
Expand Down
Loading