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 e015576..5890ea8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,45 @@ +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. + + -- lichenggang Tue, 24 Jun 2025 21:27:50 +0800 + +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 + + -- lichenggang Thu, 13 Feb 2025 20:44:34 +0800 + +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. + + -- lichenggang Mon, 09 Dec 2024 17:36:46 +0800 + +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/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 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") 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: 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/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 diff --git a/etc/os-release b/etc/os-release index a6396d7..9185464 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 +VERSION_CODENAME=crimson 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..0c22b78 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/