Skip to content

feat(power): hand service to dde-services #1202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mhduiy wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(power): hand service to dde-services #1202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,13 +171,16 @@ install: build install-dde-data install-icons

mkdir -pv ${DESTDIR}${PREFIX}/share/dbus-1/system.d
cp misc/conf/*.conf ${DESTDIR}${PREFIX}/share/dbus-1/system.d/
rm -f ${DESTDIR}${PREFIX}/share/dbus-1/system.d/org.deepin.dde.Power1.conf

mkdir -pv ${DESTDIR}${PREFIX}/share/dbus-1
cp -r misc/services ${DESTDIR}${PREFIX}/share/dbus-1/
cp -r misc/system-services ${DESTDIR}${PREFIX}/share/dbus-1/
rm -f ${DESTDIR}${PREFIX}/share/dbus-1/system-services/org.deepin.dde.Power1.service

mkdir -pv ${DESTDIR}${PREFIX}/share/polkit-1/actions
cp misc/polkit-action/*.policy ${DESTDIR}${PREFIX}/share/polkit-1/actions/
rm -f ${DESTDIR}${PREFIX}/share/polkit-1/actions/org.deepin.dde.power.policy

mkdir -pv ${DESTDIR}${PREFIX}/share/polkit-1/rules.d/
cp misc/polkit-rules/*.rules ${DESTDIR}${PREFIX}/share/polkit-1/rules.d/
Expand Down Expand Up @@ -215,6 +218,7 @@ 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/
rm -f ${DESTDIR}${PREFIX}/share/dsg/configs/org.deepin.dde.daemon/org.deepin.dde.daemon.power.json

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/
Expand Down
1 change: 0 additions & 1 deletion bin/dde-session-daemon/daemon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,6 @@ func (s *SessionDaemon) initModules() {
"audio",
"screensaver",
"sessionwatcher",
"power", // need screensaver and sessionwatcher
"service-trigger",
"clipboard",
"inputdevices",
Expand Down
1 change: 0 additions & 1 deletion bin/dde-session-daemon/module.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import (
_ "github.com/linuxdeepin/dde-daemon/screensaver1"
_ "github.com/linuxdeepin/dde-daemon/service_trigger"
_ "github.com/linuxdeepin/dde-daemon/session/eventlog"
_ "github.com/linuxdeepin/dde-daemon/session/power1"
_ "github.com/linuxdeepin/dde-daemon/sessionwatcher1"
_ "github.com/linuxdeepin/dde-daemon/systeminfo1"
_ "github.com/linuxdeepin/dde-daemon/timedate1"
Expand Down
1 change: 0 additions & 1 deletion bin/dde-system-daemon/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import (
_ "github.com/linuxdeepin/dde-daemon/system/inputdevices1"
_ "github.com/linuxdeepin/dde-daemon/system/keyevent1"
_ "github.com/linuxdeepin/dde-daemon/system/lang"
_ "github.com/linuxdeepin/dde-daemon/system/power1"
_ "github.com/linuxdeepin/dde-daemon/system/resource_ctl"
_ "github.com/linuxdeepin/dde-daemon/system/scheduler"
_ "github.com/linuxdeepin/dde-daemon/system/swapsched1"
Expand Down
Loading