2025.06.30

Signed-off-by: shenmo <jifengshenmo@outlook.com>

.github/workflows/building-deb-base.yml

@@ -89,11 +89,13 @@ jobs:
           if [[ ${{ inputs.gxde-is-backport }} == true ]]; then
             isBackport=backport
           fi
+          export REPO_BRANCH=${{ github.ref_name }}
           bash .github/workflows/configure-building-enviroment-base-system.sh ${{ inputs.arch }} \
             ${{ inputs.rootfs-codename }} \
             $REPOSITORY \
             https://github.com/$GITHUB_REPOSITORY \
             ${{ inputs.rootfs-source }} \
+            ${{ github.ref_name }} \
             $isBackport
 
       - name: Building ${{ GITHUB.repository }}

.github/workflows/building-deb-hetao.yml

@@ -0,0 +1,67 @@
+name: Building GXDE Package (hetao)
+run-name: Building ${{ GITHUB.REPOSITORY }}
+
+on:
+  workflow_call:
+    secrets:
+      PASSWD:
+        required: true
+      USERS:
+        required: true
+      HOST: 
+        required: true
+      UPATH: 
+        required: true
+      UPROGRAM: 
+        required: true
+      UPORT: 
+        required: true
+
+env:
+  REPOSITORY: https://github.com/GXDE-OS/GXDE  
+  BOTTLEPATH: system-bottle
+
+jobs:  
+  call-amd64-hetao:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
+    secrets: inherit
+    with:
+      display-name: amd64-hetao
+      arch: amd64
+      rootfs-codename: crimson
+      rootfs-source: https://mirrors.kernel.org/deepin/beige/
+      gxde-codename: hetao
+      gxde-codename-upload: hetao
+
+  call-arm64-hetao:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
+    secrets: inherit
+    with:
+      display-name: arm64-hetao
+      arch: arm64
+      rootfs-codename: crimson
+      rootfs-source: https://mirrors.kernel.org/deepin/beige/
+      gxde-codename: hetao
+      gxde-codename-upload: hetao
+
+  call-loong64-hetao:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
+    secrets: inherit
+    with:
+      display-name: loong64-hetao
+      arch: loong64
+      rootfs-codename: crimson
+      rootfs-source: https://mirrors.kernel.org/deepin/beige/
+      gxde-codename: hetao
+      gxde-codename-upload: hetao
+
+  call-riscv64-hetao:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
+    secrets: inherit
+    with:
+      display-name: riscv64-hetao
+      arch: riscv64
+      rootfs-codename: crimson
+      rootfs-source: https://mirrors.kernel.org/deepin/beige/
+      gxde-codename: hetao
+      gxde-codename-upload: hetao

.github/workflows/building-deb-newest.yml

@@ -0,0 +1,42 @@
+name: Building GXDE Package for Newest Release
+run-name: Building for Newest Release ${{ GITHUB.REPOSITORY }}
+
+on:
+  workflow_call:
+    secrets:
+      PASSWD:
+        required: true
+      USERS:
+        required: true
+      HOST: 
+        required: true
+      UPATH: 
+        required: true
+      UPROGRAM: 
+        required: true
+      UPORT: 
+        required: true
+
+env:
+  REPOSITORY: https://github.com/GXDE-OS/GXDE  
+  BOTTLEPATH: system-bottle
+
+jobs:  
+  call-loong64-tianlu:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
+    secrets: inherit
+    with:
+      display-name: loong64-tianlu
+      arch: loong64
+      rootfs-codename: sid
+      rootfs-source: https://deb.debian.org/debian-ports/
+      gxde-codename: bixie
+      gxde-codename-upload: tianlu
+
+  call-zhuangzhuang:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-zhuangzhuang.yml@master
+    secrets: inherit
+
+  call-hetao:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-hetao.yml@master
+    secrets: inherit

.github/workflows/building-deb-sid.yml

@@ -22,17 +22,6 @@ env:
   BOTTLEPATH: system-bottle
 
 jobs:  
-  call-loong64-tianlu:
-    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
-    secrets: inherit
-    with:
-      display-name: loong64-tianlu
-      arch: loong64
-      rootfs-codename: sid
-      rootfs-source: https://deb.debian.org/debian-ports/
-      gxde-codename: bixie
-      gxde-codename-upload: tianlu
-
   call-zhuangzhuang:
     uses: GXDE-OS/GXDE/.github/workflows/building-deb-zhuangzhuang.yml@master
     secrets: inherit

.github/workflows/building-deb-tianlu.yml

@@ -65,14 +65,3 @@ jobs:
       rootfs-source: https://deb.debian.org/debian/
       gxde-codename: bixie
       gxde-codename-upload: tianlu
-
-  call-loong64-tianlu:
-    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
-    secrets: inherit
-    with:
-      display-name: loong64-tianlu
-      arch: loong64
-      rootfs-codename: sid
-      rootfs-source: https://deb.debian.org/debian-ports/
-      gxde-codename: bixie
-      gxde-codename-upload: tianlu

.github/workflows/building-deb.yml

