feat: adjust packages group

debian/changelog

@@ -1,3 +1,51 @@
+deepin-desktop-environment (2024.12.04) unstable; urgency=medium
+
+  * rename dde-dock-dcc-plugin to dde-control-center-dock
+
+ -- lichenggang <[email protected]>  Wed, 04 Dec 2024 13:49:59 +0800
+
+deepin-desktop-environment (2024.11.30) unstable; urgency=medium
+
+  * add dde-dock-dcc-plugin.
+
+ -- lichenggang <[email protected]>  Sat, 30 Nov 2024 13:30:18 +0800
+
+deepin-desktop-environment (2024.11.26) unstable; urgency=medium
+
+  * add packages.linglong.$arch
+
+ -- lichenggang <[email protected]>  Tue, 26 Nov 2024 15:47:45 +0800
+
+deepin-desktop-environment (2024.11.25) unstable; urgency=medium
+
+  * update package linglong.
+
+ -- lichenggang <[email protected]>  Mon, 25 Nov 2024 10:00:18 +0800
+
+deepin-desktop-environment (2024.11.21) unstable; urgency=medium
+
+  * add fonts-adobe-source-han-cjk.
+
+ -- lichenggang <[email protected]>  Thu, 21 Nov 2024 17:28:39 +0800
+
+deepin-desktop-environment (2024.11.20) unstable; urgency=medium
+
+  * remove uimg-installer 
+
+ -- lichenggang <[email protected]>  Wed, 20 Nov 2024 14:18:28 +0800
+
+deepin-desktop-environment (2024.11.13) unstable; urgency=medium
+
+  * update packages.linglong
+
+ -- lichenggang <[email protected]>  Wed, 13 Nov 2024 17:16:11 +0800
+
+deepin-desktop-environment (2024.11.05) unstable; urgency=medium
+
+  * adjust packages group.
+
+ -- lichenggang <[email protected]>  Tue, 05 Nov 2024 20:36:34 +0800
+
 deepin-desktop-environment (2024.09.19) unstable; urgency=medium
 
   * add fcitx5-unikey.

debian/control

@@ -2,7 +2,7 @@ Source: deepin-desktop-environment
 Section: metapackages
 Priority: standard
 Maintainer: LinuxDeepin Project <[email protected]>
-Build-Depends: debhelper (>= 8.0.0),
+Build-Depends: debhelper-compat (= 13),
 Standards-Version: 3.9.3
 Homepage: https://github.com/deepin-community/deepin-desktop-environment
 
@@ -148,11 +148,18 @@ Depends: ${misc:Depends},
          xdg-utils,
          xserver-xorg-core,
          xserver-xorg-input-all,
+         xserver-xorg-input-wacom,
          xz-utils,
          zip,
          iputils-ping,
          amd64-microcode [amd64],
          intel-microcode [amd64],
+         mesa-vulkan-drivers,
+         mesa-vdpau-drivers,
+         mesa-utils,
+         mesa-utils-bin,
+         mesa-va-drivers,
+         cryptsetup-initramfs,
 Recommends: aptitude,
             hostapd,
             lz4,
@@ -176,6 +183,7 @@ Depends: ${misc:Depends},
          dde-daemon,
          dde-desktop,
          dde-shell,
+         dde-control-center-dock,
          dde-file-manager,
          dde-launchpad,
          dde-permission-manager,
@@ -207,21 +215,11 @@ Depends: ${misc:Depends},
          plymouth-theme-deepin-logo,
          startdde,
          deepin-osconfig,
-Recommends: cups,
-            ttf-deepin-opensymbol,
-Description: Deepin New Desktop Environment - Next
- This is a dde package depends Deepin New Desktop Envrionment.
- .
- You can safety remove it after installed.
-
-Package: deepin-desktop-environment-extras
-Architecture: any
-Depends: ${misc:Depends},
-         cryptsetup-initramfs,
          cups,
          cups-bsd,
          cups-filters,
          dcc-network-plugin,
+         dcc-insider-plugin,
          dde-account-faces,
          dde-api,
          dde-cooperation,
@@ -234,86 +232,85 @@ Depends: ${misc:Depends},
          dde-file-manager-plugins,
          dde-file-manager-preview-plugins,
          dde-grand-search,
