Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package deepin-desktop-base for
openSUSE:Factory checked in at 2022-09-01 22:10:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/deepin-desktop-base (Old)
and /work/SRC/openSUSE:Factory/.deepin-desktop-base.new.2083 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-desktop-base"
Thu Sep 1 22:10:04 2022 rev:9 rq:1000236 version:20.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/deepin-desktop-base/deepin-desktop-base.changes
2022-04-22 21:54:29.914822701 +0200
+++
/work/SRC/openSUSE:Factory/.deepin-desktop-base.new.2083/deepin-desktop-base.changes
2022-09-01 22:10:55.644204171 +0200
@@ -1,0 +2,5 @@
+Mon Aug 29 03:50:45 UTC 2022 - Hillwood Yang <[email protected]>
+
+- Update version to 2022.07.26, Deepin version is 20.6
+
+-------------------------------------------------------------------
Old:
----
deepin-desktop-base-2022.03.07.tar.gz
New:
----
deepin-desktop-base-2022.07.26.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deepin-desktop-base.spec ++++++
--- /var/tmp/diff_new_pack.bTfzWN/_old 2022-09-01 22:10:56.308205987 +0200
+++ /var/tmp/diff_new_pack.bTfzWN/_new 2022-09-01 22:10:56.312205998 +0200
@@ -16,10 +16,10 @@
#
-%define _version 2022.03.07
+%define _version 2022.07.26
Name: deepin-desktop-base
-Version: 20.5
+Version: 20.6
Release: 0
Summary: Base component for Deepin
License: GPL-3.0-or-later
++++++ deepin-desktop-base-2022.03.07.tar.gz ->
deepin-desktop-base-2022.07.26.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/deepin-desktop-base-2022.03.07/.github/workflows/backup-to-gitlab.yml
new/deepin-desktop-base-2022.07.26/.github/workflows/backup-to-gitlab.yml
--- old/deepin-desktop-base-2022.03.07/.github/workflows/backup-to-gitlab.yml
1970-01-01 01:00:00.000000000 +0100
+++ new/deepin-desktop-base-2022.07.26/.github/workflows/backup-to-gitlab.yml
2022-08-01 05:20:35.000000000 +0200
@@ -0,0 +1,52 @@
+name: backup to gitlab
+on: [push]
+
+concurrency:
+ group: ${{ github.workflow }}
+ cancel-in-progress: true
+
+jobs:
+ backup-to-gitlab:
+ if: github.repository_owner == 'linuxdeepin'
+ name: backup-to-gitlab
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ with:
+ repository: "linuxdeepin/jenkins-bridge-client"
+ path: jenkins-bridge-client
+
+ - name: Install Client
+ run: |
+ cd $GITHUB_WORKSPACE/jenkins-bridge-client
+ go build .
+ sudo install -Dvm755 jenkins-bridge-client -t /usr/bin/
+ - name: Trigger sync
+ id: generate-runid
+ run: |
+ echo "::set-output name=RUN_ID::$(jenkins-bridge-client -triggerSync
-token '${{ secrets.BRIDGETOKEN }}')"
+ - name: Print log
+ run: |
+ jenkins-bridge-client -printlog -token "${{ secrets.BRIDGETOKEN }}"
-runid "${{ steps.generate-runid.outputs.RUN_ID }}"
+
+ backup-to-gitee:
+ if: github.repository_owner == 'linuxdeepin'
+ runs-on: ubuntu-latest
+ steps:
+ - name: create-repo
+ run: |
+ repo=${{ github.event.repository.name }}
+ homepage="https://github.com/linuxdeepin/${repo}";
+ description="mirror of ${homepage}"
+ # remove '.' prefix
+ repo=${repo#"."}
+ curl -X POST --header 'Content-Type: application/json;charset=UTF-8'
'https://gitee.com/api/v5/enterprises/linuxdeepin/repos' -d '{"private":
1,"access_token":"${{ secrets.GITEE_SYNC_TOKEN
}}","name":"'"$repo"'","description":"'"$description"'","homepage":"'"$homepage"'","has_issues":"false","has_wiki":"false","can_comment":"false"}'
|| true
+ - name: push
+ run: |
+ git clone --bare https://github.com/linuxdeepin/${{
github.event.repository.name }}.git .git
+ repo=${{ github.event.repository.name }}
+ # remove '.' prefix
+ repo=${repo#"."}
+ git remote set-url origin https://myml:${{ secrets.GITEE_SYNC_TOKEN
}}@gitee.com/linuxdeepin/${repo}.git
+ git push -f --all --prune origin
+ git push --tags origin
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/deepin-desktop-base-2022.03.07/.github/workflows/call-build-deb.yml
new/deepin-desktop-base-2022.07.26/.github/workflows/call-build-deb.yml
--- old/deepin-desktop-base-2022.03.07/.github/workflows/call-build-deb.yml
1970-01-01 01:00:00.000000000 +0100
+++ new/deepin-desktop-base-2022.07.26/.github/workflows/call-build-deb.yml
2022-08-01 05:20:35.000000000 +0200
@@ -0,0 +1,17 @@
+name: Call build-deb
+on:
+ pull_request_target:
+ paths-ignore:
+ - ".github/workflows/**"
+ types: [ opened, closed, synchronize ]
+
+concurrency:
+ group: ${{ github.workflow }}-pull/${{ github.event.number }}
+ cancel-in-progress: true
+
+jobs:
+ check_job:
+ if: github.event.action != 'closed' || github.event.pull_request.merged
+ uses: linuxdeepin/.github/.github/workflows/build-deb.yml@master
+ secrets:
+ BridgeToken: ${{ secrets.BridgeToken }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/deepin-desktop-base-2022.03.07/.github/workflows/call-build-distribution.yml
new/deepin-desktop-base-2022.07.26/.github/workflows/call-build-distribution.yml
---
old/deepin-desktop-base-2022.03.07/.github/workflows/call-build-distribution.yml
1970-01-01 01:00:00.000000000 +0100
+++
new/deepin-desktop-base-2022.07.26/.github/workflows/call-build-distribution.yml
2022-08-01 05:20:35.000000000 +0200
@@ -0,0 +1,17 @@
+name: Call build-distribution
+on:
+ push:
+ paths-ignore:
+ - ".github/workflows/**"
+ pull_request_target:
+ paths-ignore:
+ - ".github/workflows/**"
+
+jobs:
+ check_job:
+ uses: linuxdeepin/.github/.github/workflows/build-distribution.yml@master
+ secrets:
+ BUILD_GPG_PRIVATE_KEY: ${{ secrets.BUILD_GPG_PRIVATE_KEY }}
+ BUILD_SSH_PRIVATE_KEY: ${{ secrets.BUILD_SSH_PRIVATE_KEY }}
+ WEBDAV_PASSWD: ${{ secrets.WEBDAV_PASSWD }}
+ WEBDAV_USER: ${{ secrets.WEBDAV_USER }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/deepin-desktop-base-2022.03.07/.github/workflows/call-chatOps.yml
new/deepin-desktop-base-2022.07.26/.github/workflows/call-chatOps.yml
--- old/deepin-desktop-base-2022.03.07/.github/workflows/call-chatOps.yml
1970-01-01 01:00:00.000000000 +0100
+++ new/deepin-desktop-base-2022.07.26/.github/workflows/call-chatOps.yml
2022-08-01 05:20:35.000000000 +0200
@@ -0,0 +1,10 @@
+name: chatOps
+on:
+ issue_comment:
+ types: [created]
+
+jobs:
+ chatopt:
+ uses: linuxdeepin/.github/.github/workflows/chatOps.yml@master
+ secrets:
+ APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/deepin-desktop-base-2022.03.07/.github/workflows/call-clacheck.yml
new/deepin-desktop-base-2022.07.26/.github/workflows/call-clacheck.yml
--- old/deepin-desktop-base-2022.03.07/.github/workflows/call-clacheck.yml
1970-01-01 01:00:00.000000000 +0100
+++ new/deepin-desktop-base-2022.07.26/.github/workflows/call-clacheck.yml
2022-08-01 05:20:35.000000000 +0200
@@ -0,0 +1,16 @@
+name: Call CLA check
+on:
+ issue_comment:
+ types: [created]
+ pull_request_target:
+ types: [opened, closed, synchronize]
+
+concurrency:
+ group: ${{ github.workflow }}-pull/${{ github.event.number }}
+ cancel-in-progress: true
+
+jobs:
+ clacheck:
+ uses: linuxdeepin/.github/.github/workflows/cla-check.yml@master
+ secrets:
+ APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/deepin-desktop-base-2022.03.07/.github/workflows/call-commitlint.yml
new/deepin-desktop-base-2022.07.26/.github/workflows/call-commitlint.yml
--- old/deepin-desktop-base-2022.03.07/.github/workflows/call-commitlint.yml
1970-01-01 01:00:00.000000000 +0100
+++ new/deepin-desktop-base-2022.07.26/.github/workflows/call-commitlint.yml
2022-08-01 05:20:35.000000000 +0200
@@ -0,0 +1,11 @@
+name: Call commitlint
+on:
+ pull_request_target:
+
+concurrency:
+ group: ${{ github.workflow }}-pull/${{ github.event.number }}
+ cancel-in-progress: true
+
+jobs:
+ check_job:
+ uses: linuxdeepin/.github/.github/workflows/commitlint.yml@master
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/deepin-desktop-base-2022.03.07/.github/workflows/cppcheck.yml
new/deepin-desktop-base-2022.07.26/.github/workflows/cppcheck.yml
--- old/deepin-desktop-base-2022.03.07/.github/workflows/cppcheck.yml
1970-01-01 01:00:00.000000000 +0100
+++ new/deepin-desktop-base-2022.07.26/.github/workflows/cppcheck.yml
2022-08-01 05:20:35.000000000 +0200
@@ -0,0 +1,26 @@
+name: cppcheck
+on:
+ pull_request_target:
+ paths-ignore:
+ - ".github/workflows/**"
+
+concurrency:
+ group: ${{ github.workflow }}-pull/${{ github.event.number }}
+ cancel-in-progress: true
+
+jobs:
+ cppchceck:
+ name: cppcheck
+ runs-on: ubuntu-latest
+ steps:
+ - run: export
+ - uses: actions/checkout@v2
+ with:
+ ref: ${{ github.event.pull_request.head.sha }}
+ persist-credentials: false
+ - uses: linuxdeepin/action-cppcheck@main
+ with:
+ github_token: ${{ secrets.GITHUB_TOKEN }}
+ repository: ${{ github.repository }}
+ pull_request_id: ${{ github.event.pull_request.number }}
+ allow_approve: false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/deepin-desktop-base-2022.03.07/Makefile
new/deepin-desktop-base-2022.07.26/Makefile
--- old/deepin-desktop-base-2022.03.07/Makefile 2022-03-07 02:13:58.000000000
+0100
+++ new/deepin-desktop-base-2022.07.26/Makefile 2022-08-01 05:20:35.000000000
+0200
@@ -1,4 +1,4 @@
-VERSION := 20.5
+VERSION := 20.6
RELEASE :=
ARCH_BUILD :=$(shell uname -m)
@@ -15,7 +15,7 @@
ifeq (${ARCH_BUILD}, x86_64)
sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version.in > files/desktop-version
sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/os-version-amd > files/os-version
- else ifeq (${ARCH_BUILD}, x86_32)
+ else ifeq (${ARCH_BUILD}, i686)
sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version.in > files/desktop-version
sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/os-version-amd > files/os-version
else ifeq (${ARCH_BUILD}, mipsel)
@@ -29,6 +29,10 @@
else ifeq (${ARCH_BUILD}, aarch64)
sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-arm.in >
files/desktop-version
sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/os-version-arm > files/os-version
+ else ifeq (${ARCH_BUILD}, riscv64)
+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-riscv.in >
files/desktop-version
+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-riscv-server.in >
files/desktop-version-server
+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/os-version-riscv > files/os-version
endif
sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g"
files/lsb-release.in > files/lsb-release
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/deepin-desktop-base-2022.03.07/README.md
new/deepin-desktop-base-2022.07.26/README.md
--- old/deepin-desktop-base-2022.03.07/README.md 1970-01-01
01:00:00.000000000 +0100
+++ new/deepin-desktop-base-2022.07.26/README.md 2022-08-01
05:20:35.000000000 +0200
@@ -0,0 +1 @@
+# deepin-desktop-base
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/deepin-desktop-base-2022.03.07/archlinux/PKGBUILD
new/deepin-desktop-base-2022.07.26/archlinux/PKGBUILD
--- old/deepin-desktop-base-2022.03.07/archlinux/PKGBUILD 1970-01-01
01:00:00.000000000 +0100
+++ new/deepin-desktop-base-2022.07.26/archlinux/PKGBUILD 2022-08-01
05:20:35.000000000 +0200
@@ -0,0 +1,40 @@
+# Maintainer: justforlxz <[email protected]>
+pkgname=deepin-desktop-base-git
+pkgver=2021.1.25.r0.g2388ac2
+pkgrel=1
+pkgdesc='Base component for Deepin'
+arch=('any')
+url="https://github.com/linuxdeepin/deepin-desktop-base";
+license=('GPL3')
+groups=('deepin-git')
+conflicts=('deepin-desktop-base')
+provides=('deepin-desktop-base')
+groups=('deepin-git')
+makedepends=('git')
+source=("source.tar.gz"
+ distribution.info)
+sha512sums=('SKIP'
+
'27625e6d0786b8adacdb7c52806d4faa28d2ab6b319a593b3ea9bcb69f0cc18ea19b258d629e3a0069ef9a69503589b0285289caef39a1e85bbd99e915c7cd7d')
+
+prepare() {
+ cd $deepin_source_name
+}
+
+build() {
+ cd $deepin_source_name
+ make
+}
+
+package() {
+ cd $deepin_source_name
+ make DESTDIR="$pkgdir" install
+ install -Dm644 "$srcdir"/distribution.info -t "$pkgdir"/usr/share/deepin/
+ # Remove Deepin distro's lsb-release
+ rm "$pkgdir"/etc/lsb-release
+ # Don't override systemd timeouts
+ rm -r "$pkgdir"/etc/systemd
+ # Make a symlink for deepin-version
+ ln -s ../usr/lib/deepin/desktop-version "$pkgdir"/etc/deepin-version
+ # Remove apt-specific templates
+ rm -r "$pkgdir"/usr/share/python-apt
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/deepin-desktop-base-2022.03.07/archlinux/distribution.info
new/deepin-desktop-base-2022.07.26/archlinux/distribution.info
--- old/deepin-desktop-base-2022.03.07/archlinux/distribution.info
1970-01-01 01:00:00.000000000 +0100
+++ new/deepin-desktop-base-2022.07.26/archlinux/distribution.info
2022-08-01 05:20:35.000000000 +0200
@@ -0,0 +1,7 @@
+[Distribution]
+Name=Arch
+WebsiteName=www.archlinux.org
+Website=https://www.archlinux.org
+Logo=/usr/share/pixmaps/archlinux.svg
+LogoLight=/usr/share/pixmaps/archlinux.svg
+LogoTransparent=/usr/share/pixmaps/archlinux.svg
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/deepin-desktop-base-2022.03.07/debian/changelog
new/deepin-desktop-base-2022.07.26/debian/changelog
--- old/deepin-desktop-base-2022.03.07/debian/changelog 2022-03-07
02:13:58.000000000 +0100
+++ new/deepin-desktop-base-2022.07.26/debian/changelog 2022-08-01
05:20:35.000000000 +0200
@@ -1,3 +1,39 @@
+deepin-desktop-base (2022.07.26-apricot) unstable; urgency=medium
+
+ * update
+
+ -- LiChengGang <[email protected]> Tue, 26 Jul 2022 19:55:26 +0800
+
+deepin-desktop-base (2022.06.29-apricot) unstable; urgency=medium
+
+ * update
+
+ -- LiChengGang <[email protected]> Wed, 29 Jun 2022 16:06:49 +0800
+
+deepin-desktop-base (2022.06.28-apricot) unstable; urgency=medium
+
+ * update
+
+ -- LiChengGang <[email protected]> Tue, 28 Jun 2022 09:57:23 +0800
+
+deepin-desktop-base (2022.06.15-apricot) unstable; urgency=medium
+
+ * update
+
+ -- LiChengGang <[email protected]> Wed, 15 Jun 2022 19:24:57 +0800
+
+deepin-desktop-base (2022.06.13-apricot) unstable; urgency=medium
+
+ * update
+
+ -- LiChengGang <[email protected]> Mon, 13 Jun 2022 19:31:25 +0800
+
+deepin-desktop-base (2022.05.17-apricot) unstable; urgency=medium
+
+ * update os-version 20.6
+
+ -- LiChengGang <[email protected]> Tue, 17 May 2022 10:34:58 +0800
+
deepin-desktop-base (2022.03.07-apricot) unstable; urgency=medium
* update os-version 20.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/deepin-desktop-base-2022.03.07/files/desktop-version-riscv-server.in
new/deepin-desktop-base-2022.07.26/files/desktop-version-riscv-server.in
--- old/deepin-desktop-base-2022.03.07/files/desktop-version-riscv-server.in
1970-01-01 01:00:00.000000000 +0100
+++ new/deepin-desktop-base-2022.07.26/files/desktop-version-riscv-server.in
2022-08-01 05:20:35.000000000 +0200
@@ -0,0 +1,9 @@
+[Release]
+Version=@@VERSION@@
+Type=Server
+Type[zh_CN]=????????????
+Edition=Y2020E0002
+Copyright=Y2020CR002
+[Addition]
+Milestone=@@RELEASE@@
+Buildid=build1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/deepin-desktop-base-2022.03.07/files/desktop-version-riscv.in
new/deepin-desktop-base-2022.07.26/files/desktop-version-riscv.in
--- old/deepin-desktop-base-2022.03.07/files/desktop-version-riscv.in
1970-01-01 01:00:00.000000000 +0100
+++ new/deepin-desktop-base-2022.07.26/files/desktop-version-riscv.in
2022-08-01 05:20:35.000000000 +0200
@@ -0,0 +1,9 @@
+[Release]
+Version=@@VERSION@@
+Type=Desktop
+Type[zh_CN]=?????????
+Edition=Y2020E0001
+Copyright=Y2020CR001
+[Addition]
+Milestone=@@RELEASE@@
+Buildid=build1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/deepin-desktop-base-2022.03.07/files/os-version-amd
new/deepin-desktop-base-2022.07.26/files/os-version-amd
--- old/deepin-desktop-base-2022.03.07/files/os-version-amd 2022-03-07
02:13:58.000000000 +0100
+++ new/deepin-desktop-base-2022.07.26/files/os-version-amd 2022-08-01
05:20:35.000000000 +0200
@@ -6,5 +6,5 @@
EditionName=Community
EditionName[zh_CN]=?????????
MajorVersion=20
-MinorVersion=20.5
-OsBuild=11038.005
+MinorVersion=20.6
+OsBuild=11038.007
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/deepin-desktop-base-2022.03.07/files/os-version-arm
new/deepin-desktop-base-2022.07.26/files/os-version-arm
--- old/deepin-desktop-base-2022.03.07/files/os-version-arm 2022-03-07
02:13:58.000000000 +0100
+++ new/deepin-desktop-base-2022.07.26/files/os-version-arm 2022-08-01
05:20:35.000000000 +0200
@@ -6,5 +6,5 @@
EditionName=Community
EditionName[zh_CN]=?????????
MajorVersion=20
-MinorVersion=20.5
+MinorVersion=20.6
OsBuild=11038.005
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/deepin-desktop-base-2022.03.07/files/os-version-riscv
new/deepin-desktop-base-2022.07.26/files/os-version-riscv
--- old/deepin-desktop-base-2022.03.07/files/os-version-riscv 1970-01-01
01:00:00.000000000 +0100
+++ new/deepin-desktop-base-2022.07.26/files/os-version-riscv 2022-08-01
05:20:35.000000000 +0200
@@ -0,0 +1,10 @@
+[Version]
+SystemName=deepin
+SystemName[zh_CN]=??????????????????
+ProductType=Desktop
+ProductType[zh_CN]=??????
+EditionName=Community
+EditionName[zh_CN]=?????????
+MajorVersion=20.1
+MinorVersion=1030
+OsBuild=11031.002
++++++ desktop-version-fallback.patch ++++++
--- /var/tmp/diff_new_pack.bTfzWN/_old 2022-09-01 22:10:56.404206249 +0200
+++ /var/tmp/diff_new_pack.bTfzWN/_new 2022-09-01 22:10:56.408206260 +0200
@@ -1,13 +1,13 @@
-diff -Nur deepin-desktop-base-2021.06.16/Makefile
deepin-desktop-base-2021.06.16-new/Makefile
---- deepin-desktop-base-2021.06.16/Makefile 2021-08-08 15:28:37.342881513
+0800
-+++ deepin-desktop-base-2021.06.16-new/Makefile 2021-08-08
15:27:23.042763773 +0800
-@@ -35,6 +35,9 @@
- else ifeq (${ARCH_BUILD}, aarch64)
- sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-arm.in >
files/desktop-version
- sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/os-version-amd > files/os-version
+diff -Nur deepin-desktop-base-2022.07.26/Makefile
deepin-desktop-base-2022.07.26-new/Makefile
+--- deepin-desktop-base-2022.07.26/Makefile 2022-08-29 11:06:18.020875805
+0800
++++ deepin-desktop-base-2022.07.26-new/Makefile 2022-08-29
11:31:13.313767107 +0800
+@@ -39,6 +39,9 @@
+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-riscv.in >
files/desktop-version
+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-riscv-server.in >
files/desktop-version-server
+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/os-version-riscv > files/os-version
+ else
+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version.in > files/desktop-version
-+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/os-version-amd > files/os-versio
++ sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/os-version-amd > files/os-version
endif
install:
++++++ do-not-installl-os-version.patch ++++++
--- /var/tmp/diff_new_pack.bTfzWN/_old 2022-09-01 22:10:56.420206293 +0200
+++ /var/tmp/diff_new_pack.bTfzWN/_new 2022-09-01 22:10:56.424206304 +0200
@@ -1,33 +1,28 @@
-diff -Nur deepin-desktop-base-2021.06.16/Makefile
deepin-desktop-base-2021.06.16-new/Makefile
---- deepin-desktop-base-2021.06.16/Makefile 2021-06-16 15:23:10.000000000
+0800
-+++ deepin-desktop-base-2021.06.16-new/Makefile 2021-07-29
21:39:52.803600181 +0800
-@@ -15,7 +15,13 @@
- ifeq (${ARCH_BUILD}, x86_64)
+diff -Nur deepin-desktop-base-2022.07.26/Makefile
deepin-desktop-base-2022.07.26-new/Makefile
+--- deepin-desktop-base-2022.07.26/Makefile 2022-08-01 11:20:35.000000000
+0800
++++ deepin-desktop-base-2022.07.26-new/Makefile 2022-08-29
11:06:18.020875805 +0800
+@@ -18,6 +18,12 @@
+ else ifeq (${ARCH_BUILD}, i686)
sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version.in > files/desktop-version
sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/os-version-amd > files/os-version
-- else ifeq (${ARCH_BUILD}, x86_32)
-+ else ifeq (${ARCH_BUILD}, i686)
-+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version.in > files/desktop-version
-+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/os-version-amd > files/os-version
+ else ifeq (${ARCH_BUILD}, ppc64)
+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version.in > files/desktop-version
+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/os-version-amd > files/os-version
+ else ifeq (${ARCH_BUILD}, ppc64le)
- sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version.in > files/desktop-version
- sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/os-version-amd > files/os-version
- else ifeq (${ARCH_BUILD}, mipsel)
-@@ -28,9 +34,8 @@
- sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/os-version-sw > files/os-version
- else ifeq (${ARCH_BUILD}, aarch64)
- sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-arm.in >
files/desktop-version
-- sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/os-version-arm > files/os-version
++ sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version.in > files/desktop-version
+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/os-version-amd > files/os-version
+ else ifeq (${ARCH_BUILD}, mipsel)
+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-loongson.in >
files/desktop-version
+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/os-version-loongson > files/os-version
+@@ -34,7 +40,6 @@
+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-riscv-server.in >
files/desktop-version-server
+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/os-version-riscv > files/os-version
endif
- sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g"
files/lsb-release.in > files/lsb-release
install:
mkdir -p ${DESTDIR}/etc
-@@ -44,7 +49,6 @@
+@@ -48,7 +53,6 @@
install -Dm644 files/desktop-version
${DESTDIR}/usr/lib/deepin/desktop-version
install -Dm644 files/lsb-release ${DESTDIR}/etc/lsb-release
install -Dm644 files/appstore.json ${DESTDIR}/etc/appstore.json