@@ -26,8 +26,8 @@ jobs:
     uses: GXDE-OS/GXDE/.github/workflows/building-deb-zhuangzhuang.yml@master
     secrets: inherit
   
-  call-meimei:
+  call-hetao:
-    uses: GXDE-OS/GXDE/.github/workflows/building-deb-meimei.yml@master
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-hetao.yml@master
     secrets: inherit
   
   call-tianlu:

.github/workflows/configure-building-enviroment-base-system.sh

@@ -18,6 +18,9 @@ function useDebianPort() {
 function useLoongnix() {
     sudo cp .github/workflows/loongnix /usr/share/debootstrap/scripts/ -v
 }
+function useDeepin25() {
+    sudo cp .github/workflows/crimson /usr/share/debootstrap/scripts/ -v
+}
 
 sudo apt update
 sudo apt install debootstrap rename binfmt-support qemu-user qemu-user-static git -y
@@ -32,7 +35,16 @@ else
         useLoongnix
     fi
 fi
-sudo debootstrap --no-check-gpg --include=git,gcc,make,debian-ports-archive-keyring,debian-archive-keyring,g++,dpkg-dev,qtbase5-dev,ca-certificates --arch=$1 $2 $bottlePath $5
+if [[ $2 == "crimson" ]]; then
+    useDeepin25
+    sudo debootstrap --no-check-gpg --include=git,deepin-keyring,gcc,make,g++,dpkg-dev,qtbase5-dev,ca-certificates --arch=$1 $2 $bottlePath $5
+else
+    sudo debootstrap --no-check-gpg --include=git,gcc,make,debian-ports-archive-keyring,debian-archive-keyring,g++,dpkg-dev,qtbase5-dev,ca-certificates --arch=$1 $2 $bottlePath $5
+fi
+
+if [[ $2 == "crimson" ]]; then
+    sudo sed -i "s/main/main commercial community/g" $bottlePath/etc/apt/sources.list
+fi
 #if [[ $? != 0 ]]; then
 #    sudo debootstrap --foreign --include=git,gcc,make,debian-ports-archive-keyring,debian-archive-keyring,g++,dpkg-dev,qtbase5-dev,ca-certificates --arch=$1 $2 $bottlePath $5 
 #fi
@@ -44,7 +56,7 @@ if [[ $? != 0 ]] && [[ $1 == loong64 ]] && [[ $2 != "loongnix" ]]; then
     sudo mv squashfs-root $bottlePath -v
 fi
 sudo bash .github/workflows/pardus-chroot $bottlePath
-if [[ $6 == "backport" ]]; then
+if [[ $7 == "backport" ]]; then
     sudo cp -rv .github/workflows/debian-backports.list $bottlePath/etc/apt/sources.list.d
     sudo mkdir -p $bottlePath/etc/apt/preferences.d/
     sudo cp -rv .github/workflows/90bookworm-backports $bottlePath/etc/apt/preferences.d/
@@ -56,7 +68,7 @@ sudo chroot $bottlePath apt update
 sudo chroot $bottlePath apt full-upgrade -y
 sudo chroot $bottlePath apt install git -y
 sudo chroot $bottlePath git clone $3 #--depth=1
-sudo chroot $bottlePath git clone $4 #--depth=1
+sudo chroot $bottlePath git clone $4 -b $6 #--depth=1
 sudo mv $bottlePath/$(basename $3)/.github/workflows/* $bottlePath/$(basename $4)/.github/workflows -v
 # 修改版本号
 #sudo sed -i "s/) UNRELEASED; urgency=medium/~$2) UNRELEASED; urgency=medium/g" $bottlePath/deep-wine-runner-qemu-system/debian/changelog
@@ -67,6 +79,9 @@ case $2 in
     "loongnix")
         env gitPath=$(basename $4) bash .github/workflows/run-command-in-chroot.sh .github/workflows/configure-building-enviroment.sh meimei
     ;;
+    "crimson")
+        env gitPath=$(basename $4) bash .github/workflows/run-command-in-chroot.sh .github/workflows/configure-building-enviroment.sh hetao
+    ;;
     *)
         env gitPath=$(basename $4) bash .github/workflows/run-command-in-chroot.sh .github/workflows/configure-building-enviroment.sh
     ;;

.github/workflows/configure-building-enviroment.sh

@@ -58,9 +58,9 @@ apt install dpkg-dev sudo debian-ports-archive-keyring debian-archive-keyring de
 #apt build-dep qemu -y
 # 如果是 Debian10 就需要安装 Python3 的依赖
 #apt build-dep python3.7 -y
-# 解包 deepin-desktop-base
+# 解包 gxde-desktop-base
-apt download deepin-desktop-base
+apt download gxde-desktop-base
-dpkg -x deepin-desktop-base_*.deb /
+dpkg -x gxde-desktop-base_*.deb /
 if [[ -f /etc/apt/sources.list.d/debian-backports.list ]]; then
     dch --bpo ""
     sed -i "s/~bpo/-bpo/g" debian/changelog

.github/workflows/crimson

@@ -0,0 +1,17 @@
+mirror_style release
+download_style apt
+finddebs_style from-indices
+variants - buildd fakechroot minbase
+keyring /usr/share/keyrings/debian-archive-keyring.gpg
+default_mirror https://community-packages.deepin.com/deepin/beige/
+
+# include common settings
+if [ -e "$DEBOOTSTRAP_DIR/scripts/debian-common" ]; then
+ . "$DEBOOTSTRAP_DIR/scripts/debian-common"
+elif [ -e /debootstrap/debian-common ]; then
+ . /debootstrap/debian-common
+elif [ -e "$DEBOOTSTRAP_DIR/debian-common" ]; then
+ . "$DEBOOTSTRAP_DIR/debian-common"
+else
+ error 1 NOCOMMON "File not found: debian-common"
+fi

debian/changelog

@@ -1,4 +1,4 @@
-gxde (2025.06.07) UNRELEASED; urgency=medium
+gxde (2025.06.30) UNRELEASED; urgency=medium
 
   * 新增 remmina 以解决远程问题
   * 改为安装 dde-printer 
@@ -7,9 +7,16 @@ gxde (2025.06.07) UNRELEASED; urgency=medium
   * 新增推荐依赖：龙芯应用合作社（仅限：mips64el loongarch64 loong64）
   * 移除推荐依赖：plank
   * 修复小小电脑无法正常更新 gxde-desktop-android 的问题
-  * 修改 dde-control-center、dde-launcher 为 gxde-control-center、gxde-launcher
+  * 修改 dde-control-center、dde-launcher、dde-dock、deepin-desktop-base 为 gxde-control-center、gxde-launcher、gxde-dock、gxde-desktop-base
+  * 修改 dde-session-ui、dde-file-manager、dde-desktop 为
+    gxde-session-ui、gxde-file-manager、gxde-desktop-panel
+  * startdde=>startgxde
+  * dde-kwin --> gxde-wm-shim
+  * 新增推荐依赖 gxde-desktop
+  * gxde-introduction 由 Depends 设置为 Recommends
+  * 推荐安装 apt-is-aptss 
 
- -- gfdgd_xi <3025613752@qq.com>  Sat, 07 Jun 2025 14:59:13 +0800
+ -- gfdgd_xi <3025613752@qq.com>  Sun, 22 Jun 2025 09:59:58 +0800
 
 gxde (2024.10.20) UNRELEASED; urgency=medium
 

debian/control

@@ -26,7 +26,6 @@ Recommends: ${misc:Depends},
  gxde-sendbylan,
  gxde-dict,
  gxde-system-assistant,
- spark-store | aptss,
  loongsonapplication,
  gxde-boot-maker,
  deepin-clone,
@@ -42,6 +41,7 @@ Recommends: ${misc:Depends},
  remmina,
  screensaver-pp,
  gxde-time-screensaver,
+ gxde-desktop,
 Description: GXDE New Desktop Environment Extra - Next
  This is a meta package depends GXDE New Desktop Envrionment Extra.
  .
@@ -53,7 +53,6 @@ Depends:
  ${misc:Depends},
  gxde-daemon,
  gxde-desktop,
- gxde-calculator, 
  gxde-terminal, 
  gxde-deb-installer, 
  gxde-editor, 
@@ -66,7 +65,8 @@ Depends:
  spark-store | aptss, 
  deepin-system-monitor,
  gxde-control-center,
- dde-file-manager,
+ gxde-file-manager,
+ spark-store | aptss,
 Conflicts:
  plymouth-theme-gxde-logo,
  linux-kernel-gxde-i386,
@@ -89,28 +89,28 @@ Description: GXDE New Desktop Environment For PRoot - Next
 Package: gxde-desktop
 Architecture: all
 Depends: ${misc:Depends},
- deepin-desktop-base,
+ gxde-desktop-base,
- dde-desktop,
+ gxde-desktop-panel,
- dde-dock,
+ gxde-dock,
  gxde-control-center,
  gxde-launcher,
- startdde,
+ startgxde,
- dde-session-ui,
+ gxde-session-ui,
  gxde-artwork,
- dde-file-manager,
+ gxde-file-manager,
  dde-qt5integration,
  eject,
  gxde-wallpapers,
  fonts-noto,
- dde-kwin | gxde-kwin,
+ gxde-wm-shim | gxde-kwin-neo,
  deepin-screensaver,
  gxde-default-settings,
  gxde-shell-tools,
  gxde-compressor,
- gxde-introduction,
 Recommends:
  gxde-desktop-extra | gxde-desktop-android,
  gxde-editor,
+ gxde-introduction,
  pppoe,
  gvfs-fuse,
  smbclient,
@@ -146,7 +146,6 @@ Recommends:
  x-display-manager,
  gxde-image-viewer,
  gxde-calendar,
- gxde-calculator,
  gxde-voice-recorder,
  deepin-screen-recorder,
  warm-sched,
@@ -159,6 +158,7 @@ Recommends:
  fcitx5-table,
  fantascene-dynamic-wallpaper,
  x11vnc,
+ apt-is-aptss,
 Conflicts:
  deepin-desktop-environment-desktop,
  deepin-desktop-environment-dock,