chore: Based on the professional path, change the interface style to …

…the org.deepin.dde.MODE1 format.

Based on the professional path, change the interface style to the org.deepin.dde.MODE1 format.
Task: https://pms.uniontech.com/task-view-361181.html

.gitignore

@@ -11,24 +11,24 @@ _*
 grub2/grub2
 grub2/testdata/tmp_*
 themes/themes
-network/network
-accounts/accounts
-audio/audio
+network1/network
+accounts1/accounts
+audio1/audio
 datetime/datetime
 deepin-daemon/deepin-daemon
 desktop-toggle/desktop-toggle
 display/display
 dock-apps-builder/dock-apps-builder
 dock-daemon/dock-daemon
-inputdevices/inputdevices
-keybinding/keybinding
+inputdevices1/inputdevices
+keybinding1/keybinding
 launcher-daemon/launcher-daemon
 mime/mime
 mounts/mounts
 power/power
 system-info/system-info
 zone-settings/zone-settings
-bluetooth/bluetooth
+bluetooth1/bluetooth
 main_network.go
 bin/default-terminal/default-terminal
 bin/default-file-manager/default-file-manager

.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

@@ -9,7 +9,7 @@ Copyright: None
 License: CC0-1.0
 
 # ci
-Files: .github/* .gitlab-ci.yml
+Files: .github/* .obs/* .gitlab-ci.yml
 Copyright: None
 License: CC0-1.0
 

.tx/config

@@ -10,19 +10,19 @@ source_lang = en
 type = PO
 
 [o:linuxdeepin:p:deepin-desktop-environment:r:dde-daemon-grub2-policyts]
-file_filter = misc/ts/com.deepin.daemon.Grub2.policy/policy_<lang>.ts
-source_file = misc/ts/com.deepin.daemon.Grub2.policy/policy.ts
+file_filter = misc/ts/org.deepin.dde.grub2.policy/policy_<lang>.ts
+source_file = misc/ts/org.deepin.dde.grub2.policy/policy.ts
 source_lang = en
 type = QT
 
 [o:linuxdeepin:p:deepin-desktop-environment:r:dde-daemon-accounts-policyts]
-file_filter = misc/ts/com.deepin.daemon.accounts.policy/policy_<lang>.ts
-source_file = misc/ts/com.deepin.daemon.accounts.policy/policy.ts
+file_filter = misc/ts/org.deepin.dde.accounts.policy/policy_<lang>.ts
+source_file = misc/ts/org.deepin.dde.accounts.policy/policy.ts
 source_lang = en
 type = QT
 
 [o:linuxdeepin:p:deepin-desktop-environment:r:dde-daemon-fprintd-policyts]
-file_filter = misc/ts/com.deepin.daemon.Fprintd.policy/policy_<lang>.ts
-source_file = misc/ts/com.deepin.daemon.Fprintd.policy/policy.ts
+file_filter = misc/ts/org.deepin.dde.fprintd.policy/policy_<lang>.ts
+source_file = misc/ts/org.deepin.dde.fprintd.policy/policy.ts
 source_lang = en
 type = QT

.tx/deepin.conf

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

CHANGELOG.md

@@ -47,7 +47,7 @@
 *   feat(dde-session-daemon): sync login sound config after all module started
 *   fix(soundeffect): still play login sound even if sound effect switch is off
 *   chore: auto pull translation files from transifex
-*   change(api): com.deepin.daemon.Greeter add method UpdateGreeterQtTheme
+*   change(api): org.deepin.dde.Greeter1 add method UpdateGreeterQtTheme
 *   fix: ScreenScaleFactors cannot be easily parsed by greeter
 *   feat: also set the screen scale factors of the greeter
 *   fix(accounts): user was not added to some groups when creating user
@@ -68,7 +68,7 @@
 *   chore(langselector): remove failed test
 *   fix(audio): trySelectBestPort do not work
 *   change(api): sound effect add more functions
-*   change(api): add sytem service com.deepin.system.Network
+*   change(api): add sytem service org.deepin.dde.Network1
 
 [3.23.1] 2019-03-01
 *   feat(bluetooth): when disconnected quickly after connecting, automatically try to connect
@@ -531,7 +531,7 @@
 
 ## [3.2.4] - 2017-11-09
 #### Features
-*   add com.deepin.daemon.ImageBlur interface
+*   add org.deepin.dde.ImageBlur1 interface
 
 #### Bug Fixes
 *   not show newly installed wechat in launcher

Makefile

@@ -2,22 +2,110 @@ PREFIX = /usr
 GOPATH_DIR = gopath
 GOPKG_PREFIX = github.com/linuxdeepin/dde-daemon
 GOBUILD = go build $(GO_BUILD_FLAGS)
-export GO111MODULE=off
 export GOPATH=$(shell go env GOPATH)
 
+ifneq (${shell uname -m}, mips64el)
+    GOBUILD_OPTIONS = -ldflags '-linkmode=external -extldflags "-pie"'
+endif
+
+TEST = \
+    ${GOPKG_PREFIX}/accounts1 \
+    ${GOPKG_PREFIX}/accounts1/checkers \
+    ${GOPKG_PREFIX}/accounts1/logined \
+    ${GOPKG_PREFIX}/accounts1/users \
+    ${GOPKG_PREFIX}/appinfo \
+    ${GOPKG_PREFIX}/apps1 \
+    ${GOPKG_PREFIX}/audio1 \
+    ${GOPKG_PREFIX}/bin/backlight_helper \
+    ${GOPKG_PREFIX}/bin/backlight_helper/ddcci \
+    ${GOPKG_PREFIX}/bin/dde-authority \
+    ${GOPKG_PREFIX}/bin/dde-greeter-setter \
+    ${GOPKG_PREFIX}/bin/dde-lockservice \
+    ${GOPKG_PREFIX}/bin/dde-session-daemon \
+    ${GOPKG_PREFIX}/bin/dde-system-daemon \
+    ${GOPKG_PREFIX}/bin/default-terminal \
+    ${GOPKG_PREFIX}/bin/grub2 \
+    ${GOPKG_PREFIX}/bin/langselector \
+    ${GOPKG_PREFIX}/bin/search \
+    ${GOPKG_PREFIX}/bin/soundeffect \
+    ${GOPKG_PREFIX}/bin/user-config \
+    ${GOPKG_PREFIX}/bluetooth1 \
+    ${GOPKG_PREFIX}/calltrace \
+    ${GOPKG_PREFIX}/clipboard1 \
+    ${GOPKG_PREFIX}/clipboard1/mocks \
+    ${GOPKG_PREFIX}/common/bluetooth \
+    ${GOPKG_PREFIX}/common/dsync \
+    ${GOPKG_PREFIX}/common/sessionmsg \
+    ${GOPKG_PREFIX}/dbus \
+    ${GOPKG_PREFIX}/debug \
+    ${GOPKG_PREFIX}/fprintd1 \
+    ${GOPKG_PREFIX}/fprintd1/common \
+    ${GOPKG_PREFIX}/gesture1 \
+    ${GOPKG_PREFIX}/graph \
+    ${GOPKG_PREFIX}/grub2 \
+    ${GOPKG_PREFIX}/grub_common \
+    ${GOPKG_PREFIX}/grub_gfx \
+    ${GOPKG_PREFIX}/housekeeping \
+    ${GOPKG_PREFIX}/image_effect1 \
+    ${GOPKG_PREFIX}/inputdevices1 \
+    ${GOPKG_PREFIX}/inputdevices1/iso639 \
+    ${GOPKG_PREFIX}/iw \
+    ${GOPKG_PREFIX}/keybinding1 \
+    ${GOPKG_PREFIX}/keybinding1/shortcuts \
+    ${GOPKG_PREFIX}/keybinding1/util \
+    ${GOPKG_PREFIX}/langselector1 \
+    ${GOPKG_PREFIX}/lastore1 \
+    ${GOPKG_PREFIX}/loader \
+    ${GOPKG_PREFIX}/network1 \
+    ${GOPKG_PREFIX}/network1/nm \
+    ${GOPKG_PREFIX}/network1/nm_generator \
+    ${GOPKG_PREFIX}/network1/proxychains \
+    ${GOPKG_PREFIX}/screenedge1 \
+    ${GOPKG_PREFIX}/screensaver1 \
+    ${GOPKG_PREFIX}/service_trigger \
+    ${GOPKG_PREFIX}/session/common \
+    ${GOPKG_PREFIX}/session/eventlog \
+    ${GOPKG_PREFIX}/session/power1 \
+    ${GOPKG_PREFIX}/session/uadpagent1 \
+    ${GOPKG_PREFIX}/sessionwatcher1 \
+    ${GOPKG_PREFIX}/soundeffect1 \
+    ${GOPKG_PREFIX}/system/airplane_mode1 \
+    ${GOPKG_PREFIX}/system/bluetooth1 \
+    ${GOPKG_PREFIX}/system/display1 \
+    ${GOPKG_PREFIX}/system/gesture1 \
+    ${GOPKG_PREFIX}/system/hostname \
+    ${GOPKG_PREFIX}/system/inputdevices1 \
+    ${GOPKG_PREFIX}/system/keyevent1 \
+    ${GOPKG_PREFIX}/system/lang \
+    ${GOPKG_PREFIX}/system/network1 \
+    ${GOPKG_PREFIX}/system/power1 \
+    ${GOPKG_PREFIX}/system/power_manager1 \
+    ${GOPKG_PREFIX}/system/resource_ctl \
+    ${GOPKG_PREFIX}/system/scheduler \
+    ${GOPKG_PREFIX}/system/swapsched1 \
+    ${GOPKG_PREFIX}/system/systeminfo1 \
+    ${GOPKG_PREFIX}/system/timedate1 \
+    ${GOPKG_PREFIX}/system/uadp1 \
+    ${GOPKG_PREFIX}/systeminfo1 \
+    ${GOPKG_PREFIX}/timedate1 \
+    ${GOPKG_PREFIX}/trayicon1 \
+    ${GOPKG_PREFIX}/x_event_monitor1 \
+    ${GOPKG_PREFIX}/bin/default-file-manager
+    #${GOPKG_PREFIX}/timedate1/zoneinfo \
+
 BINARIES =  \
 	    dde-session-daemon \
 	    dde-system-daemon \
 	    grub2 \
 	    search \
-	    theme-thumb-tool \
 	    backlight_helper \
 	    langselector \
 	    soundeffect \
 	    dde-lockservice \
 	    dde-authority \
 	    default-terminal \
-	    dde-greeter-setter
+	    dde-greeter-setter \
+	    default-file-manager
 
 LANGUAGES = $(basename $(notdir $(wildcard misc/po/*.po)))
 
@@ -33,9 +121,6 @@ prepare:
 out/bin/%: prepare
 	env GOPATH="${CURDIR}/${GOPATH_DIR}:${GOPATH}" ${GOBUILD} -o $@ ${GOBUILD_OPTIONS} ${GOPKG_PREFIX}/bin/${@F}
 
-out/bin/default-file-manager: bin/default-file-manager/main.c
-	gcc $^ $(shell pkg-config --cflags --libs gio-unix-2.0) $(CFLAGS) -o $@
-
 out/bin/desktop-toggle: bin/desktop-toggle/main.c
 	gcc $^ $(shell pkg-config --cflags --libs x11) $(CFLAGS) -o $@
 
@@ -48,22 +133,21 @@ translate: $(addsuffix /LC_MESSAGES/dde-daemon.mo, $(addprefix out/locale/, ${LA
 pot:
 	deepin-update-pot misc/po/locale_config.ini
 
-POLICIES=accounts Grub2 Fprintd
+POLICIES=accounts1 Grub2 Fprintd1
 ts:
 	for i in $(POLICIES); do \
-		deepin-policy-ts-convert policy2ts misc/polkit-action/com.deepin.daemon.$$i.policy.in misc/ts/com.deepin.daemon.$$i.policy; \
+		deepin-policy-ts-convert policy2ts misc/polkit-action/org.deepin.dde.$$i.policy.in misc/ts/org.deepin.dde.$$i.policy; \
 	done
 
 ts_to_policy:
 	for i in $(POLICIES); do \
-	deepin-policy-ts-convert ts2policy misc/polkit-action/com.deepin.daemon.$$i.policy.in misc/ts/com.deepin.daemon.$$i.policy misc/polkit-action/com.deepin.daemon.$$i.policy; \
+	deepin-policy-ts-convert ts2policy misc/polkit-action/org.deepin.dde.$$i.policy.in misc/ts/org.deepin.dde.$$i.policy misc/polkit-action/org.deepin.dde.$$i.policy; \
 	done
 
 build: prepare out/bin/default-terminal out/bin/default-file-manager out/bin/desktop-toggle $(addprefix out/bin/, ${BINARIES}) ts_to_policy icons translate
 
 test: prepare
-	env GOPATH="${CURDIR}/${GOPATH_DIR}:${GOPATH}" go test -v ./...
-
+	env GOPATH="${CURDIR}/${GOPATH_DIR}:${GOPATH}" go test -v ${TEST}
 test-coverage: prepare
 	env GOPATH="${CURDIR}/${GOPATH_DIR}:${GOPATH}" go test -cover -v ./... | awk '$$2 ~ "_${CURDIR}" {print $$2","$$5}' | sed "s:${CURDIR}::g" | sed 's/files\]/0\.0%/g' > coverage.csv
 
@@ -94,8 +178,17 @@ install: build install-dde-data install-icons
 	cp -r misc/dde-daemon/*   ${DESTDIR}${PREFIX}/share/dde-daemon/
 	cp -r misc/usr/share/deepin ${DESTDIR}${PREFIX}/share/
 
+	mkdir -pv ${DESTDIR}/lib/systemd/user/
+	cp -f misc/systemd/services/user/* ${DESTDIR}/lib/systemd/user/
+
+	mkdir -pv ${DESTDIR}/lib/systemd/system/
+	cp -f misc/systemd/services/system/* ${DESTDIR}/lib/systemd/system/
+
+	mkdir -p $(DESTDIR)$(PREFIX)/lib/systemd/user/dde-session-initialized.target.wants/
+	ln -s $(PREFIX)/lib/systemd/user/org.dde.session.Daemon1.service $(DESTDIR)$(PREFIX)/lib/systemd/user/dde-session-initialized.target.wants/org.dde.session.Daemon1.service
+
 	mkdir -pv ${DESTDIR}/lib/systemd/system/
-	cp -f misc/systemd/services/* ${DESTDIR}/lib/systemd/system/
+	cp -f misc/systemd/system-services/* ${DESTDIR}/lib/systemd/system/
 
 	mkdir -pv ${DESTDIR}/etc/pam.d/
 	cp -f misc/etc/pam.d/* ${DESTDIR}/etc/pam.d/
@@ -118,9 +211,8 @@ install: build install-dde-data install-icons
 	mkdir -pv ${DESTDIR}/lib/udev/rules.d
 	cp -f misc/udev-rules/*.rules ${DESTDIR}/lib/udev/rules.d/
 
-	mkdir -pv ${DESTDIR}/usr/lib/deepin-daemon/service-trigger
-	cp -f misc/service-trigger/*.json ${DESTDIR}/usr/lib/deepin-daemon/service-trigger/
-	cp -f misc/service-trigger/*.sh ${DESTDIR}/usr/lib/deepin-daemon/service-trigger/
+	mkdir -pv ${DESTDIR}${PREFIX}/lib/deepin-daemon/service-trigger
+	cp -f misc/service-trigger/*.json ${DESTDIR}${PREFIX}/lib/deepin-daemon/service-trigger/
 
 	mkdir -pv ${DESTDIR}/etc/NetworkManager/conf.d
 	cp -f misc/etc/NetworkManager/conf.d/* ${DESTDIR}/etc/NetworkManager/conf.d/
@@ -130,9 +222,8 @@ install: build install-dde-data install-icons
 
 	mkdir -pv ${DESTDIR}${PREFIX}/share/dsg/configs/org.deepin.dde.daemon/
 	cp -r misc/dsg-configs/*.json ${DESTDIR}${PREFIX}/share/dsg/configs/org.deepin.dde.daemon/
-	mkdir -pv ${DESTDIR}${PREFIX}/share/dsg/configs/org.deepin.dde.lightdm-deepin-greeter
-	cp -r misc/dsg-configs/org.deepin.dde.lightdm-deepin-greeter/*.json ${DESTDIR}${PREFIX}/share/dsg/configs/org.deepin.dde.lightdm-deepin-greeter/
 
+	cp -f misc/scripts/dde-lock.sh ${DESTDIR}${PREFIX}/lib/deepin-daemon/
 install-dde-data:
 	mkdir -pv ${DESTDIR}${PREFIX}/share/dde/
 	cp -r misc/data ${DESTDIR}${PREFIX}/share/dde/