From 4344d0481758115cc762918fcf1c61572a072970 Mon Sep 17 00:00:00 2001 From: gfdgd_xi <3025613752@qq.com> Date: Fri, 4 Oct 2024 09:23:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E6=AD=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/building-deb.yml | 93 ++++++++++++++++++ debian/changelog | 6 +- debian/control | 22 +++++ debian/debiandde/DEBIAN/control | 16 --- debian/debiandde/DEBIAN/md5sums | 2 - .../usr/share/doc/debiandde/changelog.gz | Bin 340 -> 0 bytes .../usr/share/doc/debiandde/copyright | 24 ----- 7 files changed, 118 insertions(+), 45 deletions(-) delete mode 100644 debian/debiandde/DEBIAN/control delete mode 100644 debian/debiandde/DEBIAN/md5sums delete mode 100644 debian/debiandde/usr/share/doc/debiandde/changelog.gz delete mode 100644 debian/debiandde/usr/share/doc/debiandde/copyright diff --git a/.github/workflows/building-deb.yml b/.github/workflows/building-deb.yml index 1a4c739..da15dd8 100755 --- a/.github/workflows/building-deb.yml +++ b/.github/workflows/building-deb.yml @@ -239,4 +239,97 @@ jobs: 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 + + 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 unstable $REPOSITORY https://github.com/$GITHUB_REPOSITORY https://mirror.sjtu.edu.cn/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 $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 | true + + - name: Building ${{ GITHUB.repository }} + run: | + env gitPath=$(basename $GITHUB_REPOSITORY) bash .github/workflows/run-command-in-chroot.sh env GO111MODULE=off dpkg-buildpackage -b | true + + - name: Remove Debug Package + run: | + env env gitPath=$(basename $GITHUB_REPOSITORY) bash .github/workflows/run-command-in-chroot.sh rm -rfv ../*dbg*.deb | true + + - name: Pack tar + run: | + cd $BOTTLEPATH + sudo tar -cvf ../deb-$(date +%s).tar *.deb | true + + - 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) + 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 + fi + \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index b291ea4..c3d15a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -gxde (2024.09.24) UNRELEASED; urgency=medium +gxde (2024.10.04) UNRELEASED; urgency=medium - * add 15.14 conponents dependencies + * Add packages - -- shenmo Sun, 01 Sep 2024 08:27:49 +0800 + -- gfdgd_xi <3025613752@qq.com> Fri, 04 Oct 2024 09:22:50 +0800 gxde (2024.09.01) UNRELEASED; urgency=medium diff --git a/debian/control b/debian/control index f8618cd..f987902 100644 --- a/debian/control +++ b/debian/control @@ -34,6 +34,28 @@ Description: GXDE New Desktop Environment Extra - Next . You can safety remove it after installed. +Package: gxde-desktop-android +Architecture: all +Depends: + ${misc:Depends}, + gxde-daemon, + gxde-desktop, +Recommends: + gxde-desktop-extra +Conflicts: + plymouth-theme-gxde-logo, + linux-kernel-gxde-i386, + linux-kernel-oldstable-gxde-i386, + linux-kernel-gxde-amd64, + linux-kernel-oldstable-gxde-amd64, + linux-kernel-gxde-arm64, + linux-kernel-oldstable-gxde-arm64, + linux-kernel-gxde-mips64el, + linux-kernel-oldstable-gxde-mips64el, + linux-kernel-gxde-loong64, + linux-kernel-oldstable-gxde-loong64 + + Package: gxde-desktop Architecture: all Depends: ${misc:Depends}, diff --git a/debian/debiandde/DEBIAN/control b/debian/debiandde/DEBIAN/control deleted file mode 100644 index eb0f233..0000000 --- a/debian/debiandde/DEBIAN/control +++ /dev/null @@ -1,16 +0,0 @@ -Package: debiandde -Source: gxde -Version: 15.11~2024.03.02 -Architecture: all -Maintainer: gfdgd xi <3025613752@qq.com>, LinuxDeepin Project -Installed-Size: 8 -Depends: gxde-desktop, deepin-desktop-base, dde-desktop, dde-dock, dde-control-center (>> 2.90.5), dde-launcher, startdde, dde-session-ui, deepin-artwork, dde-file-manager, dde-qt5integration, eject, debian-dde-wallpapers, fonts-noto, dde-kwin, deepin-screensaver -Recommends: file-roller, deepin-manual, dde-introduction, deepin-appstore, gksu, deepin-editor, deepin-system-monitor, pppoe, gvfs-fuse, smbclient, python-smbc, cups-filters, printer-driver-all, foomatic-db-compressed-ppds, foomatic-db-engine, openprinting-ppds, libsane-hpaio, linux-firmware, wireless-tools, deepin-wine-uninstaller:i386, ttf-deepin-opensymbol, deepin-terminal, deepin-feedback, printer-driver-hpcups, printer-driver-hpijs, libmtp-runtime, samsung-print, open-vm-tools-desktop, open-vm-tools, usbmuxd, ipheth-utils, libimobiledevice-dev, libimobiledevice-utils, dnsutils, libfile-mimeinfo-perl, deepin-shortcut-viewer, crda, network-manager-integration-plugins, libtxc-dxtn-s2tc0 | libtxc-dxtn-s2tc, libflashplugin-pepper, miraclecast, x-display-manager, deepin-screenshot, deepin-music, deepin-image-viewer, dde-calendar, deepin-calculator, deepin-voice-recorder, deepin-screen-recorder, deepin-graphics-driver-manager, deepin-font-installer, warm-sched, uengine, spark-deepin-wine-runner, cheese, gxde-top-panel, plank -Conflicts: dde-control-center (<< 2.90.5), deepin-desktop-environment-desktop, deepin-desktop-environment-dock, deepin-desktop-environment-launcher -Section: metapackages -Priority: extra -Homepage: http://www.gfdgdxi.top -Description: GXDE New Desktop Environment - Next - This is a meta package depends GXDE New Desktop Envrionment. - . - You can safety remove it after installed. diff --git a/debian/debiandde/DEBIAN/md5sums b/debian/debiandde/DEBIAN/md5sums deleted file mode 100644 index 8e58aa3..0000000 --- a/debian/debiandde/DEBIAN/md5sums +++ /dev/null @@ -1,2 +0,0 @@ -9993a1134f954d4357933569fb371290 usr/share/doc/debiandde/changelog.gz -bec7ea4b5be6704571e6e67b05b81b6a usr/share/doc/debiandde/copyright diff --git a/debian/debiandde/usr/share/doc/debiandde/changelog.gz b/debian/debiandde/usr/share/doc/debiandde/changelog.gz deleted file mode 100644 index 2409e4aa2271d574a4b29c815c4d7e5a6da51595..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 340 zcmV-a0jvHWiwFP!000021C`KSPr@)12H^Ysij#Qb2Q+Qh2~0F-j29+Eqx=B6_0To$ zi*6<8g}>c0&}gDWZqMo4^W@cQg>cLw!q_{fTo4)(%1@waWs>6sIIFQtUoQ((#uY&T za0;$gvPI}Ze$wxQUMQ_#ZD1Ty9-Xsr5b?=!Nz$sg0+?m42aLhJ%Yjoi0y>Oo6o(Yf z=#bJN&>dp4B6L6~+kajv1q!h?Wxq)+V%f+Q+AZX^o5Q0_U!=wcZk)*#S{T1IlWk^a znpR~G=ueY~ViEpk5`>9=S3(Ip(DLlOg>jh5*R6$xF&D8I{$UCCTb?l4TsjbOXHAE= zuI;XnQ5?}&h)={3JakDcTWkDJnQt8uUq4tZsue0&*s6dwGYzDfEH&npCO$T+{0pi4 m2EpH|bM#Gpy#UuB%w^qv8!1eTES17J2|fVF=?Imf0ssJpMwvGN diff --git a/debian/debiandde/usr/share/doc/debiandde/copyright b/debian/debiandde/usr/share/doc/debiandde/copyright deleted file mode 100644 index f0bc744..0000000 --- a/debian/debiandde/usr/share/doc/debiandde/copyright +++ /dev/null @@ -1,24 +0,0 @@ -Format: http://dep.debian.net/deps/dep5 -Upstream-Name: dde-next - -Files: * -Copyright: 2012 Deepin.Inc -License: GPL-2+ - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - . - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program. If not, see - . - On Debian systems, the complete text of the GNU General - Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". - -# Please also look if there are files or directories which have a -# different copyright/license attached and list them here.