202507241403 eagle feat1

.github/workflows/backup-to-gitlab.yml

@@ -8,10 +8,8 @@ concurrency:
 jobs:
   backup-to-gitlabwh:
     uses: linuxdeepin/.github/.github/workflows/backup-to-gitlabwh.yml@master
-    secrets:
-      BRIDGETOKEN: ${{ secrets.BRIDGETOKEN }}
+    secrets: inherit
 
   backup-to-gitee:
     uses: linuxdeepin/.github/.github/workflows/backup-to-gitee.yml@master
-    secrets:
-      GITEE_SYNC_TOKEN: ${{ secrets.GITEE_SYNC_TOKEN }}
+    secrets: inherit

.github/workflows/call-build-distribution.yml

@@ -10,8 +10,4 @@ on:
 jobs:
   check_job:
     uses: linuxdeepin/.github/.github/workflows/build-distribution.yml@master
-    secrets:
-      BUILD_GPG_PRIVATE_KEY: ${{ secrets.BUILD_GPG_PRIVATE_KEY }}
-      BUILD_SSH_PRIVATE_KEY: ${{ secrets.BUILD_SSH_PRIVATE_KEY }}
-      WEBDAV_PASSWD: ${{ secrets.WEBDAV_PASSWD }}
-      WEBDAV_USER: ${{ secrets.WEBDAV_USER }}
+    secrets: inherit

.github/workflows/call-chatOps.yml

@@ -6,5 +6,4 @@ on:
 jobs:
   chatopt:
     uses: linuxdeepin/.github/.github/workflows/chatOps.yml@master
-    secrets:
-      APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
+    secrets: inherit

.github/workflows/call-clacheck.yml

@@ -12,5 +12,4 @@ concurrency:
 jobs:
   clacheck:
     uses: linuxdeepin/.github/.github/workflows/cla-check.yml@master
-    secrets:
-      APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
+    secrets: inherit

.github/workflows/cppcheck.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - run: export
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           persist-credentials: false

.obs/workflows.yml

@@ -0,0 +1,44 @@
+test_build:
+  steps:
+    - link_package:
+        source_project: deepin:Develop:dde
+        source_package: %{SCM_REPOSITORY_NAME}
+        target_project: deepin:CI
+
+    - configure_repositories:
+        project: deepin:CI
+        repositories:
+          - name: deepin_develop
+            paths:
+              - target_project: deepin:CI
+                target_repository: deepin_develop
+            architectures:
+              - x86_64
+              - aarch64
+
+          - name: debian
+            paths:
+              - target_project: deepin:CI
+                target_repository: debian_sid
+            architectures:
+              - x86_64
+
+  filters:
+    event: pull_request
+
+tag_build:
+  steps:
+    - branch_package:
+        source_project: deepin:Develop:dde
+        source_package: %{SCM_REPOSITORY_NAME}
+        target_project: deepin:Unstable:dde
+  filters:
+    event: tag_push
+
+commit_build:
+  steps:
+    - trigger_services:
+        project: deepin:Develop:dde
+        package: %{SCM_REPOSITORY_NAME}
+  filters:
+    event: push

.reuse/dep5

@@ -4,7 +4,7 @@ Upstream-Contact: UnionTech Software Technology Co., Ltd. <>
 Source: https://github.com/linuxdeepin/deepin-devicemanager
 
 # ci
