Skip to content

fix: conflicts between shell and shell-example #670

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

Merged
deepin-bot merged 1 commit into from
Aug 8, 2024
Merged

fix: conflicts between shell and shell-example #670

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
2 changes: 1 addition & 1 deletion debian/dde-shell-example.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
usr/lib/*/dde-shell/org.deepin.ds.example*
usr/share/dde-shell/org.deepin.ds.example*/
usr/share/dsg/configs/org.deepin.dde.shell/
usr/share/dsg/configs/org.deepin.dde.shell/org.deepin.ds.example.json
5 changes: 4 additions & 1 deletion debian/dde-shell.install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ usr/share/dde-shell/org.deepin.ds.dde-appearance*/
usr/lib/*/dde-shell/org.deepin.ds.dde-am*
usr/share/dde-shell/org.deepin.ds.dde-am*/
usr/share/dsg/configs/org.deepin.ds.dock/
usr/share/dsg/configs/org.deepin.dde.shell/
usr/share/dsg/configs/org.deepin.dde.shell/org.deepin.dde.shell.json
usr/share/dsg/configs/org.deepin.dde.shell/org.deepin.ds.dock.tray.json
usr/share/dsg/configs/org.deepin.dde.shell/org.deepin.ds.dock.json
usr/share/dsg/configs/org.deepin.dde.shell/org.deepin.ds.dock.taskmanager.json
usr/share/dde-shell/*/translations
usr/share/dde-dock/icons/dcc-setting/*.svg
2 changes: 0 additions & 2 deletions panels/dock/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,6 @@ target_include_directories(dock-plugin

install(DIRECTORY "${PROJECT_BINARY_DIR}/plugins/org/deepin/ds/dock/" DESTINATION "${QML_INSTALL_DIR}/org/deepin/ds/dock/")
dtk_add_config_meta_files(APPID org.deepin.ds.dock FILES dconfig/org.deepin.ds.dock.json) # compat
dtk_add_config_meta_files(APPID org.deepin.ds.dock FILES dconfig/org.deepin.ds.dock.power.json) # compat
dtk_add_config_meta_files(APPID org.deepin.ds.dock FILES dconfig/org.deepin.ds.dock.tray.json) # compat
dtk_add_config_meta_files(APPID org.deepin.dde.shell FILES dconfig/org.deepin.ds.dock.json)
dtk_add_config_meta_files(APPID org.deepin.dde.shell FILES dconfig/org.deepin.ds.dock.power.json)
dtk_add_config_meta_files(APPID org.deepin.dde.shell FILES dconfig/org.deepin.ds.dock.tray.json)
46 changes: 0 additions & 46 deletions panels/dock/dconfig/org.deepin.ds.dock.power.json
View file
Open in desktop

This file was deleted.