Bug#988276: unblock: base-files/11.1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock base-files 11.1. Debdiff is attached.
The changes are of two types:
a) Changes for standards compliance and bugs which are trivial to fix
(at the top of changelog) and
b) The "branding" changes which always happen before a stable release
(at the bottom of the changelog).
Thanks.
diff -Nru base-files-11/debian/changelog base-files-11.1/debian/changelog
--- base-files-11/debian/changelog 2019-07-09 12:05:50.000000000 +0200
+++ base-files-11.1/debian/changelog 2021-04-10 22:15:00.000000000 +0200
@@ -1,3 +1,26 @@
+base-files (11.1) unstable; urgency=medium
+
+ * Use https where appropriate, namely, origins/debian (currently used)
+ and share/staff-group-for-usr-local (not anymore). Closes: #959470.
+ * Gracefully handle /usr/share/info not existing. Closes: #977113.
+ * Use $() instead of `` where appropriate, namely, the default files
+ for /etc/profile and /root/.bashrc. Closes: #982687.
+ * Update share/profile.md5sums as the default file has changed.
+ * Update build-dependency on debhelper.
+ * Release candidate for bullseye as stable:
+ - Use "11" as version in /etc/issue and /etc/issue.net.
+ (never expected to change after buster is released)
+ - Use 11.0 as version in /etc/debian_version.
+ (expected to change at every point release)
+ - Change PRETTY_NAME in /usr/lib/os-release, adding 11 as version number
+ and "(bullseye)" as codename. Add also VERSION_ID and VERSION.
+ (never expected to change)
+ - Add VERSION_CODENAME to os-release.
+ (only expected on stable releases)
+ - Update README (bullseye -> bookworm).
+
+ -- Santiago Vila <sanvila@debian.org> Sat, 10 Apr 2021 22:15:00 +0200
+
base-files (11) unstable; urgency=medium
* Change issue, issue.net, debian_version and os-release to read
diff -Nru base-files-11/debian/compat base-files-11.1/debian/compat
--- base-files-11/debian/compat 2019-07-09 11:00:00.000000000 +0200
+++ base-files-11.1/debian/compat 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-9
diff -Nru base-files-11/debian/control base-files-11.1/debian/control
--- base-files-11/debian/control 2019-07-09 11:00:00.000000000 +0200
+++ base-files-11.1/debian/control 2021-04-10 22:15:00.000000000 +0200
@@ -3,7 +3,7 @@
Priority: required
Maintainer: Santiago Vila <sanvila@debian.org>
Standards-Version: 4.1.3
-Build-Depends: debhelper (>= 9)
+Build-Depends: debhelper-compat (= 13)
Package: base-files
Provides: base
diff -Nru base-files-11/debian/postinst.in base-files-11.1/debian/postinst.in
--- base-files-11/debian/postinst.in 2019-07-09 11:00:00.000000000 +0200
+++ base-files-11.1/debian/postinst.in 2021-04-10 22:15:00.000000000 +0200
@@ -108,7 +108,7 @@
chmod 644 /var/lib/dpkg/status
fi
-if [ ! -f /usr/info/dir ] && [ ! -f /usr/share/info/dir ]; then
+if [ -d /usr/share/info ] && [ ! -f /usr/info/dir ] && [ ! -f /usr/share/info/dir ]; then
install_from_default info.dir /usr/share/info/dir
chmod 644 /usr/share/info/dir
fi
diff -Nru base-files-11/debian/README base-files-11.1/debian/README
--- base-files-11/debian/README 2019-07-09 11:00:00.000000000 +0200
+++ base-files-11.1/debian/README 2021-04-10 22:15:00.000000000 +0200
@@ -4,10 +4,10 @@
* Questions about /etc/issue and /etc/debian_version:
Q. I upgraded my system to the testing distribution and now my /etc/issue
-says "bullseye/sid". Should it not read "bullseye" or "testing"?
+says "bookworm/sid". Should it not read "bookworm" or "testing"?
Q. I upgraded my system to the unstable distribution and now my /etc/issue
-says "bullseye/sid". Should it not read "sid" or "unstable"?
+says "bookworm/sid". Should it not read "sid" or "unstable"?
A. That would be nice, but it is not possible because of the way the
testing distribution works. Packages uploaded for unstable reach
@@ -17,9 +17,9 @@
two sides of the same coin. Since the base-files package in testing
was initially uploaded for unstable, the only sensible /etc/issue to
have is one that is both valid for testing and unstable, hence
-"bullseye/sid" (or whatever is appropriate).
+"bookworm/sid" (or whatever is appropriate).
-Q. Why "bullseye/sid" and not "testing/unstable" as it used to be?
+Q. Why "bookworm/sid" and not "testing/unstable" as it used to be?
A. The codename is a little bit more informative, as the meaning of
"testing" changes over time.
diff -Nru base-files-11/etc/debian_version base-files-11.1/etc/debian_version
--- base-files-11/etc/debian_version 2019-07-09 12:00:00.000000000 +0200
+++ base-files-11.1/etc/debian_version 2021-04-10 22:00:00.000000000 +0200
@@ -1 +1 @@
-bullseye/sid
+11.0
diff -Nru base-files-11/etc/issue base-files-11.1/etc/issue
--- base-files-11/etc/issue 2019-07-09 12:00:00.000000000 +0200
+++ base-files-11.1/etc/issue 2021-04-10 22:00:00.000000000 +0200
@@ -1,2 +1,2 @@
-Debian #OSNAME# bullseye/sid \n \l
+Debian #OSNAME# 11 \n \l
diff -Nru base-files-11/etc/issue.net base-files-11.1/etc/issue.net
--- base-files-11/etc/issue.net 2019-07-09 12:00:00.000000000 +0200
+++ base-files-11.1/etc/issue.net 2021-04-10 22:00:00.000000000 +0200
@@ -1 +1 @@
-Debian #OSNAME# bullseye/sid
+Debian #OSNAME# 11
diff -Nru base-files-11/etc/os-release base-files-11.1/etc/os-release
--- base-files-11/etc/os-release 2019-07-09 12:00:00.000000000 +0200
+++ base-files-11.1/etc/os-release 2021-04-10 22:00:00.000000000 +0200
@@ -1,5 +1,8 @@
-PRETTY_NAME="Debian #OSNAME# bullseye/sid"
+PRETTY_NAME="Debian #OSNAME# 11 (bullseye)"
NAME="Debian #OSNAME#"
+VERSION_ID="11"
+VERSION="11 (bullseye)"
+VERSION_CODENAME=bullseye
ID=debian
HOME_URL="https://www.debian.org/";
SUPPORT_URL="https://www.debian.org/support";
diff -Nru base-files-11/origins/debian base-files-11.1/origins/debian
--- base-files-11/origins/debian 2009-02-03 00:06:58.000000000 +0100
+++ base-files-11.1/origins/debian 2021-04-10 22:15:00.000000000 +0200
@@ -1,3 +1,3 @@
Vendor: Debian
-Vendor-URL: http://www.debian.org/
+Vendor-URL: https://www.debian.org/
Bugs: debbugs://bugs.debian.org
diff -Nru base-files-11/share/dot.bashrc base-files-11.1/share/dot.bashrc
--- base-files-11/share/dot.bashrc 2010-01-31 12:52:26.000000000 +0100
+++ base-files-11.1/share/dot.bashrc 2021-04-10 22:00:00.000000000 +0200
@@ -7,7 +7,7 @@
# You may uncomment the following lines if you want `ls' to be colorized:
# export LS_OPTIONS='--color=auto'
-# eval "`dircolors`"
+# eval "$(dircolors)"
# alias ls='ls $LS_OPTIONS'
# alias ll='ls $LS_OPTIONS -l'
# alias l='ls $LS_OPTIONS -lA'
diff -Nru base-files-11/share/profile base-files-11.1/share/profile
--- base-files-11/share/profile 2016-03-04 12:00:00.000000000 +0100
+++ base-files-11.1/share/profile 2021-04-10 22:00:00.000000000 +0200
@@ -1,7 +1,7 @@
# /etc/profile: system-wide .profile file for the Bourne shell (sh(1))
# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...).
-if [ "`id -u`" -eq 0 ]; then
+if [ "$(id -u)" -eq 0 ]; then
PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
else
PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games"
@@ -16,7 +16,7 @@
. /etc/bash.bashrc
fi
else
- if [ "`id -u`" -eq 0 ]; then
+ if [ "$(id -u)" -eq 0 ]; then
PS1='# '
else
PS1='$ '
diff -Nru base-files-11/share/profile.md5sums base-files-11.1/share/profile.md5sums
--- base-files-11/share/profile.md5sums 2016-03-04 12:00:00.000000000 +0100
+++ base-files-11.1/share/profile.md5sums 2021-04-10 22:00:00.000000000 +0200
@@ -11,4 +11,5 @@
91901ce5707909cfec8b3a1a6efbfa61 6.5 to 7.6
6c56009f8aabda9400878ce3c7fd91af 7.7
ff2bae0480885c074afadec201f5c668 7.8 to 9.5
-2255054e61cee1a99dbe893377820dde 9.6 to current
+2255054e61cee1a99dbe893377820dde 9.6 to 11
+48a30a427d1794feb49f102b87ddce2b 11.1 to current
diff -Nru base-files-11/share/staff-group-for-usr-local base-files-11.1/share/staff-group-for-usr-local
--- base-files-11/share/staff-group-for-usr-local 2012-06-09 12:00:00.000000000 +0200
+++ base-files-11.1/share/staff-group-for-usr-local 2021-04-10 22:00:00.000000000 +0200
@@ -13,4 +13,4 @@
also created on upgrades from any base-files release before 6.10, which
means it will be created on upgrades from squeeze to wheezy.
-See http://bugs.debian.org/299007 for details.
+See https://bugs.debian.org/299007 for details.
Reply to: