update debian/control.

Signed-off-by: shenmo <jifengshenmo@outlook.com>
三调
2026-08-06 14:53:57 +08:00 · 2024-11-14 12:46:27 +00:00 · 2024-11-12 23:03:55 +08:00 · 2024-11-12 22:54:17 +08:00 · 2024-11-12 22:46:45 +08:00 · 2024-11-12 22:27:39 +08:00
9 changed files with 220 additions and 69 deletions
@@ -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: |
@@ -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
+
@@ -209,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: |
@@ -294,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
  
@@ -1,4 +1,4 @@
-name: Building Testing
+name: Building Program
 run-name: Building ${{ GITHUB.REPOSITORY }}

 on:
@@ -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
@@ -23,19 +23,20 @@ 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
+#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 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-*/
@@ -59,4 +60,4 @@ do
    fi
    sleep 1
 done
-exit 0
+exit 0
@@ -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>
@@ -1,20 +1,21 @@
-gxde (2024.10.19) UNRELEASED; urgency=medium
+gxde (2024.11.10) UNRELEASED; urgency=medium
+
+  * Change package: dde-calendar --> gxde-calendar
+  * Add package: gparted
+
+ -- gfdgd_xi <3025613752@qq.com>  Sun, 10 Nov 2024 11:14:38 +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.
@@ -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,7 +17,6 @@ Depends: ${misc:Depends},
 gxde-image-viewer,
 gxde-icon-theme,
 gxde-sea-icon-theme,
- gxde-download,
 gxde-ocr,
 gxde-music,
 gxde-picker,
@@ -31,7 +30,9 @@ Depends: ${misc:Depends},
 gxde-boot-maker,
 deepin-clone,
 system-config-printer,
- deepin-system-monitor
+ deepin-system-monitor,
+ gxde-downloader,
+ gparted
 Description: GXDE New Desktop Environment Extra - Next
 This is a meta package depends GXDE New Desktop Envrionment Extra.
 .
@@ -43,8 +44,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,
@@ -119,7 +132,7 @@ Recommends:
 miraclecast,
 x-display-manager,
 gxde-image-viewer,
- dde-calendar,
+ gxde-calendar,
 gxde-calculator,
 gxde-voice-recorder,
 deepin-screen-recorder,
Author	SHA1	Message	Date
shenmo7192andGitee	ab22b376b6	update debian/control. Signed-off-by: shenmo <jifengshenmo@outlook.com>	2024-11-14 12:46:27 +00:00
gfdgd-xi	92dab943d5	三调	2024-11-12 23:03:55 +08:00
gfdgd-xi	da202ec80b	三调	2024-11-12 22:54:17 +08:00
gfdgd-xi	060c93511f	三调	2024-11-12 22:46:45 +08:00
gfdgd-xi	7bb6b497f6	二调	2024-11-12 22:27:39 +08:00
gfdgd-xi	041520a003	调整动态构建部分包安装方式	2024-11-12 22:07:17 +08:00
gfdgd-xiandGitee	a0b1e96888	!7 remove neofetch to reduce unnecessary configure cost Merge pull request !7 from shenmo/N/A	2024-11-12 13:57:25 +00:00
shenmo7192andGitee	5a2e0ca3e0	remove neofetch to reduce unnecessary configure cost Signed-off-by: shenmo <jifengshenmo@outlook.com>	2024-11-12 07:29:37 +00:00
gfdgd-xi	17300ff510	调整发行版代号	2024-11-12 13:13:16 +08:00
gfdgd-xi	d0b88cd451	新增滚动构建	2024-11-12 12:56:00 +08:00
gfdgd-xi	f6edd4e141	新增gparted	2024-11-10 11:15:03 +08:00
shenmo7192andGitee	70189c24dd	update MAINTAINERS. Signed-off-by: shenmo <jifengshenmo@outlook.com>	2024-11-08 16:32:30 +00:00
shenmo7192andGitee	a23abe9df7	!6 update MAINTAINERS. Merge pull request !6 from AAA Elysia 猫猫侠 ⁧~喵/N/A	2024-11-08 16:32:01 +00:00
shenmo7192andGitee	9436e0311a	update MAINTAINERS. Signed-off-by: shenmo <jifengshenmo@outlook.com>	2024-11-08 16:31:44 +00:00
AAA Elysia 猫猫侠 ⁧~喵andGitee	8e33673d02	update MAINTAINERS. Add elysia to list	2024-11-08 16:28:47 +00:00
gfdgd-xi	2180a04d29	停止ubuntu的构建	2024-11-06 22:03:36 +08:00
gfdgd-xi	f06089d83f	loong64配置容器时会安装签名以避免反复apt update	2024-11-03 15:05:10 +08:00
shenmo7192andGitee	e84224970c	!5 update MAINTAINERS. Merge pull request !5 from 柚子/N/A	2024-10-29 15:37:53 +00:00
柚子andGitee	8368ed168a	update MAINTAINERS. Signed-off-by: 柚子 <chowhound_xb@163.com>	2024-10-29 15:36:08 +00:00
shenmo7192andGitee	eed4e0d776	update MAINTAINERS. Signed-off-by: shenmo <jifengshenmo@outlook.com>	2024-10-29 15:02:44 +00:00
gfdgd-xi	d16adc50e4	补充MAINTAINERS	2024-10-29 22:55:35 +08:00
gfdgd-xiandGitee	4efabb2023	!4 维护者名单 Merge pull request !4 from qingyu/N/A	2024-10-29 14:54:16 +00:00
qingyuandGitee	c7e3f6ed0d	docs: 维护者名单 Signed-off-by: qingyu <335809116@qq.com>	2024-10-29 14:21:51 +00:00
gfdgd-xi	01bae0a5e6	更换url	2024-10-27 14:15:19 +08:00
gfdgd-xi	0d261f4f57	少改了个地方	2024-10-27 12:05:38 +08:00
gfdgd-xi	fcb98c9b83	loong64指定特定的源	2024-10-27 06:44:34 +08:00
gfdgd-xi	7c79626344	调整gxde-desktop-extra的依赖包为recommends	2024-10-26 15:17:59 +08:00
gfdgd-xi	73b6d58a42	修改包名	2024-10-26 15:06:54 +08:00
shenmo7192	f44cf966ae	fix coma	2024-10-20 20:42:27 +08:00
shenmo7192andGitee	b62bb30caa	gxde-download --> gxde-downloader Signed-off-by: shenmo <jifengshenmo@outlook.com>	2024-10-20 08:58:43 +00:00