From 13206ab5224d3ed4d9e7abc92708269f28e82237 Mon Sep 17 00:00:00 2001 From: lichenggang Date: Mon, 18 Nov 2024 15:34:27 +0800 Subject: [PATCH 1/7] feat: update deepin 25 --- debian/changelog | 6 ++++++ etc/deepin_version | 2 +- etc/os-release | 6 +++--- share/motd | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index e015576..4ffad39 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +base-files (25-5) unstable; urgency=medium + + * update deepin 25. + + -- lichenggang Mon, 18 Nov 2024 15:24:03 +0800 + base-files (23.1-5) unstable; urgency=medium * Link bin, lib, sbin, $(USR_MERGE_RTLDLIB), $(USR_MERGE_MULTILIB) to usr/. diff --git a/etc/deepin_version b/etc/deepin_version index 4099407..7273c0f 100644 --- a/etc/deepin_version +++ b/etc/deepin_version @@ -1 +1 @@ -23 +25 diff --git a/etc/os-release b/etc/os-release index a6396d7..4b39186 100644 --- a/etc/os-release +++ b/etc/os-release @@ -1,8 +1,8 @@ -PRETTY_NAME="Deepin 23" +PRETTY_NAME="Deepin 25" NAME="Deepin" VERSION_CODENAME=beige ID=deepin HOME_URL="https://www.deepin.org/" BUG_REPORT_URL="https://bbs.deepin.org" -VERSION_ID="23" -VERSION="23" +VERSION_ID="25" +VERSION="25" diff --git a/share/motd b/share/motd index 9ab89aa..e6f83c3 100644 --- a/share/motd +++ b/share/motd @@ -1,4 +1,4 @@ -Welcome to Deepin 23 GNU/Linux +Welcome to Deepin 25 GNU/Linux * Homepage: https://www.deepin.org/ From d19eacffae8a6a48b5921915af286231ffd062c6 Mon Sep 17 00:00:00 2001 From: lichenggang Date: Mon, 9 Dec 2024 17:37:43 +0800 Subject: [PATCH 2/7] feat: share/motd Deepin to deepin --- debian/changelog | 6 ++++++ share/motd | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4ffad39..d54df55 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +base-files (25-6) unstable; urgency=medium + + * share/motd Deepin to deepin. + + -- lichenggang Mon, 09 Dec 2024 17:36:46 +0800 + base-files (25-5) unstable; urgency=medium * update deepin 25. diff --git a/share/motd b/share/motd index e6f83c3..0c22b78 100644 --- a/share/motd +++ b/share/motd @@ -1,4 +1,4 @@ -Welcome to Deepin 25 GNU/Linux +Welcome to deepin 25 GNU/Linux * Homepage: https://www.deepin.org/ From 4a4d00fadf946b15330b96f7421178c229716b24 Mon Sep 17 00:00:00 2001 From: lichenggang Date: Tue, 11 Feb 2025 14:27:52 +0800 Subject: [PATCH 3/7] fix: etc/issue 23 to 25 --- debian/changelog | 6 ++++++ etc/issue | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d54df55..48278fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +base-files (25-6deepin0) unstable; urgency=medium + + * etc/issue 23 to 25 + + -- lichenggang Tue, 11 Feb 2025 14:26:32 +0800 + base-files (25-6) unstable; urgency=medium * share/motd Deepin to deepin. diff --git a/etc/issue b/etc/issue index 5aa24ed..4cde1bd 100644 --- a/etc/issue +++ b/etc/issue @@ -1,2 +1,2 @@ -Deepin #OSNAME# 23 \n \l +Deepin #OSNAME# 25 \n \l From 6a02ce8cb30b150d0d019a78ad2b160f4c92884f Mon Sep 17 00:00:00 2001 From: lichenggang Date: Thu, 13 Feb 2025 20:45:00 +0800 Subject: [PATCH 4/7] feat: cp -p /usr/share/base-files/motd /etc/motd --- debian/changelog | 6 ++++++ debian/postinst | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 48278fe..cbec5ec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +base-files (25-6deepin1) unstable; urgency=medium + + * add cp -p /usr/share/base-files/motd /etc/motd + + -- lichenggang Thu, 13 Feb 2025 20:44:34 +0800 + base-files (25-6deepin0) unstable; urgency=medium * etc/issue 23 to 25 diff --git a/debian/postinst b/debian/postinst index e1ad3a4..f6dd733 100644 --- a/debian/postinst +++ b/debian/postinst @@ -57,7 +57,7 @@ if [ ! -e "$DPKG_ROOT/etc/dpkg/origins/default" ]; then ln -sf #VENDORFILE# "$DPKG_ROOT/etc/dpkg/origins/default" fi fi - +cp -p /usr/share/base-files/motd /etc/motd if [ "$1" = "configure" ] && [ "$2" = "" ]; then install_from_default dot.profile /root/.profile install_from_default dot.bashrc /root/.bashrc From ea8b84d9eb027e0e3de10837cf5728a71c4c6cfd Mon Sep 17 00:00:00 2001 From: lichenggang Date: Tue, 24 Jun 2025 16:44:18 +0800 Subject: [PATCH 5/7] feat: update codename --- debian/changelog | 6 ++++++ etc/os-release | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index cbec5ec..5407bf5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +base-files (25-6deepin3) unstable; urgency=medium + + * update codename , beige -> crimson. + + -- lichenggang Tue, 24 Jun 2025 16:43:39 +0800 + base-files (25-6deepin1) unstable; urgency=medium * add cp -p /usr/share/base-files/motd /etc/motd diff --git a/etc/os-release b/etc/os-release index 4b39186..9185464 100644 --- a/etc/os-release +++ b/etc/os-release @@ -1,6 +1,6 @@ PRETTY_NAME="Deepin 25" NAME="Deepin" -VERSION_CODENAME=beige +VERSION_CODENAME=crimson ID=deepin HOME_URL="https://www.deepin.org/" BUG_REPORT_URL="https://bbs.deepin.org" From 2d6b65145fad4bf5f2927cf39e5699d588be3268 Mon Sep 17 00:00:00 2001 From: lichenggang Date: Tue, 24 Jun 2025 21:28:41 +0800 Subject: [PATCH 6/7] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E4=B8=8D=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E7=9A=84/usr/lib64=E7=9B=AE=E5=BD=95=E6=97=B6?= =?UTF-8?q?=E7=9A=84/lib64=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在安装或升级过程中，判断如果存在链接/lib64但不存在/usr/lib64目录，则删除该链接，以解决相关问题。 --- debian/changelog | 6 ++++++ debian/preinst | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5407bf5..3d02220 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +base-files (25-6deepin4) unstable; urgency=medium + + * Delete the link/lib64 if the/etc/lib64 directory does not exist. + + -- lichenggang Tue, 24 Jun 2025 21:27:50 +0800 + base-files (25-6deepin3) unstable; urgency=medium * update codename , beige -> crimson. diff --git a/debian/preinst b/debian/preinst index de5b1f1..4d0a2b6 100644 --- a/debian/preinst +++ b/debian/preinst @@ -3,6 +3,11 @@ set -e if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then msg= + # 解决升级过程中/usr/lib64目录不存在的问题，磐石导致 + # 判断是否存在链接/lib64并且不存在/usr/lib64目录，则删除链接 + if [ -L /lib64 ] && [ ! -d /usr/lib64 ]; then + rm -f /lib64 + fi for d in bin lib lib32 lib64 libo32 libx32 sbin; do if [ -L "$DPKG_ROOT/$d" ]; then target=$(readlink "$DPKG_ROOT/$d") From 892758aaa27dee9d25891ffc60a911bbd83aa96c Mon Sep 17 00:00:00 2001 From: lichenggang Date: Thu, 21 May 2026 17:43:42 +0800 Subject: [PATCH 7/7] =?UTF-8?q?fix:=20=E9=BB=98=E8=AE=A4=E5=B0=86=20/var/l?= =?UTF-8?q?ocal=20=E8=AE=BE=E4=B8=BA=20root:root=20=E5=92=8C=20755=20?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Make /var/local to be root:root and 755 by default on new installs. 跟随上游 13.7 版本，缺省使得 /var/local 是 root:root 755，去掉其 sgid 权限 Log: 删除 2775-dirs 及 rules 中 var/local 相关 sgid 权限设置 Influence: 新安装系统的 /var/local 目录权限 Co-Authored-By: Claude Opus 4.7 --- debian/2775-dirs | 1 - debian/changelog | 6 ++++++ debian/rules | 2 -- 3 files changed, 6 insertions(+), 3 deletions(-) delete mode 100644 debian/2775-dirs diff --git a/debian/2775-dirs b/debian/2775-dirs deleted file mode 100644 index ad85adc..0000000 --- a/debian/2775-dirs +++ /dev/null @@ -1 +0,0 @@ -var/local diff --git a/debian/changelog b/debian/changelog index 3d02220..5890ea8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +base-files (25-6deepin5) unstable; urgency=medium + + * Make /var/local to be root:root and 755 by default on new installs. + + -- xinpeng.wang Thu, 21 May 2026 16:23:08 +0800 + base-files (25-6deepin4) unstable; urgency=medium * Delete the link/lib64 if the/etc/lib64 directory does not exist. diff --git a/debian/rules b/debian/rules index 17ad36f..18fbe88 100755 --- a/debian/rules +++ b/debian/rules @@ -71,10 +71,8 @@ override_dh_compress: override_dh_fixperms: dh_fixperms - cd debian/base-files && chown root:staff var/local cd debian/base-files && chmod 755 `find . -type d` cd debian/base-files && chmod 1777 `cat ../1777-dirs` - cd debian/base-files && chmod 2775 `cat ../2775-dirs` cd debian/base-files && chmod 700 root override_dh_installdeb: