summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2021-04-11 06:45:18 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2021-04-11 06:45:18 +0000
commit99d0dd841eec55fc67a7ac97031e5895436fad86 (patch)
treeb53ff68b041b7dcb82f3f44dc6d1dbdd082a1c25
parentReleasing progress-linux version 11-0progress6u1. (diff)
downloadbase-files-99d0dd841eec55fc67a7ac97031e5895436fad86.tar.xz
base-files-99d0dd841eec55fc67a7ac97031e5895436fad86.zip
Merging upstream version 11.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--etc/debian_version2
-rw-r--r--etc/issue2
-rw-r--r--etc/issue.net2
-rw-r--r--etc/os-release5
-rw-r--r--origins/debian2
-rw-r--r--share/dot.bashrc2
-rw-r--r--share/profile4
-rw-r--r--share/profile.md5sums3
-rw-r--r--share/staff-group-for-usr-local2
9 files changed, 14 insertions, 10 deletions
diff --git a/etc/debian_version b/etc/debian_version
index 37ad99e..2dbc24b 100644
--- a/etc/debian_version
+++ b/etc/debian_version
@@ -1 +1 @@
-bullseye/sid
+11.0
diff --git a/etc/issue b/etc/issue
index 836683e..a61dded 100644
--- a/etc/issue
+++ b/etc/issue
@@ -1,2 +1,2 @@
-Debian #OSNAME# bullseye/sid \n \l
+Debian #OSNAME# 11 \n \l
diff --git a/etc/issue.net b/etc/issue.net
index 6c96e01..f225b8a 100644
--- a/etc/issue.net
+++ b/etc/issue.net
@@ -1 +1 @@
-Debian #OSNAME# bullseye/sid
+Debian #OSNAME# 11
diff --git a/etc/os-release b/etc/os-release
index a6a47e9..468f32f 100644
--- a/etc/os-release
+++ b/etc/os-release
@@ -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 --git a/origins/debian b/origins/debian
index 91f6ed1..3b623d2 100644
--- a/origins/debian
+++ b/origins/debian
@@ -1,3 +1,3 @@
Vendor: Debian
-Vendor-URL: http://www.debian.org/
+Vendor-URL: https://www.debian.org/
Bugs: debbugs://bugs.debian.org
diff --git a/share/dot.bashrc b/share/dot.bashrc
index 5d3a56e..df9ee74 100644
--- a/share/dot.bashrc
+++ b/share/dot.bashrc
@@ -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 --git a/share/profile b/share/profile
index 9485cbf..de64c87 100644
--- a/share/profile
+++ b/share/profile
@@ -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 @@ if [ "${PS1-}" ]; then
. /etc/bash.bashrc
fi
else
- if [ "`id -u`" -eq 0 ]; then
+ if [ "$(id -u)" -eq 0 ]; then
PS1='# '
else
PS1='$ '
diff --git a/share/profile.md5sums b/share/profile.md5sums
index 1473093..5d338c7 100644
--- a/share/profile.md5sums
+++ b/share/profile.md5sums
@@ -11,4 +11,5 @@ b94c2e3df2a779ac12080942df4d86ea 5.9 to 6.4
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 --git a/share/staff-group-for-usr-local b/share/staff-group-for-usr-local
index 4c7c8f2..0b5d526 100644
--- a/share/staff-group-for-usr-local
+++ b/share/staff-group-for-usr-local
@@ -13,4 +13,4 @@ This file is created by base-files on the initial install, and it's
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.