-         dde-introduction,
-         dde-manual-content,
-         dde-printer,
          dde-qt5wayland-plugin,
          dde-widgets,
          deepin-anything-server[i386 amd64],
+         deepin-deepinid-client,
+         gstreamer1.0-libav,
+         gstreamer1.0-plugins-ugly,
+         gstreamer1.0-fluendo-mp3,
+         libvlc5,
+         fcitx5-frontend-qt6,
+         fcitx5-pinyin-gui,
+         fcitx5-unikey,
+         intel-media-va-driver-non-free [amd64],
+         deepin-network-displays,
+         samba,
+         samba-common-bin,
+         samba-dsdb-modules,
+         samba-vfs-modules,
+         simple-scan,
+         systemd-timesyncd,
+         dss-network-plugin,
+         fonts-lohit-deva,
+         fonts-noto,
+         fonts-noto-cjk,
+         fonts-noto-mono,
+         fonts-noto-unhinted,
+         fonts-wqy-microhei,
+         fonts-wqy-zenhei,
+         fonts-noto-color-emoji,
+         fonts-open-sans,
+	 fonts-adobe-source-han-cjk,
+         xfonts-wqy,
+         libcupsimage2,
+         libimageeditor,
+         libime-bin,
+         libudfburn [!riscv64 !loong64],
+         deepin-sync-daemon,
+         linglong-bin [amd64],
+         linglong-box [amd64],
+         linglong-installer [amd64],
+Recommends: cups,
+            ttf-deepin-opensymbol,
+Description: Deepin New Desktop Environment - Next
+ This is a dde package depends Deepin New Desktop Envrionment.
+ .
+ You can safety remove it after installed.
+
+Package: deepin-desktop-environment-extras
+Architecture: any
+Depends: ${misc:Depends},
+         dde-printer,
+         dde-manual-content,
          deepin-app-store [!arm64 !riscv64 !loong64],
          deepin-app-store-runtime [!arm64 !riscv64 !loong64],
          deepin-deb-installer,
-         deepin-deepinid-client ,
          deepin-desktop-environment-core,
          deepin-devicemanager,
          deepin-diskmanager,
          deepin-dvsrv,
          deepin-feedback,
-         deepin-font-manager,
          deepin-home,
-         deepin-feedback,
          deepin-home-appstore-daemon [!riscv64 !loong64],
          deepin-log-viewer,
          deepin-ocr,
          deepin-picker,
          deepin-screensaver,
          deepin-shortcut-viewer,
-         deepin-sync-daemon,
          deepin-system-monitor,
          deepin-voice-note,
          deepin-music,
-         gstreamer1.0-libav,
-         gstreamer1.0-plugins-ugly,
-         gstreamer1.0-fluendo-mp3,
-         libvlc5,
          deepin-image-viewer,
          deepin-album,
-         deepin-calculator,
          deepin-compressor,
-         deepin-draw,
-         deepin-editor,
-         deepin-movie,
-         deepin-reader[!riscv64],
          deepin-screen-recorder,
          deepin-screen-recorder-plugin,
-         deepin-manual,
          com.deepin.gomoku,
          com.deepin.lianliankan,
-         deepin-camera,
-         dss-network-plugin,
-         fonts-lohit-deva,
-         fonts-noto,
-         fonts-noto-cjk,
-         fonts-noto-mono,
-         fonts-noto-unhinted,
-         fonts-wqy-microhei,
-         fonts-wqy-zenhei,
-         fonts-noto-color-emoji,
-         fonts-open-sans,
-         xfonts-wqy,
-         libcupsimage2,
-         libimageeditor,
-         libime-bin,
-         libudfburn [!riscv64 !loong64],
-         linglong-bin [amd64],,
-         linglong-box [amd64],,
-         linglong-installer [amd64],
          org.deepin.downloader,
-         samba,
-         samba-common-bin,
-         samba-dsdb-modules,
-         samba-vfs-modules,
-         simple-scan,
-         systemd-timesyncd,
-         uimg-installer [!riscv64 !loong64],
          uos-ai [amd64],
-         fcitx5-frontend-qt6,
-         fcitx5-pinyin-gui,
-         fcitx5-unikey,
-         intel-media-va-driver-non-free [amd64],
-         mesa-vulkan-drivers,
-         mesa-vdpau-drivers,
-         deepin-network-displays
+         deepin-manual,
 Description: Deepin New Desktop Environment - Next
  This is a extras package depends Deepin New Desktop Envrionment.
  .

debian/deepin-desktop-environment-ll.install

@@ -1 +1 @@
-packages.linglong /etc/
+packages.linglong.${DEB_HOST_ARCH} /etc/

debian/deepin-desktop-environment-ll.postinst

@@ -1,29 +1,38 @@
 #!/bin/bash
 set -x
 
-LL_pkgList=/etc/packages.linglong
+LL_pkgList_amd64=/etc/packages.linglong.amd64
+LL_pkgList_arm64=/etc/packages.linglong.arm64
+LL_pkgList_riscv64=/etc/packages.linglong.riscv64
+LL_pkgList_loong64=/etc/packages.linglong.loong64
+
+# 获取系统架构
+arch=$(dpkg --print-architecture)
 
 install_pkg(){
-	if [ ! -f $1 ]
-	then
-		echo "Error: $1 Not Found."
-		exit 0
+
+if [ ! -f $1 ]
+then
+	echo "Error: $1 Not Found."
+	exit 0
+fi
+
+for pkg in `cat $1 | grep -v "^#"`
+do
+ll-cli --no-dbus install ${pkg}
+	if [ $? -ne 0 ]; then
+		echo "Command failed. Exiting."
+		exit 1
 	fi
+done
 
-    for pkg in `cat $1 | grep -v "^#"`
-    do
-        ll-cli --no-dbus install ${pkg}
-		if [ $? -ne 0 ]; then
-			echo "Command failed. Exiting."
-			exit 1
-		fi
-    done
 }
 
 
 
 
 
+
 update_ll_repo-dev(){
 cat > /usr/share/linglong/config.yaml<< EOF
 # SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
@@ -64,7 +73,25 @@ if [ "$1" = "configure" ] && [ "$2" = "" ]; then
 		/usr/libexec/linglong/create-linglong-dirs
 	fi
 	update_ll_repo-dev
-	install_pkg ${LL_pkgList}
+
+case "$arch" in
+    amd64)
+	install_pkg ${LL_pkgList_amd64}
+        ;;
+    arm64)
+	install_pkg ${LL_pkgList_arm64}
+        ;;
+	riscv64)
+	install_pkg ${LL_pkgList_riscv64}
+        ;;
+    loong64)
+	install_pkg ${LL_pkgList_loong64}
+        ;;
+    *)
+        echo "Unknown architecture: $arch"
+        ;;
+esac
+
 	update_ll_repo
 
 fi

packages.linglong → packages.linglong.amd64

@@ -1,19 +1,20 @@
-#org.deepin.music
 org.dde.calendar
-#org.dde.introduction
-#org.deepin.album
-#org.deepin.calculator
-#org.deepin.compressor
-#org.deepin.draw
-#org.deepin.editor
-#org.deepin.image.viewer
-#org.deepin.movie
-#org.deepin.reader
-#org.deepin.screen-recorder
-#org.deepin.voice.note
+org.deepin.introduction
+org.deepin.calculator
+org.deepin.draw
+org.deepin.editor
+org.deepin.movie
+org.deepin.reader
 #org.deepin.manual
-#org.deepin.gomoku
-#org.deepin.lianliankan
 org.deepin.browser
 org.deepin.mail
-#org.deepin.camera
+org.deepin.camera
+org.deepin.fontmanager
+#org.deepin.gomoku
+#org.deepin.lianliankan
+#org.deepin.screen-recorder
+#org.deepin.voice.note
+#org.deepin.image.viewer
+#org.deepin.album
+#org.deepin.compressor
+#org.deepin.music

packages.linglong.arm64

@@ -0,0 +1,20 @@
+org.dde.calendar
+org.deepin.introduction
+org.deepin.calculator
+org.deepin.draw
+org.deepin.editor
+org.deepin.movie
+org.deepin.reader
+#org.deepin.manual
+#org.deepin.browser
+org.deepin.mail
+org.deepin.camera
+org.deepin.fontmanager
+#org.deepin.gomoku
+#org.deepin.lianliankan
+#org.deepin.screen-recorder
+#org.deepin.voice.note
+#org.deepin.image.viewer
+#org.deepin.album
+#org.deepin.compressor
+#org.deepin.music