调整gxde-desktop-extra的依赖包为recommends

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

.github/workflows/building-deb.yml

@@ -63,9 +63,9 @@ jobs:
           ssh-keyscan -p $UPORT -H $UHOST >> ~/.ssh/known_hosts
           tarName=$(ls | grep .tar | head -n 1)
           sshpass -p "$UPASSWD" rsync -e "ssh -p $UPORT" $tarName $UUSERS@$UHOST:$UPATH
-          sshpass -p "$UPASSWD" ssh $UUSERS@$UHOST -p $UPORT $UPROGRAM $UPATH/$tarName > /dev/null
+          sshpass -p "$UPASSWD" ssh $UUSERS@$UHOST -p $UPORT $UPROGRAM tianlu $UPATH/$tarName > /dev/null
 
-  amd64:
+  amd64-Debian12:
     runs-on: ubuntu-latest
     steps:
       - name: Clone Repository To Get Script
@@ -106,10 +106,11 @@ jobs:
           ssh-keyscan -p $UPORT -H $UHOST >> ~/.ssh/known_hosts
           tarName=$(ls | grep .tar | head -n 1)
           sshpass -p "$UPASSWD" rsync -e "ssh -p $UPORT" $tarName $UUSERS@$UHOST:$UPATH
-          sshpass -p "$UPASSWD" ssh $UUSERS@$UHOST -p $UPORT $UPROGRAM $UPATH/$tarName > /dev/null
+          sshpass -p "$UPASSWD" ssh $UUSERS@$UHOST -p $UPORT $UPROGRAM tianlu $UPATH/$tarName > /dev/null
 
   arm64:
     runs-on: ubuntu-24.04
+    #runs-on: self-hosted
     steps:
       - name: Clone Repository To Get Script
         run: |
@@ -149,7 +150,7 @@ jobs:
           ssh-keyscan -p $UPORT -H $UHOST >> ~/.ssh/known_hosts
           tarName=$(ls | grep .tar | head -n 1)
           sshpass -p "$UPASSWD" rsync -e "ssh -p $UPORT" $tarName $UUSERS@$UHOST:$UPATH
-          sshpass -p "$UPASSWD" ssh $UUSERS@$UHOST -p $UPORT $UPROGRAM $UPATH/$tarName > /dev/null
+          sshpass -p "$UPASSWD" ssh $UUSERS@$UHOST -p $UPORT $UPROGRAM tianlu $UPATH/$tarName > /dev/null
   
 
   mips64:
@@ -193,7 +194,7 @@ jobs:
           ssh-keyscan -p $UPORT -H $UHOST >> ~/.ssh/known_hosts
           tarName=$(ls | grep .tar | head -n 1)
           sshpass -p "$UPASSWD" rsync -e "ssh -p $UPORT" $tarName $UUSERS@$UHOST:$UPATH
-          sshpass -p "$UPASSWD" ssh $UUSERS@$UHOST -p $UPORT $UPROGRAM $UPATH/$tarName > /dev/null
+          sshpass -p "$UPASSWD" ssh $UUSERS@$UHOST -p $UPORT $UPROGRAM tianlu $UPATH/$tarName > /dev/null
 
   loong64:
     runs-on: ubuntu-24.04
@@ -238,7 +239,7 @@ jobs:
           ssh-keyscan -p $UPORT -H $UHOST >> ~/.ssh/known_hosts
           tarName=$(ls | grep .tar | head -n 1)
           sshpass -p "$UPASSWD" rsync -e "ssh -p $UPORT" $tarName $UUSERS@$UHOST:$UPATH
-          sshpass -p "$UPASSWD" ssh $UUSERS@$UHOST -p $UPORT $UPROGRAM $UPATH/$tarName > /dev/null
+          sshpass -p "$UPASSWD" ssh $UUSERS@$UHOST -p $UPORT $UPROGRAM tianlu $UPATH/$tarName > /dev/null
 
   
 
@@ -290,7 +291,51 @@ jobs:
           tarName=$(ls | grep .tar | head -n 1)
           if [[ $tarName != "" ]]; then
             sshpass -p "$UPASSWD" rsync -e "ssh -p $UPORT" $tarName $UUSERS@$UHOST:$UPATH > /dev/null
-            sshpass -p "$UPASSWD" ssh $UUSERS@$UHOST -p $UPORT $UPROGRAM $UPATH/$tarName > /dev/null
+            sshpass -p "$UPASSWD" ssh $UUSERS@$UHOST -p $UPORT $UPROGRAM tianlu $UPATH/$tarName > /dev/null
           fi
 
