新增推荐依赖gxde-kernel-manager、deepin-log-viewer

Signed-off-by: gfdgd_xi <3025613752@qq.com>

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

@@ -47,6 +47,11 @@ on:
         description: 'Is build with backport'
         required: false
 
+      gxde-cross-arch:
+        type: string
+        description: 'Build deb to which arch'
+        required: false
+
       display-name:
         required: false
         type: string
@@ -59,6 +64,7 @@ env:
 
 jobs:  
   build:
+    if: github.repository_owner == 'GXDE-OS'
     name: ${{ inputs.display-name || 'Build Job' }}
     runs-on: ubuntu-24.04
     steps:
@@ -88,20 +94,28 @@ 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 }}
         run: |
           gitPath=$(basename $GITHUB_REPOSITORY)
           if [[ -f system-bottle/$gitPath/debian/control ]]; then
-            env gitPath=$gitPath bash .github/workflows/run-command-in-chroot.sh env GXDE_CODENAME=${{ inputs.gxde-codename }} GO111MODULE=off dpkg-buildpackage -b
+            env gitPath=$gitPath bash .github/workflows/run-command-in-chroot.sh \
+              env GXDE_ARCH=${{ inputs.arch }} GXDE_CODENAME=${{ inputs.gxde-codename }} \
+              GXDE_ARCH=${{ inputs.arch }} GXDE_CROSS_ARCH=${{ inputs.gxde-cross-arch }} GO111MODULE=off \
+              dpkg-buildpackage -b
           else
