diff --git a/debian/changelog b/debian/changelog index 166b7fc88..6e04bd7db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -110,16 +110,16 @@ dde-shell (1.99.39) unstable; urgency=medium * feat: add activeWindow D-Bus interface * chore: tweak role{group,combine}model --- Wang Zichong Thu, 12 Jun 2025 19:12:00 +0800 + -- Wang Zichong Thu, 12 Jun 2025 19:12:00 +0800 dde-shell (1.99.38) unstable; urgency=medium - * fix: The tray window panel automatically opens + * fix: The tray window panel automatically opens * fix: just use one Dbus interface. - * fix: update tanslation with Lock dock. - * feat: Lock the height of dock. + * fix: update tanslation with Lock dock. + * feat: Lock the height of dock. --- Wu Jiangyu Thu, 05 Jun 2025 16:35:14 +0800 + -- Wu Jiangyu Thu, 05 Jun 2025 16:35:14 +0800 dde-shell (1.99.37) unstable; urgency=medium @@ -145,12 +145,12 @@ dde-shell (1.99.36) unstable; urgency=medium dde-shell (1.99.35) unstable; urgency=medium - * chore: drop no longer existed translation resource - * chore: update copywriting of dock modes - * feat: Add animation for position switching to dock + * chore: drop no longer existed translation resource + * chore: update copywriting of dock modes + * feat: Add animation for position switching to dock * Update translations from Transifex --- Wu Jiangyu Tue, 13 May 2025 17:20:000 +0800 + -- Wu Jiangyu Tue, 13 May 2025 17:20:00 +0800 dde-shell (1.99.34) unstable; urgency=medium @@ -262,7 +262,7 @@ dde-shell (1.99.22) UNRELEASED; urgency=medium * fix: The dock automatically hides * fix: item size not updated when taskbar item count was changed (Bug: 289225) * i18n: Updates for project Deepin Desktop Environment - + -- Wang Zichong Fri, 21 Feb 2025 13:42:00 +0800 dde-shell (1.99.21) UNRELEASED; urgency=medium @@ -600,7 +600,7 @@ dde-shell (0.0.21) unstable; urgency=medium * fix: app tray icon size not same as plugin - -- tsic404 Tue, 14 May 2024 14:44:31 +0800 + -- tsic404 Tue, 14 May 2024 14:44:31 +0800 dde-shell (0.0.20) unstable; urgency=medium @@ -946,7 +946,7 @@ dde-shell (0.0.2) unstable; urgency=medium * fix: missing systemd package * fix: missing labs package * feat: Add new UI about notification - + -- YeShanShan Fri, 15 Dec 2023 09:20:22 +0800 dde-shell (0.0.1) unstable; urgency=medium diff --git a/debian/control b/debian/control index fa30ff924..55d841ac7 100644 --- a/debian/control +++ b/debian/control @@ -3,73 +3,93 @@ Section: DDE Priority: optional Maintainer: Deepin Packages Builder Build-Depends: - debhelper-compat ( =12), + debhelper-compat (= 13), cmake, - systemd, - qt6-base-dev, - qt6-declarative-dev, - qt6-base-dev-tools, - qt6-tools-dev, - qt6-wayland ( >=6.8.0-0deepin6), - qt6-wayland-dev ( >=6.8.0-0deepin6), - qt6-wayland-dev-tools, - qt6-wayland-private-dev, - wayland-protocols, - treeland-protocols, - libdtk6gui-dev, + dde-application-manager-api (>= 1.2.23), + dde-tray-loader-dev (>= 1.99.14), + extra-cmake-modules, libdtk6core-bin, libdtk6core-dev, + libdtk6declarative, + libdtk6gui-dev, libdtk6widget-dev, libdtkcommon-dev, + libgtest-dev, libicu-dev, + libqt6svg6, libxcb-ewmh-dev, + libxcb-icccm4-dev, libxcb-res0-dev, libxcb-util-dev, - libxcb-icccm4-dev, libxcb1-dev, libxtst-dev, - libgtest-dev, - extra-cmake-modules, - libqt6svg6, - libdtk6declarative, qml6-module-qtquick-controls2-styles-chameleon, qt6-declarative-private-dev, libyaml-cpp-dev, - qt6-l10n-tools, qt6-svg-dev, dde-tray-loader-dev (> 1.99.14), - dde-application-manager-api (> 1.2.23) -Standards-Version: 3.9.8 + qml6-module-qtquick-controls2-styles-chameleon, + qt6-base-dev, + qt6-base-dev-tools, + qt6-declarative-dev, + qt6-declarative-private-dev, + qt6-l10n-tools, + qt6-svg-dev, + qt6-tools-dev, + qt6-wayland (>= 6.8.0-0deepin6), + qt6-wayland-dev (>= 6.8.0-0deepin6), + qt6-wayland-dev-tools, + qt6-wayland-private-dev, + systemd, + treeland-protocols, + wayland-protocols, +Standards-Version: 4.6.2 Homepage: https://github.com/linuxdeepin/dde-shell Package: libdde-shell Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: + ${misc:Depends}, + ${shlibs:Depends}, Multi-Arch: same Description: DDE Shell library DDE Shell is a plugin system that integrates plugins developed based on this plugin system into DDE. -Package: libdde-shell-dev -Architecture: any -Depends: ${misc:Depends}, libdde-shell( =${binary:Version}), - qt6-base-dev, libdtk6core-dev, qt6-tools-dev, qt6-declarative-dev -Description: DDE Shell devel library - DDE Shell is a plugin system that integrates plugins developed based on this plugin system into DDE. - Package: dde-shell Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libdde-shell( =${binary:Version}), - libqt6svg6, qml6-module-qt-labs-platform, - libqt6sql6-sqlite, - qt6-wayland ( >=6.8), - qml6-module-qtquick-layouts, qml6-module-qtquick-window, - libdtk6declarative, qml6-module-qtquick-controls2-styles-chameleon, - qml6-module-qtquick-layouts, qml6-module-qtquick-window, - qml6-module-qt-labs-platform, qml6-module-qt-labs-qmlmodels, - dde-tray-loader (> 1.99.8) -Multi-Arch: same +Depends: + dde-tray-loader (>= 1.99.8), + libdde-shell (= ${binary:Version}), + libdtk6declarative, + libqt6sql6-sqlite, + libqt6svg6, + qml6-module-qt-labs-platform, + qml6-module-qt-labs-qmlmodels, + qml6-module-qtquick-controls2-styles-chameleon, + qml6-module-qtquick-layouts, + qml6-module-qtquick-window, + qt6-wayland (>= 6.8), + ${misc:Depends}, + ${shlibs:Depends}, +Breaks: + dde-clipboard (<< 1:6.0.14), Description: An wrapper for developed based on dde-shell plugin system Package: dde-shell-example Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libdde-shell( =${binary:Version}), - qml6-module-qt-labs-platform +Depends: + libdde-shell (= ${binary:Version}), + qml6-module-qt-labs-platform, + ${misc:Depends}, + ${shlibs:Depends}, Multi-Arch: same Description: DDE Shell example This package contains some plugins based on dde-shell plugin system. + +Package: libdde-shell-dev +Architecture: any +Depends: + libdde-shell (= ${binary:Version}), + libdtk6core-dev, + qt6-base-dev, + qt6-declarative-dev, + qt6-tools-dev, + ${misc:Depends}, +Description: DDE Shell devel library + DDE Shell is a plugin system that integrates plugins developed based on this plugin system into DDE. diff --git a/debian/dde-shell.install b/debian/dde-shell.install index eb26e73c7..824cc47e7 100644 --- a/debian/dde-shell.install +++ b/debian/dde-shell.install @@ -1,32 +1,32 @@ usr/bin/* -/usr/lib/systemd/*/dde-shell*.service -/usr/lib/systemd/*/dde-shell-plugin*.service -usr/lib/*/dde-shell/org.deepin.ds.osd* -usr/share/dde-shell/org.deepin.ds.osd*/ +usr/lib/*/dde-shell/org.deepin.ds.dde-am* +usr/lib/*/dde-shell/org.deepin.ds.dde-appearance* +usr/lib/*/dde-shell/org.deepin.ds.dde-apps* +usr/lib/*/dde-shell/org.deepin.ds.dde-shutdown* usr/lib/*/dde-shell/org.deepin.ds.dock* -usr/share/dde-shell/org.deepin.ds.dock*/ -usr/lib/*/qt6/qml/org/deepin/ds/dock/* usr/lib/*/dde-shell/org.deepin.ds.notification* -usr/share/dde-shell/org.deepin.ds.notification*/ -usr/lib/*/dde-shell/org.deepin.ds.dde-appearance* -usr/share/dde-shell/org.deepin.ds.dde-appearance*/ -usr/lib/*/dde-shell/org.deepin.ds.dde-am* +usr/lib/*/dde-shell/org.deepin.ds.notificationcenter* +usr/lib/*/dde-shell/org.deepin.ds.osd* +usr/lib/*/libds-notification-shared.so.* +usr/lib/*/qt6/qml/org/deepin/ds/dock/* +usr/lib/*/qt6/qml/org/deepin/ds/notification/* +usr/lib/*/qt6/qml/org/deepin/ds/notificationcenter/* +usr/lib/systemd/*/dde-shell*.service +usr/lib/systemd/*/dde-shell-plugin*.service +usr/share/dde-dock/icons/dcc-setting/*.dci +usr/share/dde-shell/*/translations usr/share/dde-shell/org.deepin.ds.dde-am*/ -usr/lib/*/dde-shell/org.deepin.ds.dde-apps* +usr/share/dde-shell/org.deepin.ds.dde-appearance*/ usr/share/dde-shell/org.deepin.ds.dde-apps*/ -usr/lib/*/dde-shell/org.deepin.ds.dde-shutdown* usr/share/dde-shell/org.deepin.ds.dde-shutdown*/ -usr/share/dsg/configs/org.deepin.ds.dock/ +usr/share/dde-shell/org.deepin.ds.dock*/ +usr/share/dde-shell/org.deepin.ds.notification*/ +usr/share/dde-shell/org.deepin.ds.notificationcenter*/ +usr/share/dde-shell/org.deepin.ds.osd*/ 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/dsg/configs/org.deepin.dde.shell/org.deepin.dde.shell.notification.json usr/share/dsg/configs/org.deepin.dde.shell/org.deepin.ds.dde-apps.json -usr/share/dde-shell/*/translations -usr/share/dde-dock/icons/dcc-setting/*.dci -usr/lib/*/qt6/qml/org/deepin/ds/notification/* -usr/lib/*/qt6/qml/org/deepin/ds/notificationcenter/* -usr/lib/*/dde-shell/org.deepin.ds.notificationcenter* -usr/share/dde-shell/org.deepin.ds.notificationcenter*/ -usr/lib/*/libds-notification-shared.so.* +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/dsg/configs/org.deepin.dde.shell/org.deepin.ds.dock.tray.json +usr/share/dsg/configs/org.deepin.ds.dock/ diff --git a/debian/libdde-shell-dev.install b/debian/libdde-shell-dev.install index dc193a9b8..ba7eac759 100644 --- a/debian/libdde-shell-dev.install +++ b/debian/libdde-shell-dev.install @@ -1,3 +1,3 @@ -usr/lib/*/lib*.so usr/include usr/lib/*/cmake/*/*.cmake +usr/lib/*/lib*.so diff --git a/debian/rules b/debian/rules index 021d2f042..759787c45 100755 --- a/debian/rules +++ b/debian/rules @@ -8,13 +8,6 @@ export DEB_CFLAGS_MAINT_APPEND = -Wall export DEB_CXXFLAGS_MAINT_APPEND = -Wall export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -Wl,-E -DISTRO = $(shell lsb_release -is) -ifeq ($(DISTRO),Deepin) - ENABLE_DEEPIN_NMQT=ON -else - ENABLE_DEEPIN_NMQT=OFF -endif - VERSION = $(DEB_VERSION_UPSTREAM) PACK_VER = $(shell echo $(VERSION) | awk -F'[+_~-]' '{print $$1}') # Fix: invalid digit "8" in octal constant. e.g. u008 ==> 008 ==> 8 @@ -24,4 +17,4 @@ BUILD_VER = $(shell echo $(VERSION) | awk -F'[+_~-]' '{print $$2}' | sed 's/[^0- dh $@ override_dh_auto_configure: - dh_auto_configure -- -DDS_VERSION=${PACK_VER} -DENABLE_DEEPIN_NMQT=${ENABLE_DEEPIN_NMQT} + dh_auto_configure -- -DDS_VERSION=${PACK_VER}