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 2021-04-26 16:39:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/deepin-desktop-base (Old)
and /work/SRC/openSUSE:Factory/.deepin-desktop-base.new.12324 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-desktop-base"
Mon Apr 26 16:39:00 2021 rev:2 rq:886009 version:20.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/deepin-desktop-base/deepin-desktop-base.changes
2021-02-16 22:42:32.398114201 +0100
+++
/work/SRC/openSUSE:Factory/.deepin-desktop-base.new.12324/deepin-desktop-base.changes
2021-04-26 16:39:28.394061209 +0200
@@ -1,0 +2,6 @@
+Thu Apr 15 12:46:09 UTC 2021 - Hillwood Yang <[email protected]>
+
+- Update version to 2021.3.10, Deepin version is 20.2
+- Update add-suse-info.patch for distribution.info
+
+-------------------------------------------------------------------
Old:
----
deepin-desktop-base-2020.12.09.tar.gz
New:
----
add-suse-info.patch
deepin-desktop-base-2021.3.10.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deepin-desktop-base.spec ++++++
--- /var/tmp/diff_new_pack.2S1KKz/_old 2021-04-26 16:39:28.814061878 +0200
+++ /var/tmp/diff_new_pack.2S1KKz/_new 2021-04-26 16:39:28.818061884 +0200
@@ -1,7 +1,7 @@
-
+#
# spec file for package deepin-desktop-base
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,30 +12,24 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
-%define _version 2020.12.09
-%define system_version %(rpm -q --queryformat '%%{VERSION}' openSUSE-release)
-%if 0%{?suse_version} > 1500
-%define system_branch Tumbleweed
-%else
-%define system_branch Leap
-%endif
+
+%define _version 2021.3.10
Name: deepin-desktop-base
-Version: 20.1
+Version: 20.2
Release: 0
Summary: Base component for Deepin
-License: GPL-3.0+
+License: GPL-3.0-or-later
+Group: System/GUI/Other
URL: https://github.com/linuxdeepin/deepin-desktop-base
Source0:
https://github.com/linuxdeepin/deepin-desktop-base/archive/%{_version}/%{name}-%{_version}.tar.gz
# PATCH-FIX-OPENSUSE do-not-installl-os-version.patch [email protected] -
Don't install deepin os information
Patch0: do-not-installl-os-version.patch
-Group: System/GUI/Other
-# BuildRequires: openSUSE-release
-Requires: qt5integration
-# Recommends: deepin-wallpapers
+# PATCH-FIX-OPENSUSE add-suse-info.patch [email protected] - Use openSUSE
information
+Patch1: add-suse-info.patch
%description
This package provides some components for the Deepin desktop environment:
@@ -53,10 +47,6 @@
# Fix data path
sed -i 's|/usr/lib|%{_datadir}|' Makefile
-# Set openSUSE version information
-# sed -i 's|@@VERSION@@|branch version|g; s|Desktop||g; s|?????????||g'
files/suse-version.in
-# sed -i "s|branch|%{system_branch}|g; s|version|%{system_version}|g"
files/suse-version.in
-
%build
%make_build
@@ -65,7 +55,6 @@
# Make a symlink for deepin-version
ln -sfv %{_datadir}/deepin/desktop-version %{buildroot}/etc/deepin-version
-# ln -sfv %{_datadir}/deepin/suse-version %{buildroot}/etc/suse-version
%files
%doc CHANGELOG.md
@@ -74,12 +63,9 @@
%{_sysconfdir}/*-version
%dir %{_datadir}/deepin/
%{_datadir}/deepin/*-version
-%{_datadir}/deepin/uos_logo.svg
%dir %{_datadir}/distro-info
%dir %{_datadir}/i18n
%{_datadir}/i18n/i18n_dependent.json
%{_datadir}/i18n/language_info.json
-%dir %{_datadir}/plymouth
-%{_datadir}/plymouth/deepin-logo.png
%changelog
++++++ add-suse-info.patch ++++++
--- deepin-desktop-base-2021.3.10/distribution.info 2021-03-10
16:14:25.000000000 +0800
+++ deepin-desktop-base-2021.3.10-new/distribution.info 2021-04-15
20:09:15.879644520 +0800
@@ -1,7 +1,7 @@
[Distribution]
-Name=Deepin
-WebsiteName=www.deepin.org
-Website=https://www.deepin.org
-Logo=/usr/share/deepin/distribution/distribution_logo.svg
-LogoLight=/usr/share/deepin/distribution/distribution_logo_light.svg
-LogoTransparent=/usr/share/deepin/distribution/distribution_logo_transparent.svg
+Name=openSUSE
+WebsiteName=www.opensuse.org
+Website=https://www.opensuse.org
+Logo=/usr/share/pixmaps/distribution-logos/square-hicolor.svg
+LogoLight=/usr/share/pixmaps/distribution-logos/square-hicolor.svg
+LogoTransparent=/usr/share/pixmaps/distribution-logos/square-symbolic.svg
++++++ deepin-desktop-base-2020.12.09.tar.gz ->
deepin-desktop-base-2021.3.10.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/deepin-desktop-base-2020.12.09/Makefile
new/deepin-desktop-base-2021.3.10/Makefile
--- old/deepin-desktop-base-2020.12.09/Makefile 2020-12-09 09:21:25.000000000
+0100
+++ new/deepin-desktop-base-2021.3.10/Makefile 2021-03-10 09:14:25.000000000
+0100
@@ -1,4 +1,4 @@
-VERSION := 20.1
+VERSION := 20.2
RELEASE :=
ARCH_BUILD :=$(shell uname -m)
@@ -14,27 +14,20 @@
endif
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/desktop-version-server.in >
files/desktop-version-server
sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/os-version-amd > files/os-version
else ifeq (${ARCH_BUILD}, x86_32)
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/desktop-version-server.in >
files/desktop-version-server
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/desktop-version-loongson-server.in >
files/desktop-version-server
sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/os-version-loongson > files/os-version
else ifeq (${ARCH_BUILD}, mips64)
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/desktop-version-loongson-server.in >
files/desktop-version-server
- sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/os-version-loogson-server > files/os-version
else ifeq (${ARCH_BUILD}, sw_64)
sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-sw.in > files/desktop-version
- sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-sw-server.in >
files/desktop-version-server
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/desktop-version-arm-server.in >
files/desktop-version-server
sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/os-version-arm > 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-2020.12.09/debian/changelog
new/deepin-desktop-base-2021.3.10/debian/changelog
--- old/deepin-desktop-base-2020.12.09/debian/changelog 2020-12-09
09:21:25.000000000 +0100
+++ new/deepin-desktop-base-2021.3.10/debian/changelog 2021-03-10
09:14:25.000000000 +0100
@@ -1,3 +1,64 @@
+deepin-desktop-base (2021.3.10-apricot) unstable; urgency=medium
+
+ * update os-version 1040.
+
+ -- TagBuilder <[email protected]> Wed, 10 Mar 2021 16:13:17 +0800
+
+deepin-desktop-base (2021.3.04-apricot) unstable; urgency=medium
+
+ * update os-version 20.2.
+
+ -- TagBuilder <[email protected]> Thu, 04 Mar 2021 15:07:26 +0800
+
+deepin-desktop-base (2021.2.20-apricot) unstable; urgency=medium
+
+ * update osbuild 11038.003.
+
+ -- TagBuilder <[email protected]> Sat, 20 Feb 2021 09:35:13 +0800
+
+deepin-desktop-base (2021.1.29-apricot) unstable; urgency=medium
+
+ * update osbuild 11038.002.
+
+ -- TagBuilder <[email protected]> Fri, 29 Jan 2021 17:24:08 +0800
+
+deepin-desktop-base (2021.1.25-apricot) unstable; urgency=medium
+
+ * update osbuild 002.
+
+ -- TagBuilder <[email protected]> Mon, 25 Jan 2021 09:23:15 +0800
+
+deepin-desktop-base (2021.1.12-apriocot) unstable; urgency=medium
+
+ * update os-version.
+
+ -- TagBuilder <[email protected]> Tue, 12 Jan 2021 18:06:49 +0800
+
+deepin-desktop-base (2021.1.11-apricot) unstable; urgency=medium
+
+ * update os-version.
+
+ -- TagBuilder <[email protected]> Mon, 11 Jan 2021 17:32:39 +0800
+
+deepin-desktop-base (2020.12.25-apricot) unstable; urgency=medium
+
+ * go back postinst.
+
+ -- TagBuilder <[email protected]> Fri, 25 Dec 2020 09:34:44 +0800
+
+deepin-desktop-base (2020.12.24-apricot) unstable; urgency=medium
+
+ * cancel chattr +i operating.
+
+ -- TagBuilder <[email protected]> Thu, 24 Dec 2020 10:00:19 +0800
+
+deepin-desktop-base (2020.12.21-apricot) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ *
+
+ -- TagBuilder <[email protected]> Mon, 21 Dec 2020 13:13:11 +0800
+
deepin-desktop-base (2020.12.09-apricot) unstable; urgency=medium
* update os-version 20.1.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/deepin-desktop-base-2020.12.09/debian/control
new/deepin-desktop-base-2021.3.10/debian/control
--- old/deepin-desktop-base-2020.12.09/debian/control 2020-12-09
09:21:25.000000000 +0100
+++ new/deepin-desktop-base-2021.3.10/debian/control 2021-03-10
09:14:25.000000000 +0100
@@ -13,12 +13,3 @@
eject, fonts-noto, fonts-symbola
Description: The basic file of Deepin Desktop,
provides system attribute description for DDE components
-
-Package: deepin-desktop-server
-Architecture: any
-Provides: deepin-appstore-config
-Conflicts: deepin-desktop-base
-Depends: ${misc:Depends}, deepin-keyring, distro-info-data,
- eject, fonts-noto, fonts-symbola
-Description: The basic file of Deepin Desktop,
- provides system attribute description for DDE components
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/deepin-desktop-base-2020.12.09/debian/deepin-desktop-server.install
new/deepin-desktop-base-2021.3.10/debian/deepin-desktop-server.install
--- old/deepin-desktop-base-2020.12.09/debian/deepin-desktop-server.install
2020-12-09 09:21:25.000000000 +0100
+++ new/deepin-desktop-base-2021.3.10/debian/deepin-desktop-server.install
1970-01-01 01:00:00.000000000 +0100
@@ -1,14 +0,0 @@
-files/i18n_dependent.json /usr/share/i18n/
-files/language_info.json /usr/share/i18n/
-files/desktop-version-server /usr/lib/deepin/
-files/lsb-release /etc/
-files/appstore.json /etc/
-files/deepin-logo.png /usr/share/plymouth/
-files/uos_logo.svg /usr/share/deepin/
-files/systemd.conf /etc/systemd/system.conf.d/
-files/logind.conf /etc/systemd/logind.conf.d/
-files/Deepin.info /usr/share/python-apt/templates/
-files/Deepin.mirrors /usr/share/python-apt/templates/
-distribution.info /usr/share/deepin/
-distribution/* /usr/share/deepin/distribution/
-files/dde-session-ui.conf /etc/deepin/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/deepin-desktop-base-2020.12.09/debian/deepin-desktop-server.postinst
new/deepin-desktop-base-2021.3.10/debian/deepin-desktop-server.postinst
--- old/deepin-desktop-base-2020.12.09/debian/deepin-desktop-server.postinst
2020-12-09 09:21:25.000000000 +0100
+++ new/deepin-desktop-base-2021.3.10/debian/deepin-desktop-server.postinst
1970-01-01 01:00:00.000000000 +0100
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-set -e
-echo "version,codename,series,created,release,eol" >
/usr/share/distro-info/deepin.csv
-echo "15.2,Unstable,unstable,2016-06-01" >> /usr/share/distro-info/deepin.csv
-echo "15.3,Unstable,unstable,2016-09-13" >> /usr/share/distro-info/deepin.csv
-echo "15.4,Panda,panda,2017-04-19" >> /usr/share/distro-info/deepin.csv
-
-
-case "${1}" in
- configure)
- update-alternatives --install /etc/deepin-version \
- deepin-version /usr/lib/deepin/desktop-version-server 50
-
- if [ -x /usr/sbin/update-initramfs ]
- then
- update-initramfs -u
- fi
-
- if [ -x /usr/sbin/update-grub ]
- then
- /usr/sbin/update-grub || echo "update-grub failed! Ignore..." >&2
- fi
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
-
- ;;
-
- *)
- echo "postinst called with unknown argument \`${1}'" >&2
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/deepin-desktop-base-2020.12.09/debian/deepin-desktop-server.postrm
new/deepin-desktop-base-2021.3.10/debian/deepin-desktop-server.postrm
--- old/deepin-desktop-base-2020.12.09/debian/deepin-desktop-server.postrm
2020-12-09 09:21:25.000000000 +0100
+++ new/deepin-desktop-base-2021.3.10/debian/deepin-desktop-server.postrm
1970-01-01 01:00:00.000000000 +0100
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "${1}" in
- remove)
- if [ -x /usr/sbin/update-initramfs ]
- then
- update-initramfs -u
- fi
- ;;
-
- purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-
- ;;
-
- *)
- echo "postrm called with unknown argument \`${1}'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/deepin-desktop-base-2020.12.09/debian/deepin-desktop-server.prerm
new/deepin-desktop-base-2021.3.10/debian/deepin-desktop-server.prerm
--- old/deepin-desktop-base-2020.12.09/debian/deepin-desktop-server.prerm
2020-12-09 09:21:25.000000000 +0100
+++ new/deepin-desktop-base-2021.3.10/debian/deepin-desktop-server.prerm
1970-01-01 01:00:00.000000000 +0100
@@ -1,15 +0,0 @@
-#! /bin/sh
-set -e
-
-#DEBHELPER#
-
-case "$1" in
- remove|deconfigure|failed-upgrade)
- update-alternatives --remove deepin-default-background \
- /usr/share/backgrounds/deepin/desktop.jpg
-
- update-alternatives --remove deepin-version \
- /usr/lib/deepin/desktop-version-server
- ;;
-esac
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/deepin-desktop-base-2020.12.09/files/desktop-version-arm-server.in
new/deepin-desktop-base-2021.3.10/files/desktop-version-arm-server.in
--- old/deepin-desktop-base-2020.12.09/files/desktop-version-arm-server.in
2020-12-09 09:21:25.000000000 +0100
+++ new/deepin-desktop-base-2021.3.10/files/desktop-version-arm-server.in
1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-[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-2020.12.09/files/desktop-version-loongson-server.in
new/deepin-desktop-base-2021.3.10/files/desktop-version-loongson-server.in
--- old/deepin-desktop-base-2020.12.09/files/desktop-version-loongson-server.in
2020-12-09 09:21:25.000000000 +0100
+++ new/deepin-desktop-base-2021.3.10/files/desktop-version-loongson-server.in
1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-[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-2020.12.09/files/desktop-version-server.in
new/deepin-desktop-base-2021.3.10/files/desktop-version-server.in
--- old/deepin-desktop-base-2020.12.09/files/desktop-version-server.in
2020-12-09 09:21:25.000000000 +0100
+++ new/deepin-desktop-base-2021.3.10/files/desktop-version-server.in
1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-[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-2020.12.09/files/desktop-version-sw-server.in
new/deepin-desktop-base-2021.3.10/files/desktop-version-sw-server.in
--- old/deepin-desktop-base-2020.12.09/files/desktop-version-sw-server.in
2020-12-09 09:21:25.000000000 +0100
+++ new/deepin-desktop-base-2021.3.10/files/desktop-version-sw-server.in
1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-[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-2020.12.09/files/os-version-amd
new/deepin-desktop-base-2021.3.10/files/os-version-amd
--- old/deepin-desktop-base-2020.12.09/files/os-version-amd 2020-12-09
09:21:25.000000000 +0100
+++ new/deepin-desktop-base-2021.3.10/files/os-version-amd 2021-03-10
09:14:25.000000000 +0100
@@ -5,6 +5,6 @@
ProductType[zh_CN]=??????
EditionName=Community
EditionName[zh_CN]=?????????
-MajorVersion=20.1
-MinorVersion=1010
-OsBuild=11031.108
+MajorVersion=20.2
+MinorVersion=1040
+OsBuild=11038.001
++++++ do-not-installl-os-version.patch ++++++
--- /var/tmp/diff_new_pack.2S1KKz/_old 2021-04-26 16:39:28.898062011 +0200
+++ /var/tmp/diff_new_pack.2S1KKz/_new 2021-04-26 16:39:28.898062011 +0200
@@ -1,53 +1,45 @@
-diff -Nur deepin-desktop-base-2020.12.09/Makefile
deepin-desktop-base-2020.12.09-new/Makefile
---- deepin-desktop-base-2020.12.09/Makefile 2020-12-09 16:21:25.000000000
+0800
-+++ deepin-desktop-base-2020.12.09-new/Makefile 2021-02-15
16:51:18.151587117 +0800
-@@ -15,29 +15,32 @@
+diff -Nur deepin-desktop-base-2021.3.10/Makefile
deepin-desktop-base-2021.3.10-new/Makefile
+--- deepin-desktop-base-2021.3.10/Makefile 2021-03-10 16:14:25.000000000
+0800
++++ deepin-desktop-base-2021.3.10-new/Makefile 2021-04-15 21:31:51.265094237
+0800
+@@ -14,23 +14,19 @@
+ endif
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/desktop-version-server.in >
files/desktop-version-server
- 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
+ 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/desktop-version-server.in >
files/desktop-version-server
- sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/os-version-amd > files/os-version
-+# sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/os-version-amd > files/os-version
-+ 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/desktop-version-server.in >
files/desktop-version-server
-+# 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/desktop-version-loongson-server.in >
files/desktop-version-server
- sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/os-version-loongson > files/os-version
-+# sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/os-version-loongson > files/os-version
else ifeq (${ARCH_BUILD}, mips64)
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/desktop-version-loongson-server.in >
files/desktop-version-server
-- sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/os-version-loogson-server > files/os-version
-+# sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/os-version-loogson-server > files/os-version
else ifeq (${ARCH_BUILD}, sw_64)
sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-sw.in > files/desktop-version
- sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-sw-server.in >
files/desktop-version-server
- sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/os-version-sw > files/os-version
-+# 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/desktop-version-arm-server.in >
files/desktop-version-server
- 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/os-version-arm > files/os-version
endif
- sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g"
files/lsb-release.in > files/lsb-release
-+# sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g"
files/lsb-release.in > files/lsb-release
install:
mkdir -p ${DESTDIR}/etc
-@@ -49,7 +52,7 @@
- install -Dm644 files/i18n_dependent.json
${DESTDIR}/usr/share/i18n/i18n_dependent.json
- install -Dm644 files/language_info.json
${DESTDIR}/usr/share/i18n/language_info.json
+@@ -44,9 +40,7 @@
install -Dm644 files/desktop-version
${DESTDIR}/usr/lib/deepin/desktop-version
-- install -Dm644 files/lsb-release ${DESTDIR}/etc/lsb-release
-+# install -Dm644 files/lsb-release ${DESTDIR}/etc/lsb-release
+ install -Dm644 files/lsb-release ${DESTDIR}/etc/lsb-release
install -Dm644 files/appstore.json ${DESTDIR}/etc/appstore.json
- install -Dm644 files/deepin-logo.png
${DESTDIR}/usr/share/plymouth/deepin-logo.png
+- install -Dm644 files/deepin-logo.png
${DESTDIR}/usr/share/plymouth/deepin-logo.png
#install -Dm644 files/desktop.jpg
${DESTDIR}/usr/share/backgrounds/deepin/desktop.jpg
+- install -Dm644 files/uos_logo.svg
${DESTDIR}/usr/share/deepin/uos_logo.svg
+ #install -Dm644 files/eff98ab2b2d91574a79fabd2b79eb7a9.jpg
${DESTDIR}/var/cache/image-blur/eff98ab2b2d91574a79fabd2b79eb7a9.jpg
+ [ -e files/systemd.conf ] && install -Dm644 files/systemd.conf
${DESTDIR}/etc/systemd/system.conf.d/deepin-base.conf
+ [ -e files/logind.conf ] && install -Dm644 files/logind.conf
${DESTDIR}/etc/systemd/logind.conf.d/deepin-base.conf
+@@ -54,4 +48,3 @@
+ install -Dm644 files/Deepin.mirrors
${DESTDIR}/usr/share/python-apt/templates/Deepin.mirrors
+ clean:
+ rm -f files/desktop-version
+- rm -f files/lsb-release