-Files: .github/*
+Files: .github/* .obs/workflows.yml
 Copyright: None
 License: CC0-1.0
 
@@ -18,8 +18,8 @@ Files:  *.toml *.json *conf *.yaml *.sh
 Copyright: UnionTech Software Technology Co., Ltd.
 License: CC0-1.0
 
-# debian
-Files: debian/*
+# debian rpm
+Files: debian/* rpm/*
 Copyright: UnionTech Software Technology Co., Ltd.
 License: CC0-1.0
 
@@ -34,7 +34,7 @@ Copyright: UnionTech Software Technology Co., Ltd.
 License: CC-BY-4.0
 
 # deepin-devicemanager-server
-Files: deepin-devicemanager-server/deepin-devicemanager-server.service
+Files: deepin-devicemanager-server/deepin-devicecontrol/*.service
 Copyright: UnionTech Software Technology Co., Ltd.
 License: CC-BY-4.0
 
@@ -49,7 +49,7 @@ Copyright: UnionTech Software Technology Co., Ltd.
 License: LGPL-3.0-or-later
 
 # src
-Files: deepin-devicemanager/src/* deepin-devicemanager-server/src/*
+Files: deepin-devicemanager/src/* deepin-devicemanager-server/deepin-devicecontrol/src/* deepin-devicemanager-server/deepin-deviceinfo/src/*
 Copyright: UnionTech Software Technology Co., Ltd.
 License: GPL-3.0-or-later
 
@@ -66,5 +66,4 @@ License: GPL-3.0-or-later
 # 3rdparty/QtXlsxWriter
 Files: deepin-devicemanager/3rdparty/QtXlsxWriter/*
 Copyright: 2013-2014 Debao Zhang <hello@debao.me>
-License: MIT
-
+License: MIT

.tx/config

@@ -3,21 +3,21 @@ host = https://www.transifex.com
 minimum_perc = 80
 mode = developer
 
-[deepin-device-manager.deepin-device-manager]
+[o:linuxdeepin:p:deepin-device-manager:r:deepin-device-manager]
 file_filter = deepin-devicemanager/translations/deepin-devicemanager_<lang>.ts
 source_file = deepin-devicemanager/translations/deepin-devicemanager.ts
 preTranslate_file = deepin-devicemanager/translations/policy
 source_lang = en
 type = QT
 
-[deepin-device-manager.deepin-device-manager-desktop]
+[o:linuxdeepin:p:deepin-device-manager:r:deepin-device-manager-desktop]
 file_filter = deepin-devicemanager/translations/desktop/desktop_<lang>.ts
 source_file = deepin-devicemanager/translations/desktop/desktop.ts
 preTranslate_file = deepin-devicemanager/translations/policy
 source_lang = en
 type = QT
 
-[deepin-device-manager.deepin-device-manager-policy]
+[o:linuxdeepin:p:deepin-device-manager:r:deepin-device-manager-policy]
 file_filter = deepin-devicemanager/translations/policy/policy_<lang>.ts
 source_file = deepin-devicemanager/translations/policy/policy.ts
 preTranslate_file = deepin-devicemanager/translations/policy

.tx/deepin.conf

@@ -1,2 +1,2 @@
 [transifex]
-branch = m20
+branch = m20

.tx/transifex.yaml

@@ -0,0 +1,21 @@
+# SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
+#
+# SPDX-License-Identifier: CC0-1.0
+filters:
+  - filter_type: file
+    source_file: deepin-devicemanager/translations/deepin-devicemanager.ts
+    file_format: QT
+    source_language: en_US
+    translation_files_expression: deepin-devicemanager/translations/deepin-devicemanager_<lang>.ts
+  - filter_type: file
+    source_file:  deepin-devicemanager/translations/desktop/desktop.ts
+    file_format: QT
+    source_language: en_US
+    translation_files_expression:  deepin-devicemanager/translations/desktop/desktop_<lang>.ts
+  - filter_type: file
+    source_file:  deepin-devicemanager/translations/policy/policy.ts
+    file_format: QT
+    source_language: en_US
+    translation_files_expression:  deepin-devicemanager/translations/policy/policy_<lang>.ts
+settings:
+  pr_branch_name: transifex_update_<br_unique_id>

CMakeLists.txt

@@ -5,11 +5,21 @@ if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
    set(CMAKE_INSTALL_PREFIX /usr)
 endif()
 
+set(DISABLE_DRIVER false CACHE BOOL "disable driver")
+if (DISABLE_DRIVER)
+    add_definitions(-DDISABLE_DRIVER)
+endif()
+
+set(DISABLE_POLKIT false CACHE BOOL "disable polkit debug")
+if(CMAKE_BUILD_TYPE  STREQUAL "Debug")
+    add_definitions(-DDISABLE_POLKIT)
+endif()
+
 add_subdirectory(${CMAKE_SOURCE_DIR}/deepin-devicemanager)
 add_subdirectory(${CMAKE_SOURCE_DIR}/deepin-devicemanager-server)
 
 #代码覆盖率开关
 if(CMAKE_COVERAGE_ARG STREQUAL "CMAKE_COVERAGE_ARG_ON")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall -fprofile-arcs -ftest-coverage")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -fprofile-arcs -ftest-coverage")
-endif()
+endif()