-      
+  amd64-ubuntu24:
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Clone Repository To Get Script
+        run: |
+          git clone $REPOSITORY --depth=1
+          mv $(basename $REPOSITORY)/* . -v
+          mv $(basename $REPOSITORY)/.* . -v | true
+
+      - name: Configure Base System
+        run: |
+          git clone https://github.com/$GITHUB_REPOSITORY 
+          cd $(basename $GITHUB_REPOSITORY)
+          sudo bash ../.github/workflows/configure-building-enviroment.sh
+
+      - name: Building ${{ GITHUB.repository }}
+        run: |
+          cd $(basename $GITHUB_REPOSITORY)
+          env GO111MODULE=off dpkg-buildpackage -b
+
+      - name: Remove Debug Package
+        run: |
+          rm -rfv *dbg*.deb
+
+      - name: Pack tar
+        run: |
+          sudo tar -cvf deb-$(date +%s).tar *.deb 
+
+      - name: Push
+        env: 
+          UPASSWD: ${{ secrets.PASSWD }}
+          UUSERS: ${{ secrets.USERS }}
+          UHOST: ${{ secrets.HOST }}
+          UPATH: ${{ secrets.UPATH }}
+          UPROGRAM: ${{ secrets.UPROGRAM }}
+          UPORT: ${{ secrets.UPORT }}
+        run: |
+          sudo apt update
+          sudo apt install sshpass -y
+          mkdir -p ~/.ssh/
+          ssh-keyscan -p $UPORT -H $UHOST >> ~/.ssh/known_hosts
+          tarName=$(ls | grep .tar | head -n 1)
+          sshpass -p "$UPASSWD" rsync -e "ssh -p $UPORT" $tarName $UUSERS@$UHOST:$UPATH
+          sshpass -p "$UPASSWD" ssh $UUSERS@$UHOST -p $UPORT $UPROGRAM hetao $UPATH/$tarName > /dev/null
+  

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

@@ -15,8 +15,14 @@ export DEBIAN_FRONTEND=noninteractive  # 防止卡 tzdate
 #    echo "deb-src http://deb.debian.org/debian sid main" > /etc/apt/sources.list.d/debian-sources.list
 #fi
 # 写入 GXDE 源
-echo "deb [trusted=true] https://repo1.gxde.top/gxde-os/tianlu ./" >> /etc/apt/sources.list.d/gxde-os.list
-echo "deb [trusted=true] https://repo1.gxde.top/gxde-os/bixie ./" >> /etc/apt/sources.list.d/gxde-os.list
+# 判断是否是 Ubuntu
+isUbuntu=$(cat /etc/os-release | grep Ubuntu | wc -l)
+if [[ $isUbuntu -gt 1 ]]; then
+    echo "deb [trusted=true] https://repo1.gxde.top/gxde-os/hetao ./" >> /etc/apt/sources.list.d/gxde-os.list
+else
+    echo "deb [trusted=true] https://repo1.gxde.top/gxde-os/tianlu ./" >> /etc/apt/sources.list.d/gxde-os.list
+    echo "deb [trusted=true] https://repo1.gxde.top/gxde-os/bixie ./" >> /etc/apt/sources.list.d/gxde-os.list
+fi
 if [[ $(dpkg --print-architecture) == "loong64" ]]; then
     echo "deb [trusted=true] http://deb.debian.org/debian-ports unreleased main" > /etc/apt/sources.list.d/debian-unreleased.list
 fi

README.md

@@ -1,13 +1,9 @@
-<center><img src=new-logo-long.png width=300/></center>
-<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>
 
 
+## Welcome to GXDE OS Community 
+
 **[中文](/README.zh.md)**
 
-
-## Introduction
-
 GXDE OS is an Debian based Linux distro featuring GXDE Desktop Environment. It offers an elegant, beautifu, light weight and out-of-the-box experience. 
 
 ### Classic and Extended Deepin DE Experience 
@@ -32,6 +28,7 @@ Also, simply replace apt with aptss will  `apt` with `aptss` command can boost y
 Please Click the Star in the Upper Right Corner, Your Support is Our Greatest Motivation
 
 ### User Group
+<center><img src=new-logo-long.png width=300/></center>
 
 QQ Group: 881201853
 

debian/changelog

@@ -1,19 +1,20 @@
-gxde (2024.10.14) UNRELEASED; urgency=medium
+gxde (2024.10.26) UNRELEASED; urgency=medium
+
+  * Change package: dde-calendar --> gxde-calendar
+
+ -- gfdgd_xi <3025613752@qq.com>  Sat, 26 Oct 2024 15:05:04 +0800
+
+gxde (2024.10.20) UNRELEASED; urgency=medium
 
   * Add package: gxde-boot-maker
   * Add package : system-config-printer
   * Add package : deepin-clone
   * Add package: deepin-system-monitor
+  * Change package: deepin-movie --> gxde-movie
+  * Change package: gxde-download --> gxde-downloader
 
 -- shenmo <shenmo@spark-app.store>  Fri, 04 Oct 2024 09:22:50 +0800
 
-gxde (2024.10.01) UNRELEASED; urgency=medium
-
-  * fix 15.14 conponents dependencies
-  * 
-
- -- gfdgd_xi <3025613752@qq.com>  Sat, 05 Oct 2024 13:39:12 +0800
-
 gxde (2024.09.01) UNRELEASED; urgency=medium
 
   * Non-maintainer upload.

debian/control

@@ -8,7 +8,7 @@ Homepage: http://www.gfdgdxi.top
 
 Package: gxde-desktop-extra
 Architecture: all
-Depends: ${misc:Depends},
+Recommends: ${misc:Depends},
  gxde-voice-recorder,
  gxde-calculator,
  gxde-terminal,
@@ -17,13 +17,11 @@ Depends: ${misc:Depends},
  gxde-image-viewer,
  gxde-icon-theme,
  gxde-sea-icon-theme,
- gxde-download,
  gxde-ocr,
  gxde-music,
  gxde-picker,
  gxde-font-installer,
- deepin-movie,
- gxde-requ,
+ gxde-movie,
  gxde-quick-hash,
  gxde-sendbylan,
  gxde-dict,
@@ -32,7 +30,8 @@ Depends: ${misc:Depends},
  gxde-boot-maker,
  deepin-clone,
  system-config-printer,
- deepin-system-monitor
+ deepin-system-monitor,
+ gxde-downloader
 Description: GXDE New Desktop Environment Extra - Next
  This is a meta package depends GXDE New Desktop Envrionment Extra.
  .
@@ -120,7 +119,7 @@ Recommends:
  miraclecast,
  x-display-manager,
  gxde-image-viewer,
- dde-calendar,
+ gxde-calendar,
  gxde-calculator,
  gxde-voice-recorder,
  deepin-screen-recorder,