[neon/forks/base-files/Neon/unstable] /: manually sync to https://launchpad.net/ubuntu/+source/base-files/12ubuntu4.1
Jonathan Esk-Riddell
null at kde.org
Tue May 24 15:18:27 BST 2022
Git commit 9af5000daba6f95064d22efd7f8315fe8fecbd0f by Jonathan Esk-Riddell.
Committed on 24/05/2022 at 14:18.
Pushed by jriddell into branch 'Neon/unstable'.
manually sync to https://launchpad.net/ubuntu/+source/base-files/12ubuntu4.1
M +4 -4 debian/README
M +1 -1 debian/base-files.maintscript
M +218 -24 debian/changelog
D +0 -1 debian/compat
M +5 -5 debian/control
M +1 -1 debian/motd-news
A +5 -0 debian/motd-news-config.lintian-overrides
M +1 -1 debian/motd-news-config.postinst
M +11 -20 debian/postinst.in
M +4 -22 debian/rules
M +1 -1 etc/debian_version
M +1 -1 etc/issue.net
M +2 -2 etc/lsb-release
M +5 -8 etc/os-release
M +0 -2 motd/10-help-text
M +1 -1 origins/debian
D +0 -4 origins/neon
M +1 -1 share/profile
M +1 -0 share/profile.md5sums
M +1 -1 share/staff-group-for-usr-local
https://invent.kde.org/neon/forks/base-files/commit/9af5000daba6f95064d22efd7f8315fe8fecbd0f
diff --git a/debian/README b/debian/README
index 1618655..01570a9 100644
--- a/debian/README
+++ b/debian/README
@@ -4,10 +4,10 @@ Frequently Asked Questions about base-files
* 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 @@ testing. You should consider the testing and unstable distributions as
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 --git a/debian/base-files.maintscript b/debian/base-files.maintscript
index a0cdd9a..9972f51 100644
--- a/debian/base-files.maintscript
+++ b/debian/base-files.maintscript
@@ -1 +1 @@
-rm_conffile /etc/default/motd-news 11ubuntu5.2~ base-files
+rm_conffile /etc/default/motd-news 11ubuntu11~ base-files
diff --git a/debian/changelog b/debian/changelog
index e22c082..59a58c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,34 +1,203 @@
-base-files (11ubuntu5.5) focal; urgency=medium
+base-files (12ubuntu4.1) jammy; urgency=medium
- * /etc/issue, /etc/issue.net, /etc/lsb-release, /etc/os-release: Bump
- version number to 20.04.4 in preparation of the next point release.
+ * /etc/os-release: add missing LTS to VERSION (LP: #1969960)
- -- Brian Murray <brian at ubuntu.com> Wed, 16 Feb 2022 16:44:50 -0800
+ -- Paride Legovini <paride at ubuntu.com> Fri, 22 Apr 2022 16:34:19 +0200
-base-files (11ubuntu5.4) focal; urgency=medium
+base-files (12ubuntu4) jammy; urgency=medium
- * /etc/issue, /etc/issue.net, /etc/lsb-release, /etc/os-release: Bump
- version number to 20.04.3 in preparation of the next point release.
+ * /etc/issue{,.net}, /etc/{lsb,os}-release: Prepare for 22.04 release.
- -- Łukasz 'sil2100' Zemczak <lukasz.zemczak at ubuntu.com> Wed, 04 Aug 2021 16:53:58 +0200
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak at ubuntu.com> Mon, 18 Apr 2022 11:28:59 +0100
-base-files (11ubuntu5.3) focal; urgency=medium
+base-files (12ubuntu3) jammy; urgency=medium
- * /etc/issue, /etc/issue.net, /etc/lsb-release, /etc/os-release: Bump
- version number to 20.04.2 in preparation of the next point release.
+ * No-change rebuild for ppc64el baseline bump.
- -- Łukasz 'sil2100' Zemczak <lukasz.zemczak at ubuntu.com> Wed, 27 Jan 2021 10:40:24 +0100
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak at ubuntu.com> Wed, 23 Mar 2022 10:42:33 +0100
-base-files (11ubuntu5.2) focal; urgency=medium
+base-files (12ubuntu2) jammy; urgency=medium
+
+ * Fix /etc/os-release for jammy as UBUNTU_CODENAME still had impish.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak at ubuntu.com> Mon, 08 Nov 2021 12:34:26 +0100
+
+base-files (12ubuntu1) jammy; urgency=medium
+
+ * Merge with Debian, remaining changes:
+ - Add /etc/lsb-release file.
+ - /etc/issue{,.net}, /etc/{lsb,os}-release: Welcome to ATTRIBUTE ANIMAL!
+ - Install locale-check command to /usr/bin and invoke it from
+ /etc/profile.d/01-locale-fix.sh to ensure locale related environment
+ variables are set to valid values.
+ - Include systemd service to check the motd.ubuntu.com service
+ - Various bashrc extensions.
+ - Do not install /usr/local dirs with staff group writeability.
+ - Add default /etc/networks file.
+ - Remove the upgrade-available flag on package upgrade.
+ - Include debhelper token in postinst.
+ - Restore order line in /etc/host.conf with a comment.
+ - Build a motd-news-config package.
+ - Add update-motd scripts.
+ - etc/legal: legal notice for Ubuntu
+ - Depend on libcrypt1 (>= 1:4.4.10-10ubuntu3).
+ - Drop lsb-release-udeb package.
+ * /etc/issue{,.net}, /etc/{lsb,os}-release: Welcome to Jammy Jellfyfish!
+
+ -- Matthias Klose <doko at ubuntu.com> Fri, 15 Oct 2021 12:06:05 +0200
+
+base-files (12) unstable; urgency=medium
+
+ * Do not create /var/run/utmp in postinst, as /var/run is
+ ephemeral and it does not make sense. Closes: #989725.
+ * Do not create /var/lib/dpkg/status if missing anymore,
+ as dpkg already does that. Closes: #989726.
+ * Change issue, issue.net, debian_version and os-release to read
+ "bookworm/sid". Closes: #992369.
+ * Drop VERSION, VERSION_ID and CODENAME from os-release.
+
+ -- Santiago Vila <sanvila at debian.org> Sun, 22 Aug 2021 19:00:00 +0200
+
+base-files (11.1ubuntu5) impish; urgency=medium
+
+ * /etc/issue{,.net}, /etc/{lsb,os}-release: Prepare for 21.10 release.
+
+ -- Matthias Klose <doko at ubuntu.com> Mon, 11 Oct 2021 10:39:49 +0200
+
+base-files (11.1ubuntu4) impish; urgency=medium
+
+ * No-change rebuild to build packages with zstd compression.
+
+ -- Matthias Klose <doko at ubuntu.com> Thu, 07 Oct 2021 12:09:31 +0200
+
+base-files (11.1ubuntu3) impish; urgency=medium
+
+ * Use current compat level 13
+ - d/rules: update systemd handling to dh_installsystemd
+ - d/compat,d/control: stop reverting to compat level 9
+ - d/motd-news-config.lintian-overrides: ignore the use of ENABLED
+ in etc/default/motd-news
+
+ -- Christian Ehrhardt <christian.ehrhardt at canonical.com> Mon, 03 May 2021 07:50:38 +0200
+
+base-files (11.1ubuntu2) impish; urgency=medium
+
+ * Fix remaining stray reference to 21.04. LP: #1926544.
+
+ -- Steve Langasek <steve.langasek at ubuntu.com> Wed, 28 Apr 2021 23:47:16 -0700
+
+base-files (11.1ubuntu1) impish; urgency=medium
+
+ * Merge with Debian; remaining changes:
+ - Add /etc/lsb-release file.
+ - /etc/issue{,.net}, /etc/{lsb,os}-release: Welcome to ATTRIBUTE ANIMAL!
+ - Install locale-check command to /usr/bin and invoke it from
+ /etc/profile.d/01-locale-fix.sh to ensure locale related environment
+ variables are set to valid values.
+ - Include systemd service to check the motd.ubuntu.com service
+ - Various bashrc extensions.
+ - Do not install /usr/local dirs with staff group writeability.
+ - Add default /etc/networks file.
+ - Remove the upgrade-available flag on package upgrade.
+ - Include debhelper token in postinst.
+ - Restore order line in /etc/host.conf with a comment.
+ - Build a motd-news-config package.
+ - Add update-motd scripts.
+ - etc/legal: legal notice for Ubuntu
+ - Depend on libcrypt1 (>= 1:4.4.10-10ubuntu3).
+ - Drop lsb-release-udeb package.
+ * Stay with debhelper v9 for now.
+ * /etc/issue{,.net}, /etc/{lsb,os}-release: Welcome to Impish Indri!
+
+ -- Matthias Klose <doko at ubuntu.com> Fri, 23 Apr 2021 11:01:54 +0200
+
+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 at debian.org> Sat, 10 Apr 2021 22:15:00 +0200
+
+base-files (11ubuntu19) hirsute; urgency=medium
+
+ * /etc/issue{,.net}, /etc/{lsb,os}-release: Prepare for 21.04 release.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak at ubuntu.com> Mon, 19 Apr 2021 09:26:45 +0200
+
+base-files (11ubuntu18) hirsute; urgency=medium
+
+ * Drop build-dependency on obsolete dh-systemd.
+
+ -- Steve Langasek <steve.langasek at ubuntu.com> Tue, 02 Mar 2021 14:33:43 -0800
+
+base-files (11ubuntu17) hirsute; urgency=medium
+
+ * No-change rebuild to drop the udeb package.
+
+ -- Matthias Klose <doko at ubuntu.com> Mon, 22 Feb 2021 10:30:07 +0100
+
+base-files (11ubuntu16) hirsute; urgency=medium
+
+ * s/Hanimal/Hippo/.
+
+ -- Matthias Klose <doko at ubuntu.com> Wed, 28 Oct 2020 13:13:06 +0100
+
+base-files (11ubuntu15) hirsute; urgency=medium
+
+ * /etc/issue{,.net}, /etc/{lsb,os}-release: Welcome to Hirsute Hanimal!
+
+ -- Matthias Klose <doko at ubuntu.com> Sat, 24 Oct 2020 10:27:56 +0200
+
+base-files (11ubuntu14) groovy; urgency=medium
+
+ * /etc/issue{,.net}, /etc/{lsb,os}-release: Prepare for 20.10 release.
+
+ -- Matthias Klose <doko at ubuntu.com> Fri, 16 Oct 2020 17:40:29 +0200
+
+base-files (11ubuntu13) groovy; urgency=medium
+
+ * Fix handling of /e/d/motd-news.wasremoved (LP: #1895302):
+ - d/postinst.in: check if ubuntu-server is installed before creating
+ the .wasremoved file
+ - d/postinst.in: re-arrange the cascading conditionals around the
+ creation of the .wasremoved file for better clarity
+ - d/postinst.in: only consider creating the .wasremoved file in upgrades,
+ never fresh installs like in debootstrap for example
+ - d/motd-news-config.postinst: always remove /e/d/motd-news.wasremoved
+ if present
+
+ -- Andreas Hasenack <andreas at canonical.com> Wed, 16 Sep 2020 10:26:50 -0300
+
+base-files (11ubuntu12) groovy; urgency=medium
+
+ * d/control: set priority to optional for motd-news-config to avoid
+ having it pulled in by the release upgrader
+
+ -- Andreas Hasenack <andreas at canonical.com> Fri, 14 Aug 2020 14:28:12 -0300
+
+base-files (11ubuntu11) groovy; urgency=medium
- [ Andreas Hasenack ]
- * motd/50-motd-news: don't include uptime in the user-agent string
- (LP: #1886572)
* Move the /etc/default/motd-news conffile to the motd-news-config
package (LP: #1888575):
- d/base-files.maintscript: remove /etc/default/motd-news config file
on upgrade
- - d/control: break on ubuntu-server << 1.450.2 to force an upgrade if
+ - d/control: break on ubuntu-server << 1.453 to force an upgrade if
it is installed, which will pull motd-news-config and the conffile
back in
- d/motd-news-config.postinst:
@@ -43,21 +212,46 @@ base-files (11ubuntu5.2) focal; urgency=medium
- d/rules, d/motd-news-config.install: /e/d/motd-news is in the
motd-news-config package now
- [ Steve Langasek ]
+ -- Andreas Hasenack <andreas at canonical.com> Mon, 10 Aug 2020 21:02:37 +0000
+
+base-files (11ubuntu10) groovy; urgency=medium
+
+ * motd/50-motd-news: use the actual wget version variable in the
+ user-agent string
+ * motd/50-motd-news: handle wget's behavior with a 404 document
+ (LP: #1889117)
+
+ -- Andreas Hasenack <andreas at canonical.com> Mon, 27 Jul 2020 16:44:07 -0300
+
+base-files (11ubuntu9) groovy; urgency=medium
+
* motd/50-motd-news: use wget instead of curl, since wget is standard but
- curl is optional (LP: #1888572):
+ curl is optional.
- This changes the timeout behavior slightly because wget does not have
an exact equivalent to curl's --max-time argument, we are using
--timeout instead.
- -- Andreas Hasenack <andreas at canonical.com> Mon, 17 Aug 2020 10:31:58 -0300
+ -- Steve Langasek <steve.langasek at ubuntu.com> Fri, 10 Jul 2020 09:58:46 -0700
+
+base-files (11ubuntu8) groovy; urgency=medium
+
+ * motd/50-motd-news: don't include uptime in the user-agent string
+ (LP: #1886572)
+
+ -- Andreas Hasenack <andreas at canonical.com> Mon, 06 Jul 2020 19:50:22 -0300
+
+base-files (11ubuntu7) groovy; urgency=medium
+
+ [ Simon Deziel ]
+ * motd/50-motd-news: abort early if curl is missing (LP: #1875644)
+
+ -- Andreas Hasenack <andreas at canonical.com> Wed, 06 May 2020 09:25:15 -0300
-base-files (11ubuntu5.1) focal; urgency=medium
+base-files (11ubuntu6) groovy; urgency=medium
- * /etc/issue, /etc/issue.net, /etc/lsb-release, /etc/os-release: Bump
- version number to 20.04.1 in preparation of the next point release.
+ * /etc/issue{,.net}, /etc/{lsb,os}-release: Welcome to Groovy Gorilla!
- -- Łukasz 'sil2100' Zemczak <lukasz.zemczak at ubuntu.com> Wed, 15 Jul 2020 10:59:48 +0200
+ -- Matthias Klose <doko at ubuntu.com> Fri, 24 Apr 2020 17:11:27 +0200
base-files (11ubuntu5) focal; urgency=medium
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index 55d6a97..f149093 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: required
Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
XSBC-Original-Maintainer: Santiago Vila <sanvila at debian.org>
Standards-Version: 4.1.3
-Build-Depends: debhelper (>= 9), dh-systemd
+Build-Depends: debhelper-compat (= 13)
Package: base-files
Provides: base
@@ -14,8 +14,8 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, libcrypt1 (>= 1:4.4.10-10ubuntu3)
Essential: yes
Priority: required
Replaces: base, miscutils, dpkg (<= 1.15.0)
-Breaks: debian-security-support (<< 2019.04.25), initscripts (<< 2.88dsf-13.3), sendfile (<< 2.1b.20080616-5.2~),
- ubuntu-server (<< 1.450.2)
+Breaks: debian-security-support (<< 2019.04.25), initscripts (<< 2.88dsf-13.3), sendfile (<< 2.1b.20080616-5.2~)
+ , ubuntu-server (<< 1.453)
Multi-Arch: foreign
Description: Debian base system miscellaneous files
This package contains the basic filesystem hierarchy of a Debian system, and
@@ -26,8 +26,8 @@ Description: Debian base system miscellaneous files
Package: motd-news-config
Architecture: all
Priority: optional
-Breaks: base-files (<< 11ubuntu5.2)
-Replaces: base-files (<< 11ubuntu5.2)
+Breaks: base-files (<< 11ubuntu11)
+Replaces: base-files (<< 11ubuntu11)
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Configuration for motd-news shipped in base-files
This package contains the configuration read by the motd-news script
diff --git a/debian/motd-news b/debian/motd-news
index eefe29c..434e562 100644
--- a/debian/motd-news
+++ b/debian/motd-news
@@ -2,7 +2,7 @@
# This is a useful way to provide dynamic, informative
# information pertinent to the users and administrators
# of the local system
-ENABLED=0
+ENABLED=1
# Configure the source of dynamic MOTD news
# White space separated list of 0 to many news services
diff --git a/debian/motd-news-config.lintian-overrides b/debian/motd-news-config.lintian-overrides
new file mode 100644
index 0000000..da71c4e
--- /dev/null
+++ b/debian/motd-news-config.lintian-overrides
@@ -0,0 +1,5 @@
+#
+# enabling/disabling in the .service file would not allow the
+# "other-package activates service" mechanism that motd-news uses
+#
+motd-news-config: init.d-script-should-always-start-service
diff --git a/debian/motd-news-config.postinst b/debian/motd-news-config.postinst
index a73427f..0be04fd 100644
--- a/debian/motd-news-config.postinst
+++ b/debian/motd-news-config.postinst
@@ -33,9 +33,9 @@ case "$1" in
fi
if [ -e /etc/default/motd-news.wasremoved ] && [ -e /etc/default/motd-news ]; then
sed -i -e 's/^ENABLED=1/# Changed by motd-news-config.postinst:\n# config file was manually removed - disable the service\nENABLED=0/' /etc/default/motd-news
- rm /etc/default/motd-news.wasremoved
fi
fi
+ rm -f /etc/default/motd-news.wasremoved
;;
abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/postinst.in b/debian/postinst.in
index c347a62..6bdf16a 100644
--- a/debian/postinst.in
+++ b/debian/postinst.in
@@ -89,22 +89,9 @@ if [ "$1" = "configure" ] && [ "$2" = "" ]; then
chown root:utmp /var/log/wtmp /var/log/btmp /var/log/lastlog
chmod 664 /var/log/wtmp /var/log/lastlog
chmod 660 /var/log/btmp
- if [ ! -f /var/run/utmp ]; then
- echo -n>/var/run/utmp
- fi
- chown root:utmp /var/run/utmp
- chmod 664 /var/run/utmp
-fi
-
-if [ ! -d /var/lib/dpkg ]; then
- mkdir -m 755 -p /var/lib/dpkg
-fi
-if [ ! -f /var/lib/dpkg/status ]; then
- echo > /var/lib/dpkg/status
- 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
@@ -130,12 +117,16 @@ fi
# it does not put back the file with default contents which would
# re-enable motd-news
motd_news_config="/etc/default/motd-news"
-if [ ! -e ${motd_news_config} ]; then
- if [ ! -e ${motd_news_config}.dpkg-remove ]; then
- if [ ! -e ${motd_news_config}.dpkg-backup ]; then
- touch ${motd_news_config}.wasremoved
- fi
- fi
+# only in upgrades, never fresh installs like in debootstrap
+if [ "$2" != "" ] && \
+ [ ! -e ${motd_news_config} ] && \
+ [ ! -e ${motd_news_config}.dpkg-remove ] && \
+ [ ! -e ${motd_news_config}.dpkg-backup ]; then
+ # The .wasremoved file only matters if ubuntu-server is installed,
+ # because that's what will pull in motd-news-config
+ if dpkg -l ubuntu-server 2>/dev/null | grep -q ^i; then
+ touch ${motd_news_config}.wasremoved
+ fi
fi
#DEBHELPER#
diff --git a/debian/rules b/debian/rules
index e319a01..621f25c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ VENDORFILE = neon
DESTDIR = debian/base-files
%:
- dh $@ --with systemd
+ dh $@
locale-check:
$(CC) $(CFLAGS) $(LDFLAGS) -o locale-check locale-check.c
@@ -43,27 +43,9 @@ endif
mv $(DESTDIR)/etc/os-release $(DESTDIR)/usr/lib/os-release
ln -s ../usr/lib/os-release $(DESTDIR)/etc/os-release
-override_dh_link:
- dh_link -X os-release
-
-override_dh_compress:
- dh_compress -X README
-
-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_systemd_enable:
- dh_systemd_enable -pbase-files motd-news.timer
- dh_systemd_enable -pbase-files motd-news.service
-
-override_dh_systemd_start:
- dh_systemd_start -pbase-files motd-news.timer
- dh_systemd_start -pbase-files motd-news.service
+override_dh_installsystemd:
+ dh_installsystemd -pbase-files motd-news.timer
+ dh_installsystemd -pbase-files motd-news.service
override_dh_link:
dh_link -X os-release
diff --git a/etc/debian_version b/etc/debian_version
index 37ad99e..a82f56a 100644
--- a/etc/debian_version
+++ b/etc/debian_version
@@ -1 +1 @@
-bullseye/sid
+bookworm/sid
diff --git a/etc/issue.net b/etc/issue.net
index bae1c6a..a442582 100644
--- a/etc/issue.net
+++ b/etc/issue.net
@@ -1 +1 @@
-KDE neon Unstable Edition
+Ubuntu 22.04 LTS \n \l
diff --git a/etc/lsb-release b/etc/lsb-release
index d6d39bd..b81c0fc 100644
--- a/etc/lsb-release
+++ b/etc/lsb-release
@@ -1,4 +1,4 @@
DISTRIB_ID=neon
-DISTRIB_RELEASE=20.04
-DISTRIB_CODENAME=focal
+DISTRIB_RELEASE=22.04
+DISTRIB_CODENAME=jammy
DISTRIB_DESCRIPTION="KDE neon Unstable Edition"
diff --git a/etc/os-release b/etc/os-release
index 0ff1fc5..401e97b 100644
--- a/etc/os-release
+++ b/etc/os-release
@@ -1,15 +1,12 @@
+PRETTY_NAME="KDE neon Unstable Edition"
NAME="KDE neon"
+VERSION_ID="22.04"
VERSION="Unstable Edition"
+VERSION_CODENAME=jammy
ID=neon
ID_LIKE="ubuntu debian"
-PRETTY_NAME="KDE neon Unstable Edition"
-VARIANT="Unstable Branches"
-VARIANT_ID=unstable
-VERSION_ID="20.04"
HOME_URL="https://neon.kde.org/"
SUPPORT_URL="https://neon.kde.org/"
BUG_REPORT_URL="https://bugs.kde.org/"
-LOGO=start-here-kde-neon
-PRIVACY_POLICY_URL="https://www.ubuntu.com/legal/terms-and-policies/privacy-policy"
-VERSION_CODENAME=focal
-UBUNTU_CODENAME=focal
+PRIVACY_POLICY_URL="https://kde.org/privacypolicy/
+UBUNTU_CODENAME=jammy
diff --git a/motd/10-help-text b/motd/10-help-text
index e34ee90..47f02b7 100644
--- a/motd/10-help-text
+++ b/motd/10-help-text
@@ -20,8 +20,6 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-return # neon addition, disable ubuntu references, they feel awkwardly out of place
-
printf "\n"
printf " * Documentation: https://help.ubuntu.com\n"
printf " * Management: https://landscape.canonical.com\n"
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/origins/neon b/origins/neon
deleted file mode 100644
index 58e76c0..0000000
--- a/origins/neon
+++ /dev/null
@@ -1,4 +0,0 @@
-Vendor: neon
-Vendor-URL: http://neon.kde.org/
-Bugs: https://bugs.kde.org
-Parent: Ubuntu
diff --git a/share/profile b/share/profile
index 259b3b4..7f85066 100644
--- a/share/profile
+++ b/share/profile
@@ -9,7 +9,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 dbc0a50..3da8ac8 100644
--- a/share/profile.md5sums
+++ b/share/profile.md5sums
@@ -9,3 +9,4 @@ b59ea6ac3a1ad8c0527ec94f73bafca0
c3a1d42cddcc565f16b48eb9c2119d9d
85a2a7227b884e4c84ff950626fcc89f
9d5ee34149287021622dd9e21c17ec26
+9926b56bc6e576d4ad206dd82d38deff
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.
More information about the Neon-commits
mailing list