误传了

Merge pull request !8 from shenmo/N/A

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

@@ -208,7 +208,8 @@ jobs:
 
       - name: Configure Base System
         run: |
-          bash .github/workflows/configure-building-enviroment-base-system.sh loong64 unstable $REPOSITORY https://github.com/$GITHUB_REPOSITORY https://deb.debian.org/debian-ports/
+          bash .github/workflows/configure-building-enviroment-base-system.sh loong64 unstable $REPOSITORY https://deb.debian.org/debian-ports/
+          #bash .github/workflows/configure-building-enviroment-base-system.sh loong64 unstable $REPOSITORY https://github.com/$GITHUB_REPOSITORY https://deb.debian.org/debian-ports/
 
       - name: Building ${{ GITHUB.repository }}
         run: |

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

@@ -0,0 +1,123 @@
+name: Building GXDE Testing SID Package
+run-name: Building SID ${{ 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:  
+  loong64:
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Clone Repository To Get Script
+        run: |
+          #apt update
+          #apt install sudo git -y
+          git clone $REPOSITORY --depth=1
+          mv $(basename $REPOSITORY)/* . -v
+          mv $(basename $REPOSITORY)/.* . -v | true
+
+      - name: Configure Base System
+        run: |
+          bash .github/workflows/configure-building-enviroment-base-system.sh loong64 sid $REPOSITORY https://github.com/$GITHUB_REPOSITORY https://deb.debian.org/debian-ports/
+          #bash .github/workflows/configure-building-enviroment-base-system.sh loong64 sid $REPOSITORY https://github.com/$GITHUB_REPOSITORY https://deb.debian.org/debian-ports/
+
+      - name: Building ${{ GITHUB.repository }}
+        run: |
+          env gitPath=$(basename $GITHUB_REPOSITORY) bash .github/workflows/run-command-in-chroot.sh env GO111MODULE=off dpkg-buildpackage -b
+
+      - name: Remove Debug Package
+        run: |
+          env env gitPath=$(basename $GITHUB_REPOSITORY) bash .github/workflows/run-command-in-chroot.sh rm -rfv ../*dbg*.deb
+
+      - name: Pack tar
+        run: |
+          cd $BOTTLEPATH
+          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 tianlu $UPATH/$tarName > /dev/null
+
+  
+
+  riscv64:
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Clone Repository To Get Script
+        run: |
+          #apt update
+          #apt install sudo git -y
+          git clone $REPOSITORY --depth=1
+          mv $(basename $REPOSITORY)/* . -v
+          mv $(basename $REPOSITORY)/.* . -v | true
+
+      - name: Configure Base System
+        run: |
+          bash .github/workflows/configure-building-enviroment-base-system.sh riscv64 sid $REPOSITORY https://github.com/$GITHUB_REPOSITORY 
+
+      - name: Building ${{ GITHUB.repository }}
+        run: |
+          set +e
+          env gitPath=$(basename $GITHUB_REPOSITORY) bash .github/workflows/run-command-in-chroot.sh env GO111MODULE=off dpkg-buildpackage -b 
+
+      - name: Remove Debug Package
+        run: |
+          set +e
+          env env gitPath=$(basename $GITHUB_REPOSITORY) bash .github/workflows/run-command-in-chroot.sh rm -rfv ../*dbg*.deb 
+
+      - name: Pack tar
+        run: |
+          set +e
+          cd $BOTTLEPATH
+          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: |
+          set +e
+          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)
+          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 tianlu $UPATH/$tarName > /dev/null
+          fi
+

.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
@@ -208,7 +209,8 @@ jobs:
 
       - name: Configure Base System
         run: |
-          bash .github/workflows/configure-building-enviroment-base-system.sh loong64 unstable $REPOSITORY https://github.com/$GITHUB_REPOSITORY https://deb.debian.org/debian-ports/
+          bash .github/workflows/configure-building-enviroment-base-system.sh loong64 sid $REPOSITORY https://github.com/$GITHUB_REPOSITORY https://deb.debian.org/debian-ports/
+          #bash .github/workflows/configure-building-enviroment-base-system.sh loong64 sid $REPOSITORY https://github.com/$GITHUB_REPOSITORY https://deb.debian.org/debian-ports/
 
       - name: Building ${{ GITHUB.repository }}
         run: |
@@ -238,7 +240,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 +292,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/building.yml

@@ -1,4 +1,4 @@
-name: Building Testing
+name: Building Program
 run-name: Building ${{ GITHUB.REPOSITORY }}
 
 on:

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

@@ -27,7 +27,10 @@ else
         useDebianPort
     fi
 fi
-sudo debootstrap --arch=$1 $2 $bottlePath $5
+sudo debootstrap --include=git,gcc,make,debian-ports-archive-keyring,debian-archive-keyring,g++,dpkg-dev,qtbase5-dev,ca-certificates --arch=$1 $2 $bottlePath $5
+#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
 if [[ $? != 0 ]] && [[ $1 == loong64 ]]; then
     sudo apt install squashfs-tools git -y
     wget https://github.com/GXDE-OS/GXDE/releases/download/resources/debian-base-loong64.squashfs
@@ -42,6 +45,7 @@ if [[ $6 == "backport" ]]; then
     sudo cp -rv .github/workflows/90bookworm-backports $bottlePath/etc/apt/preferences.d/
 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
 sudo chroot $bottlePath apt update
 sudo chroot $bottlePath apt full-upgrade -y
 sudo chroot $bottlePath apt install git -y

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

@@ -15,21 +15,29 @@ 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
-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
+# 判断是否是 Ubuntu
+isUbuntu=$(cat /etc/os-release | grep Ubuntu | wc -l)
+if [[ $isUbuntu -gt 1 ]]; then
+    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://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
-    apt update -y
+    apt update -o Acquire::Check-Valid-Until=false -y
     if [[ $? == 0 ]]; then
         break
     fi
     sleep 1
 done
-apt install dpkg-dev sudo neofetch debian-ports-archive-keyring debian-archive-keyring -y
-neofetch
+apt install dpkg-dev sudo debian-ports-archive-keyring debian-archive-keyring -y
+#neofetch
 #if [[ `arch` != "x86_64" ]]; then
 #    apt source qemu
 #    cd qemu-*/
@@ -53,4 +61,4 @@ do
     fi
     sleep 1
 done
-exit 0
+exit 0

MAINTAINERS

@@ -0,0 +1,7 @@
+This file contains honored contributers of GXDE and GXDE OS. The list is in alphabetical order. 
+
+elysia <c.elysia@foxmail.com>
+gfdgd xi <3025613752@qq.com>
+qingyu <qingyuqingyu123@proton.me>
+shenmo <shenmo@spark-app.store>
+yoyo <chowhound_xb@163.com>

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,8 +28,10 @@ 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
+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,19 +1,23 @@
-gxde (2024.10.14) UNRELEASED; urgency=medium
+gxde (2024.12.01) 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 
+
+ -- gfdgd_xi <3025613752@qq.com>  Thu, 14 Nov 2024 22:23:21 +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,11 @@ Depends: ${misc:Depends},
  gxde-boot-maker,
  deepin-clone,
  system-config-printer,
- deepin-system-monitor
+ deepin-system-monitor,
+ gxde-downloader,
+ gparted,
+ fantascene-dynamic-wallpaper,
+ x11vnc,
 Description: GXDE New Desktop Environment Extra - Next
  This is a meta package depends GXDE New Desktop Envrionment Extra.
  .
@@ -44,8 +46,20 @@ Depends:
  ${misc:Depends},
  gxde-daemon,
  gxde-desktop,
-Recommends:
- gxde-desktop-extra
+ gxde-calculator, 
+ gxde-terminal, 
+ gxde-deb-installer, 
+ gxde-editor, 
+ gxde-image-viewer, 
+ gxde-ocr, 
+ gxde-music, 
+ gxde-font-installer, 
+ gxde-movie, 
+ gxde-quick-hash, 
+ spark-store | aptss, 
+ deepin-system-monitor,
+ dde-control-center,
+ dde-file-manager,
 Conflicts:
  plymouth-theme-gxde-logo,
  linux-kernel-gxde-i386,
@@ -58,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.
  .
@@ -81,10 +98,10 @@ Depends: ${misc:Depends},
  gxde-kwin | dde-kwin,
  deepin-screensaver,
  gxde-default-settings,
- gxde-shell-tools
+ gxde-shell-tools,
+ gxde-compressor,
 Recommends:
  gxde-desktop-extra,
- file-roller,
  gxde-editor,
  pppoe,
  gvfs-fuse,
@@ -120,7 +137,7 @@ Recommends:
  miraclecast,
  x-display-manager,
  gxde-image-viewer,
- dde-calendar,
+ gxde-calendar,
  gxde-calculator,
  gxde-voice-recorder,
  deepin-screen-recorder,
@@ -132,7 +149,9 @@ Recommends:
  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,