2024.12.13

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

.github/workflows/building-deb.yml

@@ -295,48 +295,48 @@ jobs:
             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
+  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

@@ -18,14 +18,15 @@ export DEBIAN_FRONTEND=noninteractive  # 防止卡 tzdate
 # 判断是否是 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
+    echo "deb [trusted=true] https://repo.gxde.org/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
+    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.org/gxde-os/bixie ./" >> /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
 #fi
+apt install -f -y
 apt install debian-ports-archive-keyring debian-archive-keyring -y
 for i in {1..8};
 do

README.md

@@ -30,7 +30,8 @@ Please Click the Star in the Upper Right Corner, Your Support is Our Greatest Mo
 ### User Group
 <center><img src=new-logo-long.png width=300/></center>
 
-QQ Group: 881201853
+QQ Group: 881201853  
+Discord: https://discord.gg/t5Uf2xYpvA  
 
 
 

README.zh.md

@@ -28,7 +28,8 @@ GXDE OS 内置 [星火应用商店](https://gitee.com/spark-store-project/)，
 
 ### 沟通渠道
 
-QQ 群：881201853
+QQ 群：881201853  
+Discord：https://discord.gg/t5Uf2xYpvA  
 
 请点击右上角的Star，您的支持是我们最大的动力。
 

debian/changelog

@@ -1,9 +1,14 @@
-gxde (2024.11.10) UNRELEASED; urgency=medium
+gxde (2024.12.13) UNRELEASED; urgency=medium
 
   * Change package: dde-calendar --> gxde-calendar
   * Add package: gparted
+  * Change gxde-desktop depends, gxde-desktop-extra, gxde-desktop-android depends and conflicts
+  * Replace file-roller by gxde-compressor 
+  * Recommend deepin-camera
+  * Replace gxde-calculator with deepin-calc
+  * Prefer dde-kwin
 
- -- gfdgd_xi <3025613752@qq.com>  Sun, 10 Nov 2024 11:14:38 +0800
+ -- gfdgd_xi <3025613752@qq.com>  Thu, 14 Nov 2024 22:23:21 +0800
 
 gxde (2024.10.20) UNRELEASED; urgency=medium
 

debian/control

@@ -10,7 +10,7 @@ Package: gxde-desktop-extra
 Architecture: all
 Recommends: ${misc:Depends},
  gxde-voice-recorder,
- gxde-calculator,
+ deepin-calculator,
  gxde-terminal,
  gxde-deb-installer,
  gxde-editor,
@@ -32,7 +32,9 @@ Recommends: ${misc:Depends},
  system-config-printer,
  deepin-system-monitor,
  gxde-downloader,
- gparted
+ gparted,
+ fantascene-dynamic-wallpaper,
+ x11vnc,
 Description: GXDE New Desktop Environment Extra - Next
  This is a meta package depends GXDE New Desktop Envrionment Extra.
  .
@@ -70,6 +72,9 @@ Conflicts:
  linux-kernel-oldstable-gxde-mips64el,
  linux-kernel-gxde-loong64,
  linux-kernel-oldstable-gxde-loong64,
+ plymouth,
+ tela-grub2-themes,
+ plymouth-theme-gxde-logo,
 Description: GXDE New Desktop Environment For PRoot - Next
  This is a meta package depends GXDE New Desktop Envrionment in Android PRoot.
  .
@@ -90,13 +95,14 @@ Depends: ${misc:Depends},
  eject,
  gxde-wallpapers,
  fonts-noto,
- gxde-kwin | dde-kwin,
+ dde-kwin | gxde-kwin,
  deepin-screensaver,
  gxde-default-settings,
- gxde-shell-tools
+ gxde-shell-tools,
+ gxde-compressor,
+ gxde-introduction,
 Recommends:
  gxde-desktop-extra,
- file-roller,
  gxde-editor,
  pppoe,
  gvfs-fuse,
@@ -137,14 +143,16 @@ Recommends:
  gxde-voice-recorder,
  deepin-screen-recorder,
  warm-sched,
- cheese,
+ deepin-camera,
  gxde-top-panel,
  plank,
  fcitx5-material-color,
  tela-grub2-themes,
  plymouth-theme-gxde-logo,
  fcitx5,
- fcitx5-table
+ fcitx5-table,
+ fantascene-dynamic-wallpaper,
+ x11vnc,
 Conflicts:
  dde-control-center(<< 2.90.5),
  deepin-desktop-environment-desktop,