-            env gitPath=$gitPath bash .github/workflows/run-command-in-chroot.sh env GXDE_CODENAME=${{ inputs.gxde-codename }} GO111MODULE=off bash build-deb.sh
+            env gitPath=$gitPath bash .github/workflows/run-command-in-chroot.sh \
+              env GXDE_ARCH=${{ inputs.arch }} GXDE_CODENAME=${{ inputs.gxde-codename }} \
+              GXDE_ARCH=${{ inputs.arch }} GXDE_CROSS_ARCH=${{ inputs.gxde-cross-arch }} GO111MODULE=off \
+              bash build-deb.sh
           fi
           cp $BOTTLEPATH/*.deb . -rv
           sudo rename 's/\.deb$/_${{ inputs.gxde-codename }}.deb/' *.deb

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

@@ -0,0 +1,35 @@
+name: Building GXDE Testing Package
+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-zhuangzhuang:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-zhuangzhuang-cross.yml@master
+    secrets: inherit
+  
+  call-hetao:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-hetao-cross.yml@master
+    secrets: inherit
+  
+  call-tianlu:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-tianlu-cross.yml@master
+    secrets: inherit

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

@@ -0,0 +1,71 @@
+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
+      gxde-cross-arch: amd64
+
+  call-arm64-hetao:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
+    secrets: inherit
+    with:
+      display-name: arm64-hetao
+      arch: amd64
+      rootfs-codename: crimson
+      rootfs-source: https://mirrors.kernel.org/deepin/beige/
+      gxde-codename: hetao
+      gxde-codename-upload: hetao
+      gxde-cross-arch: arm64
+
+  call-loong64-hetao:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
+    secrets: inherit
+    with:
+      display-name: loong64-hetao
+      arch: amd64
+      rootfs-codename: crimson
+      rootfs-source: https://mirrors.kernel.org/deepin/beige/
+      gxde-codename: hetao
+      gxde-codename-upload: hetao
+      gxde-cross-arch: loong64
+
+  call-riscv64-hetao:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
+    secrets: inherit
+    with:
+      display-name: riscv64-hetao
+      arch: amd64
+      rootfs-codename: crimson
+      rootfs-source: https://mirrors.kernel.org/deepin/beige/
+      gxde-codename: hetao
+      gxde-codename-upload: hetao
+      gxde-cross-arch: riscv64

.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,13 +22,9 @@ env:
   BOTTLEPATH: system-bottle
 
 jobs:
-  call-loong64-tianlu:
+  empty:
-    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
+    runs-on: ubuntu-latest
-    secrets: inherit
+    steps:
-    with:
+      - name: Empty
-      display-name: loong64-tianlu
+        run: |
-      arch: loong64
+          exit
-      rootfs-codename: sid
-      rootfs-source: https://deb.debian.org/debian-ports/
-      gxde-codename: bixie
-      gxde-codename-upload: tianlu

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

@@ -0,0 +1,72 @@
+name: Building GXDE Testing Package (tianlu)
+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-i386-tianlu:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
+    secrets: inherit
+    with:
+      display-name: i386-tianlu
+      arch: i386
+      rootfs-codename: bookworm
+      rootfs-source: https://deb.debian.org/debian/
+      gxde-codename: bixie
+      gxde-codename-upload: tianlu
+      gxde-cross-arch: i386
+      
+
+  call-amd64-tianlu:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
+    secrets: inherit
+    with:
+      display-name: amd64-tianlu
+      arch: amd64
+      rootfs-codename: bookworm
+      rootfs-source: https://deb.debian.org/debian/
+      gxde-codename: bixie
+      gxde-codename-upload: tianlu
+      gxde-cross-arch: amd64
+
+  call-arm64-tianlu:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
+    secrets: inherit
+    with:
+      display-name: arm64-tianlu
+      arch: amd64
+      rootfs-codename: bookworm
+      rootfs-source: https://deb.debian.org/debian/
+      gxde-codename: bixie
+      gxde-codename-upload: tianlu
+      gxde-cross-arch: arm64
+
+  call-mips64el-tianlu:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
+    secrets: inherit
+    with:
+      display-name: mips64el-tianlu
+      arch: amd64
+      rootfs-codename: bookworm
+      rootfs-source: https://deb.debian.org/debian/
+      gxde-codename: bixie
+      gxde-codename-upload: tianlu
+      gxde-cross-arch: mips64el

.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-zhuangzhuang-cross.yml

@@ -0,0 +1,60 @@
+name: Building GXDE Testing Package (zhuangzhuang)
+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-zhuangzhuang:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
+    secrets: inherit
+    with:
+      display-name: amd64-zhuangzhuang
+      arch: amd64
+      rootfs-codename: trixie
+      rootfs-source: https://deb.debian.org/debian/
+      gxde-codename: lizhi
+      gxde-codename-upload: zhuangzhuang
+      gxde-cross-arch: amd64
+
+  call-arm64-zhuangzhuang:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
+    secrets: inherit
+    with:
+      display-name: arm64-zhuangzhuang
+      arch: amd64
+      rootfs-codename: trixie
+      rootfs-source: https://deb.debian.org/debian/
+      gxde-codename: lizhi
+      gxde-codename-upload: zhuangzhuang
+      gxde-cross-arch: arm64
+
+
+  call-riscv64-zhuangzhuang:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
+    secrets: inherit
+    with:
+      display-name: riscv64-zhuangzhuang
+      arch: amd64
+      rootfs-codename: trixie
+      rootfs-source: https://deb.debian.org/debian/
+      gxde-codename: lizhi
+      gxde-codename-upload: zhuangzhuang
+      gxde-cross-arch: riscv64

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

@@ -22,17 +22,6 @@ env:
   BOTTLEPATH: system-bottle
 
 jobs:  
-  call-i386-zhuangzhuang:
-    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
-    secrets: inherit
-    with:
-      display-name: i386-zhuangzhuang
-      arch: i386
-      rootfs-codename: trixie
-      rootfs-source: https://deb.debian.org/debian/
-      gxde-codename: lizhi
-      gxde-codename-upload: zhuangzhuang
-
   call-amd64-zhuangzhuang:
     uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
     secrets: inherit
@@ -55,16 +44,7 @@ jobs:
       gxde-codename: lizhi
       gxde-codename-upload: zhuangzhuang
 
-  call-mips64el-zhuangzhuang:
+
-    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
-    secrets: inherit
-    with:
-      display-name: mips64el-zhuangzhuang
-      arch: mips64el
-      rootfs-codename: trixie
-      rootfs-source: https://deb.debian.org/debian/
-      gxde-codename: lizhi
-      gxde-codename-upload: zhuangzhuang
 
   call-riscv64-zhuangzhuang:
     uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master

.github/workflows/building-deb.yml

@@ -26,30 +26,10 @@ 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:
     uses: GXDE-OS/GXDE/.github/workflows/building-deb-tianlu.yml@master
     secrets: inherit
-
-  UploadOBS:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Get REPOSITORY Name
-        run: |
-          echo "REPO_NAME=$(echo "$GITHUB_REPOSITORY" | cut -d'/' -f2)" >> $GITHUB_ENV
-          REPO_NAME=$(echo "$GITHUB_REPOSITORY" | cut -d'/' -f2)
-          mkdir /home/runner/work/$REPO_NAME/$REPO_NAME/debian-deb-output
-
-      - name: Upload to OBS
-        uses: LingmoOS/action-upload-to-obs@0.0.4
-        with:
-          remove-old-sources: true
-          obs-package-name: ${{ env.REPO_NAME }}
-          obs-project-name: 'home:gfdgd-xi'
-          obs-user-name: ${{ secrets.OBS_USERNAME }}
-          obs-password: ${{ secrets.OBS_PASSWORD }}
-          obs-instance-url: 'https://api.opensuse.org'
-          local-package-dir: './debian-deb-output'

.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
+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,11 +56,11 @@ 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/
-    echo "deb [trusted=true] https://repo.gxde.org/gxde-os/tianlu-bpo ./" >> $bottlePath/etc/apt/sources.list.d/gxde-os-bpo.list
+    echo "deb [trusted=true] https://repo.gxde.top/gxde-os/tianlu-bpo ./" >> $bottlePath/etc/apt/sources.list.d/gxde-os-bpo.list
 fi
 # 配置 git
 #echo "deb [trusted=true] https://deb.debian.org/debian-ports/ unreleased main" | sudo tee $bottlePath/etc/apt/sources.list.d/debian-unreleased.list
@@ -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

@@ -20,13 +20,13 @@ export DEBIAN_FRONTEND=noninteractive  # 防止卡 tzdate
 
 
 if [[ $1 == "" ]] || [[ $1 == "tianlu" ]]; then
-    echo "deb [trusted=true] https://repo.gxde.org/gxde-os/tianlu ./" >> /etc/apt/sources.list.d/gxde-os.list
+    echo "deb [trusted=true] https://repo.gxde.top/gxde-os/tianlu ./" >> /etc/apt/sources.list.d/gxde-os.list
-    echo "deb [trusted=true] https://repo.gxde.org/gxde-os/bixie ./" >> /etc/apt/sources.list.d/gxde-os.list
+    echo "deb [trusted=true] https://repo.gxde.top/gxde-os/bixie ./" >> /etc/apt/sources.list.d/gxde-os.list
 elif [[ $1 == "zhuangzhuang" ]];then
-    echo "deb [trusted=true] https://repo.gxde.org/gxde-os/zhuangzhuang ./" >> /etc/apt/sources.list.d/gxde-os.list
+    echo "deb [trusted=true] https://repo.gxde.top/gxde-os/zhuangzhuang ./" >> /etc/apt/sources.list.d/gxde-os.list
-    echo "deb [trusted=true] https://repo.gxde.org/gxde-os/lizhi ./" >> /etc/apt/sources.list.d/gxde-os.list
+    echo "deb [trusted=true] https://repo.gxde.top/gxde-os/lizhi ./" >> /etc/apt/sources.list.d/gxde-os.list
 else
-    echo "deb [trusted=true] https://repo.gxde.org/gxde-os/$1 ./" >> /etc/apt/sources.list.d/gxde-os.list
+    echo "deb [trusted=true] https://repo.gxde.top/gxde-os/$1 ./" >> /etc/apt/sources.list.d/gxde-os.list
 fi
 #if [[ $(dpkg --print-architecture) == "loong64" ]]; then
 #    echo "deb [trusted=true] https://deb.debian.org/debian-ports/ unreleased main" > /etc/apt/sources.list.d/debian-unreleased.list
@@ -58,9 +58,10 @@ 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 /
+rm gxde-desktop-base_*.deb -rfv
 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

MAINTAINERS

@@ -1,5 +1,6 @@
 This file contains honored contributers of GXDE and GXDE OS. The list is in alphabetical order. 
 
+dependon <liuminghang0821@gmail.com>
 elysia <c.elysia@foxmail.com>
 gfdgd xi <3025613752@qq.com>
 qingyu <qingyuqingyu123@proton.me>

README.md

@@ -39,17 +39,17 @@ Discord: https://discord.gg/t5Uf2xYpvA
 > Currently, ISO supports amd64, arm64
 
 
-Please check https://www.gxde.org/en/install/
+Please check https://www.gxde.top/en/install/
 
-![1](https://www.gxde.org/1.png)
+![1](https://www.gxde.top/1.jpg)
 
-![2](https://www.gxde.org/2.png)
+![2](https://www.gxde.top/2.jpg)
 
-![3](https://www.gxde.org/3.png)
+![3](https://www.gxde.top/3.jpg)
 
-![4](https://www.gxde.org/4.png)
+![4](https://www.gxde.top/4.jpg)
 
-![5](https://www.gxde.org/5.png)
+![5](https://www.gxde.top/5.jpg)
 
 
 ## Other Projects

README.zh.md

@@ -2,6 +2,8 @@
 <hr>
 <a href='https://gitee.com/GXDE-OS/GXDE/stargazers'><img src='https://gitee.com/GXDE-OS/GXDE/badge/star.svg?theme=dark' alt='star'></img></a>
 
+![G-Start](https://gitcode.com/GXDE-OS/GXDE/star/badge.svg)  
+
 
 **[English](/README.md)**
 
@@ -37,17 +39,17 @@ Discord：https://discord.gg/t5Uf2xYpvA
 
 ## 安装
 
-请查看 https://www.gxde.org/install/install
+请查看 https://www.gxde.top/install/install
 
-![1](https://www.gxde.org/1.png)
+![1](https://www.gxde.top/1.jpg)
 
-![2](https://www.gxde.org/2.png)
+![2](https://www.gxde.top/2.jpg)
 
-![3](https://www.gxde.org/3.png)
+![3](https://www.gxde.top/3.jpg)
 
-![4](https://www.gxde.org/4.png)
+![4](https://www.gxde.top/4.jpg)
 
-![5](https://www.gxde.org/5.png)
+![5](https://www.gxde.top/5.jpg)
 
 
 ## 其它项目

debian/changelog

@@ -1,4 +1,4 @@
-gxde (2025.05.04) UNRELEASED; urgency=medium
+gxde (2025.08.29gxde1) UNRELEASED; urgency=medium
 
   * 新增 remmina 以解决远程问题
   * 改为安装 dde-printer 
@@ -6,8 +6,19 @@ gxde (2025.05.04) UNRELEASED; urgency=medium
   * 修复安装 gxde-desktop-android 会自动安装 gxde-desktop-extra 的问题
   * 新增推荐依赖：龙芯应用合作社（仅限：mips64el loongarch64 loong64）
   * 移除推荐依赖：plank
+  * 修复小小电脑无法正常更新 gxde-desktop-android 的问题
+  * 修改 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 
+  * 新增推荐依赖 bash-pinyin-completion
+  * 新增推荐依赖gxde-kernel-manager、deepin-log-viewer
 
- -- gfdgd_xi <3025613752@qq.com>  Sun, 04 May 2025 19:29:23 +0800
+ -- gfdgd_xi <3025613752@qq.com>  Fri, 29 Aug 2025 23:15:19 +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,10 @@ Recommends: ${misc:Depends},
  remmina,
  screensaver-pp,
  gxde-time-screensaver,
+ gxde-desktop,
+ bash-pinyin-completion,
+ gxde-kernel-manager,
+ deepin-log-viewer,
 Description: GXDE New Desktop Environment Extra - Next
  This is a meta package depends GXDE New Desktop Envrionment Extra.
  .
@@ -53,7 +56,6 @@ Depends:
  ${misc:Depends},
  gxde-daemon,
  gxde-desktop,
- gxde-calculator, 
  gxde-terminal, 
  gxde-deb-installer, 
  gxde-editor, 
@@ -64,10 +66,10 @@ Depends:
  gxde-movie, 
  gxde-quick-hash, 
  spark-store | aptss, 
- loongsonapplication,
  deepin-system-monitor,
- dde-control-center,
+ gxde-control-center,
- dde-file-manager,
+ gxde-file-manager,
+ spark-store | aptss,
 Conflicts:
  plymouth-theme-gxde-logo,
  linux-kernel-gxde-i386,
@@ -90,28 +92,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,
- dde-control-center(>> 2.90.5),
+ gxde-control-center,
- dde-launcher,
+ 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,
@@ -147,7 +149,6 @@ Recommends:
  x-display-manager,
  gxde-image-viewer,
  gxde-calendar,
- gxde-calculator,
  gxde-voice-recorder,
  deepin-screen-recorder,
  warm-sched,
@@ -160,12 +161,11 @@ Recommends:
  fcitx5-table,
  fantascene-dynamic-wallpaper,
  x11vnc,
+ apt-is-aptss,
 Conflicts:
- dde-control-center(<< 2.90.5),
  deepin-desktop-environment-desktop,
  deepin-desktop-environment-dock,
  deepin-desktop-environment-launcher,
- libdframeworkdbus2(>> 15)
 Description: GXDE New Desktop Environment - Next
  This is a meta package depends GXDE New Desktop Envrionment.
  .