diff -pruN 12.3/debian/base-files.dirs 12.3ubuntu1/debian/base-files.dirs
--- 12.3/debian/base-files.dirs	2019-07-09 09:00:00.000000000 +0000
+++ 12.3ubuntu1/debian/base-files.dirs	2022-10-17 14:42:58.000000000 +0000
@@ -9,6 +9,7 @@ etc/skel
 etc/update-motd.d
 home
 lib
+lib/systemd/system
 proc
 root
 run
diff -pruN 12.3/debian/base-files.maintscript 12.3ubuntu1/debian/base-files.maintscript
--- 12.3/debian/base-files.maintscript	1970-01-01 00:00:00.000000000 +0000
+++ 12.3ubuntu1/debian/base-files.maintscript	2022-04-22 14:29:15.000000000 +0000
@@ -0,0 +1 @@
+rm_conffile /etc/default/motd-news 11ubuntu11~ base-files
diff -pruN 12.3/debian/changelog 12.3ubuntu1/debian/changelog
--- 12.3/debian/changelog	2022-10-03 21:30:00.000000000 +0000
+++ 12.3ubuntu1/debian/changelog	2022-10-28 13:38:44.000000000 +0000
@@ -1,3 +1,28 @@
+base-files (12.3ubuntu1) lunar; urgency=low
+
+  * Merge from Debian unstable. 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.
+    - set a LOGO=ubuntu-logo key which is part of the specification,
+      install ubuntu-logo/-text/-text-dark icons
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Fri, 28 Oct 2022 15:38:44 +0200
+
 base-files (12.3) unstable; urgency=high
 
   * Add VERSION_CODENAME to /etc/os-release. Closes: #1008735.
@@ -9,6 +34,44 @@ base-files (12.3) unstable; urgency=high
 
  -- Santiago Vila <sanvila@debian.org>  Mon, 03 Oct 2022 23:30:00 +0200
 
+base-files (12.2ubuntu3) kinetic; urgency=medium
+
+  * /etc/issue{,.net}, /etc/{lsb,os}-release: Prepare for 22.10 release
+
+ -- Graham Inggs <ginggs@ubuntu.com>  Mon, 17 Oct 2022 09:00:41 +0000
+
+base-files (12.2ubuntu2) kinetic; urgency=medium
+
+  * debian/rules, etc/os-release, logos/:
+    - set a LOGO=ubuntu-logo key which is part of the specification,
+      install ubuntu-logo/-text/-text-dark icons (lp: #1931582)
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Mon, 11 Jul 2022 17:58:15 +0200
+
+base-files (12.2ubuntu1) kinetic; urgency=low
+
+  * Merge from Debian unstable. 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.
+  * Adjust ubuntu postinst.in changes for DPKG_ROOT.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Wed, 01 Jun 2022 12:31:09 +0200
+
 base-files (12.2) unstable; urgency=medium
 
   * A simplified version of the patch for DPKG_ROOT was applied, but the
@@ -23,6 +86,60 @@ base-files (12.1) unstable; urgency=medi
 
  -- Santiago Vila <sanvila@debian.org>  Wed, 19 Jan 2022 22:40:00 +0100
 
+base-files (12ubuntu5) kinetic; urgency=medium
+
+  * /etc/issue{,.net}, /etc/{lsb,os}-release: Welcome to Kinetic Kudu!
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Tue, 26 Apr 2022 17:47:05 +0200
+
+base-files (12ubuntu4.1) jammy; urgency=medium
+
+  * /etc/os-release: add missing LTS to VERSION (LP: #1969960)
+
+ -- Paride Legovini <paride@ubuntu.com>  Fri, 22 Apr 2022 16:34:19 +0200
+
+base-files (12ubuntu4) jammy; urgency=medium
+
+  * /etc/issue{,.net}, /etc/{lsb,os}-release: Prepare for 22.04 release.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Mon, 18 Apr 2022 11:28:59 +0100
+
+base-files (12ubuntu3) jammy; urgency=medium
+
+  * No-change rebuild for ppc64el baseline bump.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Wed, 23 Mar 2022 10:42:33 +0100
+
+base-files (12ubuntu2) jammy; urgency=medium
+
+  * Fix /etc/os-release for jammy as UBUNTU_CODENAME still had impish.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@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@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
@@ -35,6 +152,59 @@ base-files (12) unstable; urgency=medium
 
  -- Santiago Vila <sanvila@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@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@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@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@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@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)
@@ -58,6 +228,151 @@ base-files (11.1) unstable; urgency=medi
 
  -- Santiago Vila <sanvila@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@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@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@ubuntu.com>  Mon, 22 Feb 2021 10:30:07 +0100
+
+base-files (11ubuntu16) hirsute; urgency=medium
+
+  * s/Hanimal/Hippo/.
+
+ -- Matthias Klose <doko@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@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@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@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@canonical.com>  Fri, 14 Aug 2020 14:28:12 -0300
+
+base-files (11ubuntu11) groovy; urgency=medium
+
+  * 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.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:
+      + handle the upgrade case where the motd-news config file was
+        changed while it belonged to base-files
+      + disable motd-news if the config file was removed by hand before
+        the upgrade
+    - d/postinst.in: signal the motd-news-config package if the
+      motd-news config file was removed manually before the upgrade
+    - d/control: new motd-news-config package, carrying the
+      configuration file for the /etc/update-motd.d/50-motd-news script.
+    - d/rules, d/motd-news-config.install: /e/d/motd-news is in the
+      motd-news-config package now
+
+ -- Andreas Hasenack <andreas@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@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.
+    - 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.
+
+ -- Steve Langasek <steve.langasek@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@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@canonical.com>  Wed, 06 May 2020 09:25:15 -0300
+
+base-files (11ubuntu6) groovy; urgency=medium
+
+  * /etc/issue{,.net}, /etc/{lsb,os}-release: Welcome to Groovy Gorilla!
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 24 Apr 2020 17:11:27 +0200
+
+base-files (11ubuntu5) focal; urgency=medium
+
+  * /etc/issue{,.net}, /etc/{lsb,os}-release: Prepare for 20.04 release.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 15 Apr 2020 13:09:51 +0200
+
+base-files (11ubuntu4) focal; urgency=medium
+
+  * Depend on libcrypt1 (>= 1:4.4.10-10ubuntu3).
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 06 Mar 2020 22:31:10 +0100
+
+base-files (11ubuntu2) focal; urgency=medium
+
+  * motd/50-motd-news: Don't show error when /var/cache/motd-news is missing
+    and runnig as regular user (LP: #1855271)
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Thu, 05 Dec 2019 15:39:21 +0100
+
+base-files (11ubuntu1) focal; urgency=medium
+
+  * Pull in the (mostly) no-op changes and two bug fixes from Debian.
+  * /etc/issue{,.net}, /etc/{lsb,os}-release: Welcome to Focal Fossa!
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Fri, 18 Oct 2019 17:35:58 +0100
+
 base-files (11) unstable; urgency=medium
 
   * Change issue, issue.net, debian_version and os-release to read
@@ -75,6 +390,70 @@ base-files (10.3) unstable; urgency=medi
 
  -- Santiago Vila <sanvila@debian.org>  Mon, 13 May 2019 22:25:32 +0200
 
+base-files (10.2ubuntu7) eoan; urgency=medium
+
+  * /etc/issue{,.net}, /etc/{lsb,os}-release: Prepare for 19.10 release.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Mon, 14 Oct 2019 15:35:56 +0100
+
+base-files (10.2ubuntu6) eoan; urgency=medium
+
+  * motd/50-motd-news: set cloud-id to unknown if the tool exited with a
+    non-zero status, or printed an empty string (LP: #1841597)
+
+ -- Andreas Hasenack <andreas@canonical.com>  Tue, 27 Aug 2019 15:31:30 -0300
+
+base-files (10.2ubuntu5) eoan; urgency=medium
+
+  * motd/50-motd-news: add cloud_id to user-agent string (LP: #1840946)
+
+ -- Andreas Hasenack <andreas@canonical.com>  Thu, 15 Aug 2019 14:57:39 -0300
+
+base-files (10.2ubuntu4) eoan; urgency=medium
+
+  * debian/motd-news.timer: Change the timer to use an OnCalendar entry
+    instead since neither OnActiveSec nor OnUnitActiveSec accomplished the
+    intended goal. (LP: #1829968)
+
+ -- Brian Murray <brian@ubuntu.com>  Fri, 05 Jul 2019 15:30:39 -0700
+
+base-files (10.2ubuntu3) eoan; urgency=medium
+
+  * debian/motd-news.timer: Switch the timer from OnUnitActiveSec to
+    OnUnitSec as the latter is correct for oneshot services. (LP: #1829968)
+
+ -- Brian Murray <brian@ubuntu.com>  Thu, 13 Jun 2019 12:12:22 -0700
+
+base-files (10.2ubuntu2) eoan; urgency=medium
+
+  * /etc/issue{,.net}, /etc/{lsb,os}-release: Welcome to Eoan Ermine!
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Mon, 06 May 2019 14:11:17 -0600
+
+base-files (10.2ubuntu1) eoan; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Add /etc/lsb-release file.
+    - /etc/issue{,.net}, /etc/{lsb,os}-release: Welcome to Eoan EANIMAL!
+    - 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
+    - Add lsb-release-udeb package.
+    - 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.
+    - Add update-motd scripts.
+    - etc/legal: legal notice for Ubuntu
+  * Dropped changes, no longer needed:
+    - debian/base-files.maintscript: long finished conffile transition.
+  * Set debian_version back to buster/sid.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sun, 05 May 2019 22:06:07 -0700
+
 base-files (10.2) unstable; urgency=medium
 
   * Release candidate for buster as stable:
@@ -92,6 +471,65 @@ base-files (10.2) unstable; urgency=medi
 
  -- Santiago Vila <sanvila@debian.org>  Fri, 19 Apr 2019 13:05:00 +0200
 
+base-files (10.1ubuntu10) eoan; urgency=medium
+
+  * /etc/issue{,.net}, /etc/{lsb,os}-release: Welcome to Eoan EANIMAL!
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Fri, 19 Apr 2019 07:27:00 -0600
+
+base-files (10.1ubuntu9) disco; urgency=medium
+
+  * /etc/issue{,.net}, /etc/{lsb,os}-release: Prepare for 19.04 release.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Tue, 16 Apr 2019 01:36:43 -0600
+
+base-files (10.1ubuntu8) disco; urgency=medium
+
+  * /etc/issue{,.net}, /etc/{lsb,os}-release: Welcome to Disco Dingo!
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Tue, 30 Oct 2018 05:34:20 -0600
+
+base-files (10.1ubuntu7) cosmic; urgency=medium
+
+  * /etc/issue{,.net}, /etc/{lsb,os}-release: Prepare for 18.10 release.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Mon, 15 Oct 2018 11:10:34 -0600
+
+base-files (10.1ubuntu6) cosmic; urgency=medium
+
+  * SECURITY UPDATE: insecure temp file usage
+    - update-motd.d/50-motd-news: don't use predictable filename.
+    - Thanks to Sander Bos for reporting this issue.
+    - CVE-2018-6557
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Tue, 21 Aug 2018 09:12:02 -0400
+
+base-files (10.1ubuntu5) cosmic; urgency=medium
+
+  * 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. (LP: #1134036)
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Tue, 07 Aug 2018 11:53:28 +1200
+
+base-files (10.1ubuntu4) cosmic; urgency=medium
+
+  * /etc/issue{,.net}, /etc/{lsb,os}-release: Welcome to Cosmic Cuttlefish!
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Wed, 02 May 2018 05:44:20 -0600
+
+base-files (10.1ubuntu2) bionic; urgency=medium
+
+  * /etc/issue{,.net}, /etc/{lsb,os}-release: Prepare for 18.04 release.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Tue, 24 Apr 2018 02:34:22 -0600
+
+base-files (10.1ubuntu1) bionic; urgency=medium
+
+  * Merge with Debian, fixing build failure.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 09 Apr 2018 13:10:28 +0200
+
 base-files (10.1) unstable; urgency=medium
 
   * Add CC0-1.0 to common-licenses. Closes: #859649, #882628.
@@ -108,6 +546,12 @@ base-files (10.1) unstable; urgency=medi
 
  -- Santiago Vila <sanvila@debian.org>  Sun, 14 Jan 2018 00:36:34 +0100
 
+base-files (10ubuntu1) bionic; urgency=medium
+
+  * /etc/issue{,.net}, /etc/{lsb,os}-release: Welcome to Bionic Beaver!
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Wed, 25 Oct 2017 04:30:29 -0600
+
 base-files (10) unstable; urgency=medium
 
   * Change issue, issue.net, debian_version and os-release to read
@@ -149,6 +593,143 @@ base-files (9.7) unstable; urgency=mediu
 
  -- Santiago Vila <sanvila@debian.org>  Sun, 27 Nov 2016 19:29:38 +0100
 
+base-files (9.6ubuntu102) artful; urgency=medium
+
+  * /etc/issue{,.net}, /etc/{lsb,os}-release: Prepare for 17.10 release.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Mon, 16 Oct 2017 01:46:20 -0600
+
+base-files (9.6ubuntu101) artful; urgency=medium
+
+  * update-motd.d/50-news: Fix LP: #1691901
+    - when the curl fails (perhaps due to a firewall issue), we should
+      create an empty cache file, so that subsequent runs are not
+      penalized; ensure that we *only* print when we're not forced
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 29 Jun 2017 10:35:06 -0500
+
+base-files (9.6ubuntu100) artful; urgency=medium
+
+  * update-motd.d/50-news: Fix LP: #1691901
+    - when the curl fails (perhaps due to a firewall issue), we should
+      create an empty cache file, so that subsequent runs are not
+      penalized
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 29 Jun 2017 09:19:17 -0500
+
+base-files (9.6ubuntu99) artful; urgency=medium
+
+  * /etc/issue{,.net}, /etc/{lsb,os}-release: Welcome to Artful Aardvark!
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Thu, 20 Apr 2017 10:08:00 -0600
+
+base-files (9.6ubuntu13) zesty; urgency=medium
+
+  * /etc/issue{,.net}, /etc/{lsb,os}-release: Prepare for 17.04 release.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Mon, 10 Apr 2017 05:29:47 -0600
+
+base-files (9.6ubuntu12) zesty; urgency=medium
+
+  [ Jeremy Bicha ]
+  * /etc/os-release : Use https in URLs (LP: #1665711)
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 21 Feb 2017 00:01:18 -0800
+
+base-files (9.6ubuntu11) zesty; urgency=medium
+
+  * debian/control:
+    - drop depends on systemd; we don't want to pull this into chroots
+  * debian/base-files.maintscript
+    - use rm_conffile to remove old 50-news script
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Wed, 15 Feb 2017 14:30:34 -0600
+
+base-files (9.6ubuntu10) zesty; urgency=medium
+
+  * debian/rules, debian/motd-news.service, debian/motd-news.timer:
+    - rework the motd-news, using a systemd timer, LP: #1637800 comment #4
+    - timer fires the first time, 1 minute after boot, and then every 12 hours
+      thereafter
+    - timer calls "/etc/update-motd.d/50-motd-news --force", which forces a
+      background fetch of the news, written to /var/cache/motd-news
+  * debian/motd-news:
+    - change the variable name of the list of news sources from SERVER to URLS
+  * update-motd.d/50-motd-news, debian/postinst:
+    - renamed file, to be consistent, "motd-news"
+    - remove the old conf file /etc/update-motd.d/50-news
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Sat, 21 Jan 2017 10:34:26 -0500
+
+base-files (9.6ubuntu9) zesty; urgency=medium
+
+  * Fix LP: #1649352
+    - use https://motd.ubuntu.com in the default file
+    - enforce that every news server must be https
+    - take at most the first 10 lines, and first 80 chars per line
+    - remove all control characters (except newline)
+
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Sat, 17 Dec 2016 09:19:53 -0600
+
+base-files (9.6ubuntu8) zesty; urgency=medium
+
+  * debian/motd-news:
+    - update documentation, note that you can specify zero to many news sources
+  * update-motd.d/50-news:
+    - print at most 2 lines from each news source
+    - print at most 80 characters per line from each news source
+    - loop over the one to many news sources
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Mon, 05 Dec 2016 18:10:55 -0600
+
+base-files (9.6ubuntu7) zesty; urgency=medium
+
+  * etc/default/motd-news, update-motd.d/50-news: LP: #1637800
+    - add an update-motd script, that dynamically retrieves a
+      message-of-the-day from a news service, defaults to
+      https://motd.ubuntu.com
+    - fail quietly, gracefully, and quickly
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Fri, 11 Nov 2016 09:54:28 -0600
+
+base-files (9.6ubuntu6) zesty; urgency=medium
+
+  * /etc/issue{,.net}, /etc/{lsb,os}-release: Welcome to Zesty Zapus!
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 18 Oct 2016 08:52:40 +0200
+
+base-files (9.6ubuntu5) yakkety; urgency=medium
+
+  * /etc/issue{,.net}, /etc/{lsb,os}-release: Prepare for 16.10 release.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Sat, 08 Oct 2016 04:11:43 -0600
+
+base-files (9.6ubuntu4) yakkety; urgency=medium
+
+  * /etc/os-release: Add PRIVACY_POLICY_URL (LP: #1614834)
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Fri, 19 Aug 2016 01:41:24 -0400
+
+base-files (9.6ubuntu3) yakkety; urgency=medium
+
+  * /etc/os-release: Add VERSION_CODENAME per upstream spec (LP: #1598212)
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Fri, 12 Aug 2016 11:45:34 -0600
+
+base-files (9.6ubuntu2) yakkety; urgency=medium
+
+  * add links for obtaining management and support in 10-help-text and
+    fix the documentation link, LP: #1592386
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 14 Jun 2016 15:23:30 +0300
+
+base-files (9.6ubuntu1) yakkety; urgency=medium
+
+  * /etc/issue{,.net}, /etc/{lsb,os}-release: Welcome to Yakkety Yak!
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Thu, 21 Apr 2016 22:32:42 -0600
+
 base-files (9.6) unstable; urgency=low
 
   * Add lintian override for /etc/os-release.
@@ -168,6 +749,43 @@ base-files (9.5) unstable; urgency=mediu
 
  -- Santiago Vila <sanvila@debian.org>  Wed, 28 Oct 2015 23:29:08 +0100
 
+base-files (9.4ubuntu4) xenial; urgency=medium
+
+  * /etc/issue{,.net}, /etc/{lsb,os}-release: Prepare for 16.04 release.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Tue, 12 Apr 2016 14:14:23 -0600
+
+base-files (9.4ubuntu3) xenial; urgency=medium
+
+  * etc/os-release:
+    - add UBUNTU_CODENAME=xenial (LP: #1520154)
+      (having distro specific fields is ok according to the spec)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 27 Nov 2015 14:59:41 +0100
+
+base-files (9.4ubuntu2) xenial; urgency=medium
+
+  * Re-add a newline to /etc/issue.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 23 Oct 2015 13:27:43 +0200
+
+base-files (9.4ubuntu1) xenial; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Branding changes.
+    - Add /etc/lsb-release file.
+    - Add lsb-release-udeb package.
+    - Various bashrc extensions.
+    - Do not install /usr/local dirs with staff group writeability, as there
+      are cases where somebody can become any user but root (like NFS).
+    - Update the motd upgrade handling to know about /etc/motd.tail.
+    - Add default /etc/networks file.
+    - Added information about the docs web page.
+    - Restore order line in /etc/host.conf with a comment.
+    - Add update-motd scripts.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 22 Oct 2015 18:55:58 +0200
+
 base-files (9.4) unstable; urgency=medium
 
   * Fix two install_from_default() calls in postinst that were still
@@ -328,6 +946,87 @@ base-files (7.3) unstable; urgency=mediu
 
  -- Santiago Vila <sanvila@debian.org>  Sun, 04 May 2014 14:39:06 +0200
 
+base-files (7.2ubuntu11) wily; urgency=medium
+
+  * /etc/issue{,.net}, /etc/{lsb,os}-release: Prepare for 15.10 release.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Mon, 19 Oct 2015 09:54:15 +0100
+
+base-files (7.2ubuntu10) wily; urgency=medium
+
+  * /etc/issue{,.net}, /etc/{lsb,os}-release: Welcome to Wily Werewolf!
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Mon, 04 May 2015 18:39:47 -0600
+
+base-files (7.2ubuntu9) vivid; urgency=medium
+
+  * /etc/issue{,.net}, /etc/{lsb,os}-release: Prepare for 15.04 release.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Fri, 17 Apr 2015 15:29:05 -0600
+
+base-files (7.2ubuntu8) vivid; urgency=medium
+
+  * /etc/issue{,.net}, /etc/{lsb,os}-release: Welcome to Vivid Vervet!
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 23 Oct 2014 17:11:52 -0400
+
+base-files (7.2ubuntu7) utopic; urgency=medium
+
+  * /etc/issue{,.net}, /etc/{lsb,os}-release: Prepare for 14.10 release.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 15 Oct 2014 18:18:18 +0200
+
+base-files (7.2ubuntu6) utopic; urgency=medium
+
+  * /etc/issue{,.net}, /etc/{lsb,os}-release: Welcome to Utopic Unicorn!
+  * debian/{preinst,prerm,postint,rules}: Remove obsolete conffile code.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Mon, 21 Apr 2014 16:19:56 -0600
+
+base-files (7.2ubuntu5) trusty; urgency=medium
+
+  * /etc/issue{,.net}, /etc/{lsb,os}-release: Prepare for 14.04 LTS release.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 10 Apr 2014 23:58:33 +0200
+
+base-files (7.2ubuntu4) trusty; urgency=medium
+
+  * Build base-files.deb with -Zgzip since it's in the debootstrap set.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Thu, 27 Feb 2014 11:22:33 -0700
+
+base-files (7.2ubuntu3) trusty; urgency=medium
+
+  * Don't forget to manually install the debian/postrm file in the package...
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Wed, 19 Feb 2014 19:40:00 -0800
+
+base-files (7.2ubuntu2) trusty; urgency=medium
+
+  * Drop Ubuntu-specific upgrade handling from lucid, related to update-motd.
+  * debian/{postinst.in,preinst,postrm}: remove /etc/update-motd.d/99-footer,
+    no longer needed with current Debian update-motd.d handling.
+  * Fix yet another lintian error about non-conffiles in /etc.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 20 Feb 2014 03:29:31 +0000
+
+base-files (7.2ubuntu1) trusty; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Branding changes.
+    - Add /etc/lsb-release file.
+    - Add lsb-release-udeb package.
+    - Various bashrc extensions.
+    - Do not install /usr/local dirs with staff group writeability, as there
+      are cases where somebody can become any user but root (like NFS).
+    - Update the motd upgrade handling to know about /etc/motd.tail.
+    - Add default /etc/networks file.
+    - Added information about the docs web page.
+    - Restore order line in /etc/host.conf with a comment.
+    - Add update-motd scripts.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 06 Jan 2014 15:16:41 +0100
+
 base-files (7.2) unstable; urgency=medium
 
   * Changed issue, issue.net, debian_version and os-release to read
@@ -368,6 +1067,50 @@ base-files (7) unstable; urgency=low
 
  -- Santiago Vila <sanvila@debian.org>  Wed, 12 Dec 2012 12:55:00 +0100
 
+base-files (6.12ubuntu5) trusty; urgency=low
+
+  * /etc/issue{,.net}, /etc/lsb-release, /etc/os-release: Welcome to Trusty!
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 18 Oct 2013 15:55:49 +0200
+
+base-files (6.12ubuntu4) saucy; urgency=low
+
+  * /etc/issue{,.net}, /etc/{lsb,os}-release: Prepare for 13.10 release.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Sun, 13 Oct 2013 19:57:06 +0100
+
+base-files (6.12ubuntu3) saucy; urgency=low
+
+  * /etc/issue{,.net}, /etc/lsb-release, /etc/os-release: Welcome to Saucy!
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 25 Apr 2013 16:49:33 +0200
+
+base-files (6.12ubuntu2) raring; urgency=low
+
+  * /etc/issue, /etc/issue.net, /etc/lsb-release, /etc/os-release: Prepare
+    for Raring release.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 19 Apr 2013 09:52:03 +0100
+
+base-files (6.12ubuntu1) raring; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Branding changes.
+    - Add /etc/lsb-release file.
+    - Add lsb-release-udeb package.
+    - Various bashrc extensions.
+    - Do not install /usr/local dirs with staff group writeability, as there
+      are cases where somebody can become any user but root (like NFS).
+    - Update the motd upgrade handling to know about /etc/motd.tail.
+    - Add default /etc/networks file.
+    - Added information about the docs web page.
+    - Restore order line in /etc/host.conf with a comment.
+    - Add update-motd scripts.
+    - Migrate /etc/os-release to a conffile.
+  * Add HOME_URL, SUPPORT_URL, and BUG_REPORT_URL to /etc/os-release.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Mon, 29 Oct 2012 17:53:44 +0000
+
 base-files (6.12) unstable; urgency=low
 
   * Added HOME_URL, SUPPORT_URL and BUG_REPORT_URL to /etc/os-release.
@@ -380,6 +1123,40 @@ base-files (6.12) unstable; urgency=low
 
  -- Santiago Vila <sanvila@debian.org>  Sat, 27 Oct 2012 17:41:00 +0200
 
+base-files (6.11ubuntu3) raring; urgency=low
+
+  * Tighten up the preinst /etc/os-release migration version check to
+    make sure we don't try to re-migrate (and delete) the SRU version
+    from quantal-proposed, which now includes the conffile migration.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Tue, 23 Oct 2012 21:36:16 +0100
+
+base-files (6.11ubuntu2) raring; urgency=low
+
+  * Add preinst magic to silently migrate /etc/os-release to a conffile.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Tue, 23 Oct 2012 12:05:20 +0100
+
+base-files (6.11ubuntu1) raring; urgency=low
+
+  * /etc/issue{,.net}, /etc/lsb-release, /etc/os-release: Welcome to Raring!
+  * Merge from Debian unstable.  Remaining changes:
+    - Branding changes.
+    - Add /etc/lsb-release file.
+    - Add lsb-release-udeb package.
+    - Various bashrc extensions.
+    - Do not install /usr/local dirs with staff group writeability, as there
+      are cases where somebody can become any user but root (like NFS).
+    - Update the motd upgrade handling to know about /etc/motd.tail.
+    - Add default /etc/networks file.
+    - Added information about the docs web page.
+    - Restore order line in /etc/host.conf with a comment.
+    - Add update-motd scripts.
+  * Drop the outdated replaces on an ancient pre-hardy lsb-release
+  * Drop the temporary leap-second workaround, no longer needed
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Mon, 22 Oct 2012 16:57:35 +0100
+
 base-files (6.11) unstable; urgency=medium
 
   * Create /etc/motd instead of /etc/motd.tail, with same default contents,
@@ -445,6 +1222,94 @@ base-files (6.6) unstable; urgency=low
 
  -- Santiago Vila <sanvila@debian.org>  Sat, 03 Mar 2012 16:35:22 +0100
 
+base-files (6.5ubuntu11) quantal; urgency=low
+
+  * /etc/issue, /etc/issue.net, /etc/lsb-release, /etc/os-release: Prepare
+    for Quantal release.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 09 Oct 2012 14:09:59 +0200
+
+base-files (6.5ubuntu10) quantal; urgency=low
+
+  * Correct PRETTY_NAME in os-release to use "(development branch)"
+
+ -- Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>  Mon, 10 Sep 2012 15:39:32 +0100
+
+base-files (6.5ubuntu9) quantal; urgency=low
+
+  * Install /etc/os-release. LP: #947236.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 10 Sep 2012 15:38:03 +0200
+
+base-files (6.5ubuntu8) quantal; urgency=low
+
+  * Call date -s $(date -R) on upgrade, to resync any clocks that might
+    be desynced (and causing pthread spinning in the kernel) due to the leap
+    second.  LP: #1020285.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 03 Jul 2012 10:43:12 -0700
+
+base-files (6.5ubuntu7) quantal; urgency=low
+
+  * /etc/issue, /etc/issue.net, /etc/lsb-release: Welcome to Quantal!
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 25 Apr 2012 12:54:00 +0200
+
+base-files (6.5ubuntu6) precise; urgency=low
+
+  * /etc/issue, /etc/issue.net, /etc/lsb-release: Prepare for Precise
+    release.
+
+ -- Stéphane Graber <stgraber@ubuntu.com>  Thu, 19 Apr 2012 11:17:03 +0200
+
+base-files (6.5ubuntu5) precise; urgency=low
+
+  * debian/preinst: also handle 99-footer.  Really closes LP: #903137.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 27 Jan 2012 10:50:52 -0800
+
+base-files (6.5ubuntu4) precise; urgency=low
+
+  * debian/preinst: the non-conffile contents of /etc/update-motd.d had
+    different md5sums in lucid, so include upgrade handling for those
+    versions as well so we avoid spurious conffile prompts.  LP: #903137.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Wed, 25 Jan 2012 15:47:04 -0800
+
+base-files (6.5ubuntu3) precise; urgency=low
+
+  * Fix permissions of /etc/dpkg/origins/* and
+    /usr/share/doc/base-files/copyright (LP: #871977).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 25 Nov 2011 09:41:15 +0000
+
+base-files (6.5ubuntu2) precise; urgency=low
+
+  * share/profile: Fix incorrect ordering of /etc/profile.d handling vs. PS1
+    check, bringing this more into line with Debian (LP: #881373).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 25 Oct 2011 14:28:47 +0100
+
+base-files (6.5ubuntu1) precise; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Branding changes.
+    - Add /etc/lsb-release file.
+    - Add lsb-release-udeb package.
+    - Record md5sums of unmodified /etc/profile versions so that we can
+      upgrade it automatically.
+    - Various bashrc extensions.
+    - Do not install /usr/local dirs with staff group writeability, as there
+      are cases where somebody can become any user but root (like NFS).
+    - Update the motd upgrade handling to know about /etc/motd.tail.
+    - Add default /etc/networks file.
+    - Added information about the docs web page.
+    - Restore order line in /etc/host.conf with a comment.
+    - Ship /root mode 700 by default.
+    - Add update-motd scripts.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 25 Oct 2011 09:06:14 +0100
+
 base-files (6.5) unstable; urgency=low
 
   * Modified default /etc/profile to not read /etc/bash.bashrc if bash
@@ -452,6 +1317,80 @@ base-files (6.5) unstable; urgency=low
 
  -- Santiago Vila <sanvila@debian.org>  Fri, 29 Jul 2011 21:03:02 +0200
 
+base-files (6.4ubuntu6) precise; urgency=low
+
+  * /etc/issue, /etc/issue.net, /etc/lsb-release: Welcome to Precise!
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 13 Oct 2011 16:03:05 +0100
+
+base-files (6.4ubuntu5) oneiric; urgency=low
+
+  * /etc/issue, /etc/issue.net, /etc/lsb-release: Prepare for Oneiric
+    release.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Sat, 08 Oct 2011 00:45:55 +0100
+
+base-files (6.4ubuntu4) oneiric; urgency=low
+
+  * debian/preinst:
+    - fix conffile prompt for unmodified 00-header, 10-help-text 
+      (LP: #820233)
+  * debian/rules:
+    - install the preinst into the package as no helper is used
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 03 Aug 2011 10:44:29 +0200
+
+base-files (6.4ubuntu3) oneiric; urgency=low
+
+  * add update-motd.d files to conffiles (LP: #813282)
+
+ -- Brian Murray <brian@ubuntu.com>  Wed, 20 Jul 2011 16:04:07 -0700
+
+base-files (6.4ubuntu2) oneiric; urgency=low
+
+  * update-motd.d/10-help-text: modify server documentation link to be the
+    official documentation page of the installed distribution.  Thanks to Tim
+    Kuijsten for working on this. (LP: #744253)
+  * rather than depend on lsb-release test to see if lsb_release is available
+    (LP: #575885)
+
+ -- Brian Murray <brian@ubuntu.com>  Thu, 14 Jul 2011 13:29:27 -0700
+
+base-files (6.4ubuntu1) oneiric; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - Branding changes.
+    - Add /etc/lsb-release file.
+    - Add lsb-release-udeb package.
+    - Record md5sums of unmodified /etc/profile versions so that we can
+      upgrade it automatically.
+    - Various bashrc extensions.
+    - Do not install /usr/local dirs with staff group writeability, as there
+      are cases where somebody can become any user but root (like NFS).
+    - Update the motd upgrade handling to know about /etc/motd.tail.
+    - Add default /etc/networks file.
+    - Added information about the docs web page.
+    - Restore order line in /etc/host.conf with a comment.
+    - Ship /root mode 700 by default.
+  * Dropped changes:
+    - drop versioned dependency on libpam-modules, satisfied in all versions
+      since hardy (and earlier)
+    - remove /var/lock and /var/run: this is handled differently in Debian,
+      no reason to diverge
+    - fixing up permissions of files copied by ubiquity: transition completed
+      in lucid.
+    - debian/postinst.in: replace references to /var/run with /run: /run is
+      still a draft standard for the time being and should only be used for
+      those parts of the system that were being placed *other* than in
+      /var/run for various reasons (e.g., /dev/.udev, /lib/init/rw).
+      /var/run must continue to exist and be functional, and initscripts
+      guarantees a smooth transition from /var/run to /run once we are ready
+      to start doing away with /var/run (once the FHS officially ratifies
+      /run as its replacement), so there's no reason to diverge from Debian
+      here.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Wed, 13 Jul 2011 13:30:10 -0700
+
 base-files (6.4) unstable; urgency=low
 
   * Added /run. Closes: #620157.
@@ -467,6 +1406,51 @@ base-files (6.4) unstable; urgency=low
 
  -- Santiago Vila <sanvila@debian.org>  Fri, 27 May 2011 14:25:42 +0200
 
+base-files (6.3ubuntu4) oneiric; urgency=low
+
+  * Removed duplicate code in share/profile, causing /etc/profile.d/*
+    scripts to be executed twice (LP: #790050)
+
+ -- Alexander Fougner <fougner89@gmail.com>  Sat, 18 Jun 2011 00:23:05 +0200
+
+base-files (6.3ubuntu3) oneiric; urgency=low
+
+  * debian/1777-dirs: remove /var/lock (replaced by /run/lock on tmpfs)
+  * debian/directory-list: remove /var/run and /var/lock, add /run
+  * debian/postinst.in: replace references to /var/run with /run
+
+ -- Scott James Remnant <scott@netsplit.com>  Thu, 07 Jul 2011 13:33:06 -0400
+
+base-files (6.3ubuntu2) oneiric; urgency=low
+
+  * Restore /usr/share/base-files/networks.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 04 May 2011 23:20:17 +0100
+
+base-files (6.3ubuntu1) oneiric; urgency=low
+
+  * Merge with Debian; remaining changes:
+    - Branding changes.
+    - Add /etc/lsb-release file.
+    - Add lsb-release-udeb package.
+    - Record md5sums of unmodified /etc/profile versions so that we can
+      upgrade it automatically.
+    - Various bashrc extensions.
+    - Restore order line in /etc/host.conf with a comment.
+    - Add default /etc/networks file.
+    - Implement LSB-3.1, 16.2 (/etc/profile.d).
+    - Added information about the docs web page.
+    - Update the motd upgrade handling to know about /etc/motd.tail.
+    - Do not install /usr/local dirs with staff group writeability, as there
+      are cases where somebody can become any user but root (like NFS).
+    - Change permissions of kernels copied from the Live CD by Ubiquity
+      1.9.4 thru 1.10.9.
+    - Correct group ownership of files changed by Ubiquity 1.7.5 thru
+      1.10.9.
+    - Ship /root mode 700 by default.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 04 May 2011 10:31:43 +0200
+
 base-files (6.3) unstable; urgency=low
 
   * Dropped /run until everything else is ready for it. In particular,
@@ -486,123 +1470,367 @@ base-files (6.1) unstable; urgency=mediu
 
  -- Santiago Vila <sanvila@debian.org>  Mon, 07 Feb 2011 19:24:00 +0100
 
-base-files (6.0) unstable; urgency=low
+base-files (6.0) unstable; urgency=low
+
+  * Changed issue, issue.net and debian_version to read "6.0".
+  * Updated README accordingly.
+
+ -- Santiago Vila <sanvila@debian.org>  Tue, 14 Dec 2010 22:20:38 +0100
+
+base-files (5.10) unstable; urgency=medium
+
+  * Changed postinst to not reset /var/run/utmp permissions on every upgrade.
+    It is definitely not base-files business to change the permissions of
+    an already existing /var/run/utmp, as the system admin might have
+    changed them on purpose after the file was created. Closes: #601746.
+
+ -- Santiago Vila <sanvila@debian.org>  Sat, 13 Nov 2010 13:01:12 +0100
+
+base-files (5.9) unstable; urgency=medium
+
+  * Changed /etc/profile so that it defines PATH again. Closes: #571086.
+    We will have plenty of time to discuss about this after the release
+    of squeeze, but for now, this is the safe thing to do.
+
+ -- Santiago Vila <sanvila@debian.org>  Fri, 06 Aug 2010 19:37:40 +0200
+
+base-files (5.8) unstable; urgency=low
+
+  * Added GPL version 1 from http://ftp.gnu.org/gnu/Licenses/ as there
+    are a lot of packages still using it. Bug #436105.
+
+ -- Santiago Vila <sanvila@debian.org>  Mon, 05 Jul 2010 19:10:54 +0200
+
+base-files (5.7) unstable; urgency=low
+
+  * Drop umask setting from /etc/profile, will be handled by pam_umask.
+    Closes: #583967.
+
+ -- Santiago Vila <sanvila@debian.org>  Tue, 01 Jun 2010 23:57:52 +0200
+
+base-files (5.6) unstable; urgency=low
+
+  * Ordinary user accounts start at UID 1000 by default, but they also
+    end at 29999 by default. Modified default /etc/profile accordingly.
+
+ -- Santiago Vila <sanvila@debian.org>  Thu, 20 May 2010 11:34:34 +0200
+
+base-files (5.5) unstable; urgency=low
+
+  * Changed default /etc/profile so that the new umask of 002 is only
+    used for ordinary user accounts, which, according to policy, start
+    at uid 1000 by default.
+
+ -- Santiago Vila <sanvila@debian.org>  Wed, 19 May 2010 18:57:10 +0200
+
+base-files (5.4) unstable; urgency=low
+
+  * Changed umask in default /etc/profile to 002, which has a little bit
+    more sense than 022 on systems like Debian having User Private Groups.
+    As usual for /etc/profile, only new installs will have the new default,
+    so nobody will be surprised by this on upgrades. Hopefully, this change
+    will be documented in the release notes for squeeze as well, for users
+    who install squeeze from scratch. Closes: #248140, #581434.
+  * Refresh GNU licenses from http://ftp.gnu.org/gnu/Licenses/, as they
+    have expanded the embedded tabs. Closes: #572245.
+  * Switch to "3.0 (native)" format.
+
+ -- Santiago Vila <sanvila@debian.org>  Thu, 13 May 2010 18:35:42 +0200
+
+base-files (5.3) unstable; urgency=low
+
+  * Changed default /etc/profile so that it sources /etc/profile.d/*.sh
+    as mandated by the LSB section 16.2. Closes: #545756.
+    Package maintainers: Please don't use profile.d if you can avoid it,
+    as policy says "A program must not depend on environment variables
+    to get reasonable defaults".
+  * Removed questions about profile.d from FAQ.
+
+ -- Santiago Vila <sanvila@debian.org>  Fri, 09 Apr 2010 18:07:20 +0200
+
+base-files (5.2) unstable; urgency=low
+
+  * Added question in FAQ to document the fact that some configuration
+    files in /etc are never updated on upgrades. Closes: #571083.
+  * Changed default /usr/src to be root:root and 755. Closes: #573701.
+    The old permissions were of little benefit, and the user can still
+    change this after installing a new system anyway.
+  * Renamed FAQ to README and added a compatibility symlink.
+  * Removed obsolete Depends on base-passwd, as version 2.0.3.4 is more
+    than 10 years old and we don't support upgrades which skip releases.
+  * Dropped preinst completely, as it was there just to support upgrades
+    from very old releases (that we don't support anymore).
+  * Removed postinst code that supports upgrades from very old releases.
+
+ -- Santiago Vila <sanvila@debian.org>  Sun, 04 Apr 2010 13:22:04 +0200
+
+base-files (5.1) unstable; urgency=low
+
+  * Changed default permissions for /root to 700, as many admins consider
+    it should be more private than other home directories. Closes: #514794.
+  * Changed default permissions for /var/log/btmp to 660, to be in sync
+    with permissions set by logrotate. Closes: #547407.
+  * Do not export PS1 in /root/.bashrc, as it has bash escapes and it's
+    inherited to subshells that do not have to be bash. Closes: #567733.
+  * Added debian_chroot variable to default PS1 in /root/.bashrc.
+  * Comment out PS1 in /root/.bashrc anyway, as /etc/profile and
+    /etc/bash.bashrc already care about it. Closes: #443245.
+  * Comment out umask as well, as it's already in /etc/profile.
+  * Added /usr/local/games to default PATH in /etc/profile. Closes: #487105.
+  * While we are at it, comment out everything about PATH, as /etc/login.defs
+    should already care about this.
+  * Changed default /etc/profile so that it sources /etc/bash.bashrc
+    if the shell is bash. Closes: #275622.
+  * Drop \u part from default PS1 in /etc/profile, as it's only useful
+    for people with several non-root accounts. Most people are either root
+    or an ordinary user, so $ and # are enough to differentiate between them.
+  * Comment out PS1 setting in /etc/profile anyway, as we have bash.bashrc.
+
+ -- Santiago Vila <sanvila@debian.org>  Sun, 31 Jan 2010 13:16:14 +0100
+
+base-files (5.0.0ubuntu29) oneiric; urgency=low
+
+  * /etc/issue, /etc/issue.net, /etc/lsb-release: Welcome to Oneiric!
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 21 Apr 2011 18:58:47 +0200
+
+base-files (5.0.0ubuntu28) natty; urgency=low
+
+  * /etc/issue, /etc/issue.net, /etc/lsb-release: Prepare for Natty release.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 21 Apr 2011 17:20:37 +0100
+
+base-files (5.0.0ubuntu27) natty; urgency=low
+
+  * Capitalize Natty in DISTRIB_DESCRIPTION.
+
+ -- Evan Dandrea <ev@ubuntu.com>  Thu, 24 Feb 2011 11:58:12 +0000
+
+base-files (5.0.0ubuntu26) natty; urgency=low
+
+  * Ignore errors from update-motd (LP: #682843).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 02 Dec 2010 17:43:30 +0000
+
+base-files (5.0.0ubuntu25) natty; urgency=low
+
+  * debian/update-motd.d/00-header, debian/update-motd.d/10-help-text,
+    debian/update-motd.d/99-footer:
+    - add copyright/license header
+    - simplify/shorten text, LP: #578264
+    - speed up boot by having 00-header source /etc/lsb-release, if possible,
+      and only using lsb_release as a fall back, LP: #617410, #664492
+  * debian/postinst.in: ensure that /var/run/motd is populated on package
+    install/upgrade, LP: #614486
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 21 Oct 2010 08:43:01 -0500
+
+base-files (5.0.0ubuntu24) natty; urgency=low
+
+  * /etc/issue, /etc/issue.net, /etc/lsb-release: Welcome to Natty!
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 11 Oct 2010 15:35:43 +0100
+
+base-files (5.0.0ubuntu23) maverick; urgency=low
+
+  * Prepare for Maverick release: etc/{lsb-release,issue,issue.net}.
+
+ -- Thierry Carrez (ttx) <thierry.carrez@ubuntu.com>  Thu, 07 Oct 2010 09:47:59 +0100
+
+base-files (5.0.0ubuntu22) maverick; urgency=low
+
+  * debian/postinst.in: A bug in the build process for the Dell Latitude 2110
+    factory pre-installed OEM images caused a temporary apt configuration file
+    to be left in the installed system. This disabled apt's enforcement of
+    authenticated packages. Remove the file on upgrades if it matches the
+    factory version. (LP: #610647)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Wed, 28 Jul 2010 18:46:45 +0200
+
+base-files (5.0.0ubuntu21) maverick; urgency=low
+
+  * /etc/issue, /etc/issue.net, /etc/lsb-release: Welcome to Maverick!
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 04 May 2010 17:42:31 +0100
+
+base-files (5.0.0ubuntu20) lucid; urgency=low
+
+  * 00-header: use lsb_release -s -d so LTS is displayed LP: #568628
+
+ -- Brian Murray <brian@ubuntu.com>  Thu, 22 Apr 2010 12:12:29 -0700
+
+base-files (5.0.0ubuntu19) lucid; urgency=low
+
+  * Prepare for Lucid release: etc/{lsb-release,issue,issue.net}.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 20 Apr 2010 03:50:12 -0700
+
+base-files (5.0.0ubuntu18) lucid; urgency=low
+
+  * debian/postinst.in: clear release-upgrade flag, and update again
+    immediately on base-files upgrades, LP: #563015
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Wed, 14 Apr 2010 09:25:15 -0500
+
+base-files (5.0.0ubuntu17) lucid; urgency=low
+
+  * debian/rules, debian/postinst.in: second half of the fix for the
+    previous upload; drop symlink creation in debian/rules, LP: #561778
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Mon, 12 Apr 2010 18:23:39 -0500
+
+base-files (5.0.0ubuntu16) lucid; urgency=low
+
+  * debian/postinst.in: only create /etc/motd link on initial install;
+    thereafter, it's entirely up to the admin whether to keep this
+    link or modify it to their wishes, LP: #561778
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Mon, 12 Apr 2010 15:23:12 -0500
+
+base-files (5.0.0ubuntu15) lucid; urgency=low
+
+  * debian/links, debian/postinst.in, debian/rules:
+    remove artifacts of old base motd creation, keep duplicated data
+    from popping up in motd, LP: #516293
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Fri, 09 Apr 2010 14:23:01 -0500
+
+base-files (5.0.0ubuntu14) lucid; urgency=low
+
+  Fix double-printing of motd.tail, LP: #550561
+  * debian/postinst.in: motd.tail should no longer be generated by this
+    package; rather it's where the sysadmin would add static text to
+    append to the dynamically generated /etc/motd
+  * debian/update-motd.d/*, debian/rules:
+    - move update-motd scripts to this dir, clean up install rules
+      (scripts were getting installed in two places)
+    - 00-header: add the lsb_release information, which seems at least
+      as pertinent as the kernel's version and build-date
+    - 00-header, 99-footer: split the header (uname, lsb_release) and
+      the footer (admin's motd.tail) to two separate scripts
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Wed, 31 Mar 2010 14:56:49 -0500
+
+base-files (5.0.0ubuntu13) lucid; urgency=low
+
+  * debian/10-help-text: fix url, no https for server doc
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 25 Mar 2010 11:08:56 -0700
+
+base-files (5.0.0ubuntu12) lucid; urgency=low
+
+  * debian/10-help-text: line up the help text, make it more concise and
+    consistent with the other help-text update-motd insertions from other
+    packages
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 25 Mar 2010 11:06:52 -0700
+
+base-files (5.0.0ubuntu11) lucid; urgency=low
 
-  * Changed issue, issue.net and debian_version to read "6.0".
-  * Updated README accordingly.
+  * share/dot.bashrc: Sync with bash's skeleton bashrc, just don't
+    enable command completion by default.
+    - Uncomment useful aliases for ll, la, and l, to better match sysadmin's
+      expectations coming from other enterprise distros (Dustin Kirkland).
+      LP: #545262.
 
- -- Santiago Vila <sanvila@debian.org>  Tue, 14 Dec 2010 22:20:38 +0100
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 25 Mar 2010 14:19:44 +0100
 
-base-files (5.10) unstable; urgency=medium
+base-files (5.0.0ubuntu10) lucid; urgency=low
 
-  * Changed postinst to not reset /var/run/utmp permissions on every upgrade.
-    It is definitely not base-files business to change the permissions of
-    an already existing /var/run/utmp, as the system admin might have
-    changed them on purpose after the file was created. Closes: #601746.
+  * etc/00-header: handle non-zero exit if /etc/motd.tail does not exist,
+    LP: #492387
 
- -- Santiago Vila <sanvila@debian.org>  Sat, 13 Nov 2010 13:01:12 +0100
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Mon, 07 Dec 2009 17:05:18 -0600
 
-base-files (5.9) unstable; urgency=medium
+base-files (5.0.0ubuntu9) lucid; urgency=low
 
-  * Changed /etc/profile so that it defines PATH again. Closes: #571086.
-    We will have plenty of time to discuss about this after the release
-    of squeeze, but for now, this is the safe thing to do.
+  * etc/motd, etc/10-help-text, debian/rules: move the help text
+    out of the stock, static /etc/motd.tail, putting it into a
+    dynamic update-motd script, such that appropriate links can
+    be dynamically displayed, LP: #490392
+  * share/motd.md5sums: add karmic's motd.tail md5sum
 
- -- Santiago Vila <sanvila@debian.org>  Fri, 06 Aug 2010 19:37:40 +0200
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 01 Dec 2009 16:07:54 -0600
 
-base-files (5.8) unstable; urgency=low
+base-files (5.0.0ubuntu8) lucid; urgency=low
 
-  * Added GPL version 1 from http://ftp.gnu.org/gnu/Licenses/ as there
-    are a lot of packages still using it. Bug #436105.
+  * /etc/issue, /etc/issue.net, /etc/lsb-release: Welcome to Lucid!
 
- -- Santiago Vila <sanvila@debian.org>  Mon, 05 Jul 2010 19:10:54 +0200
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 30 Oct 2009 11:39:07 +0000
 
-base-files (5.7) unstable; urgency=low
+base-files (5.0.0ubuntu7) karmic; urgency=low
 
-  * Drop umask setting from /etc/profile, will be handled by pam_umask.
-    Closes: #583967.
+  * Prepare for Karmic release: etc/{lsb-release,issue,issue.net}.
 
- -- Santiago Vila <sanvila@debian.org>  Tue, 01 Jun 2010 23:57:52 +0200
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 19 Oct 2009 16:44:48 -0700
 
-base-files (5.6) unstable; urgency=low
+base-files (5.0.0ubuntu6) karmic; urgency=low
 
-  * Ordinary user accounts start at UID 1000 by default, but they also
-    end at 29999 by default. Modified default /etc/profile accordingly.
+  * etc/00-header, debian/directory-list, debian/rules: pam_motd will
+    now dynamically build a MOTD by running all scripts in
+    /etc/update-motd.d and concatenating the output; seed that MOTD
+    with the standard header, LP: #399071
 
- -- Santiago Vila <sanvila@debian.org>  Thu, 20 May 2010 11:34:34 +0200
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Mon, 13 Jul 2009 21:30:55 -0500
 
-base-files (5.5) unstable; urgency=low
+base-files (5.0.0ubuntu5) karmic; urgency=low
 
-  * Changed default /etc/profile so that the new umask of 002 is only
-    used for ordinary user accounts, which, according to policy, start
-    at uid 1000 by default.
+  * etc/legal.sh: dropped, as the display of /etc/legal is now
+    handled by update-motd
+  * etc/legal: keep this text here, though, as this seems to be
+    the most appropriate, maintainable place for it
 
- -- Santiago Vila <sanvila@debian.org>  Wed, 19 May 2010 18:57:10 +0200
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Mon, 13 Jul 2009 14:18:45 -0500
 
-base-files (5.4) unstable; urgency=low
+base-files (5.0.0ubuntu4) karmic; urgency=low
 
-  * Changed umask in default /etc/profile to 002, which has a little bit
-    more sense than 022 on systems like Debian having User Private Groups.
-    As usual for /etc/profile, only new installs will have the new default,
-    so nobody will be surprised by this on upgrades. Hopefully, this change
-    will be documented in the release notes for squeeze as well, for users
-    who install squeeze from scratch. Closes: #248140, #581434.
-  * Refresh GNU licenses from http://ftp.gnu.org/gnu/Licenses/, as they
-    have expanded the embedded tabs. Closes: #572245.
-  * Switch to "3.0 (native)" format.
+  * etc/legal.sh: per feedback from pitti, the flag was moved to
+    ~/.cache/motd/legal-displayed
 
- -- Santiago Vila <sanvila@debian.org>  Thu, 13 May 2010 18:35:42 +0200
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 09 Jul 2009 14:34:14 -0500
 
-base-files (5.3) unstable; urgency=low
+base-files (5.0.0ubuntu3) karmic; urgency=low
 
-  * Changed default /etc/profile so that it sources /etc/profile.d/*.sh
-    as mandated by the LSB section 16.2. Closes: #545756.
-    Package maintainers: Please don't use profile.d if you can avoid it,
-    as policy says "A program must not depend on environment variables
-    to get reasonable defaults".
-  * Removed questions about profile.d from FAQ.
+  * etc/motd, etc/legal.sh, debian/rules, share/motd.md5sums: pursuant to
+    consultation with Canonical's Legal Department, it is sufficient
+    to display the warranty disclaimer only once per user; move this
+    text out of the stock /etc/motd, and into an /etc/profile.d/legal.sh
+    script; display the text if a certain flag is not detected and touch
+    the flag file
 
- -- Santiago Vila <sanvila@debian.org>  Fri, 09 Apr 2010 18:07:20 +0200
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Wed, 08 Jul 2009 16:55:12 -0500
 
-base-files (5.2) unstable; urgency=low
+base-files (5.0.0ubuntu2) karmic; urgency=low
 
-  * Added question in FAQ to document the fact that some configuration
-    files in /etc are never updated on upgrades. Closes: #571083.
-  * Changed default /usr/src to be root:root and 755. Closes: #573701.
-    The old permissions were of little benefit, and the user can still
-    change this after installing a new system anyway.
-  * Renamed FAQ to README and added a compatibility symlink.
-  * Removed obsolete Depends on base-passwd, as version 2.0.3.4 is more
-    than 10 years old and we don't support upgrades which skip releases.
-  * Dropped preinst completely, as it was there just to support upgrades
-    from very old releases (that we don't support anymore).
-  * Removed postinst code that supports upgrades from very old releases.
+  * Add "Parent: Debian" to /etc/dpkg/origins/ubuntu, which will be useful
+    with the dpkg-vendor program in dpkg 1.15.1.
 
- -- Santiago Vila <sanvila@debian.org>  Sun, 04 Apr 2010 13:22:04 +0200
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 11 May 2009 16:32:12 +0100
 
-base-files (5.1) unstable; urgency=low
+base-files (5.0.0ubuntu1) karmic; urgency=low
 
-  * Changed default permissions for /root to 700, as many admins consider
-    it should be more private than other home directories. Closes: #514794.
-  * Changed default permissions for /var/log/btmp to 660, to be in sync
-    with permissions set by logrotate. Closes: #547407.
-  * Do not export PS1 in /root/.bashrc, as it has bash escapes and it's
-    inherited to subshells that do not have to be bash. Closes: #567733.
-  * Added debian_chroot variable to default PS1 in /root/.bashrc.
-  * Comment out PS1 in /root/.bashrc anyway, as /etc/profile and
-    /etc/bash.bashrc already care about it. Closes: #443245.
-  * Comment out umask as well, as it's already in /etc/profile.
-  * Added /usr/local/games to default PATH in /etc/profile. Closes: #487105.
-  * While we are at it, comment out everything about PATH, as /etc/login.defs
-    should already care about this.
-  * Changed default /etc/profile so that it sources /etc/bash.bashrc
-    if the shell is bash. Closes: #275622.
-  * Drop \u part from default PS1 in /etc/profile, as it's only useful
-    for people with several non-root accounts. Most people are either root
-    or an ordinary user, so $ and # are enough to differentiate between them.
-  * Comment out PS1 setting in /etc/profile anyway, as we have bash.bashrc.
+  * Resynchronise with Debian. Remaining changes:
+    - Branding changes.
+    - Add /etc/lsb-release file.
+    - Add lsb-release-udeb package.
+    - Record md5sums of unmodified /etc/profile versions so that we can
+      upgrade it automatically.
+    - Various bashrc extensions.
+    - Restore order line in /etc/host.conf with a comment.
+    - Add default /etc/networks file.
+    - Implement LSB-3.1, 16.2 (/etc/profile.d).
+    - Added information about the docs web page.
+    - Update the motd upgrade handling to know about /etc/motd.tail.
+    - Do not install /usr/local dirs with staff group writeability, as there
+      are cases where somebody can become any user but root (like NFS).
+    - Change permissions of kernels copied from the Live CD by Ubiquity
+      1.9.4 thru 1.10.9.
+    - Correct group ownership of files changed by Ubiquity 1.7.5 thru
+      1.10.9.
+    - Ship /root mode 700 by default.
+  * Add /etc/dpkg/origins/ubuntu, and point the default symlink to that.
 
- -- Santiago Vila <sanvila@debian.org>  Sun, 31 Jan 2010 13:16:14 +0100
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 27 Apr 2009 10:57:55 +0100
 
 base-files (5.0.0) unstable; urgency=low
 
@@ -619,6 +1847,32 @@ base-files (5.0.0) unstable; urgency=low
 
  -- Santiago Vila <sanvila@debian.org>  Fri, 24 Apr 2009 21:02:42 +0200
 
+base-files (5.0ubuntu1) karmic; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    - Branding changes.
+    - Add /etc/lsb-release file.
+    - Add lsb-release-udeb package.
+    - Record md5sums of unmodified /etc/profile versions so that we can
+      upgrade it automatically.
+    - Various bashrc extensions.
+    - Restore order line in /etc/host.conf with a comment.
+    - Add default /etc/networks file.
+    - Implement LSB-3.1, 16.2 (/etc/profile.d).
+    - Added information about the docs web page.
+    - Update the motd upgrade handling to know about /etc/motd.tail.
+    - Do not install /usr/local dirs with staff group writeability, as there
+      are cases where somebody can become any user but root (like NFS).
+    - Change permissions of kernels copied from the Live CD by Ubiquity
+      1.9.4 thru 1.10.9.
+    - Correct group ownership of files changed by Ubiquity 1.7.5 thru
+      1.10.9.
+    - Ship /root mode 700 by default.
+    - Drop seeding of /etc/adjtime.
+  * /etc/issue, /etc/issue.net, /etc/lsb-release: Welcome to Karmic!
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 24 Apr 2009 13:48:26 +0100
+
 base-files (5.0) unstable; urgency=medium
 
   * Changed issue, issue.net and debian_version to read "squeeze/sid".
@@ -629,6 +1883,50 @@ base-files (5.0) unstable; urgency=mediu
 
  -- Santiago Vila <sanvila@debian.org>  Thu, 26 Feb 2009 17:09:38 +0100
 
+base-files (5ubuntu4) jaunty; urgency=low
+
+  * Prepare for Jaunty release: etc/{lsb-release,issue,issue.net}.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 13 Apr 2009 09:26:01 +0000
+
+base-files (5ubuntu3) jaunty; urgency=low
+
+  [ Scott James Remnant ]
+  * debian/postinst: Drop seeding of /etc/adjtime after discussion with
+    the Debian maintainer.
+
+ -- Scott James Remnant <scott@ubuntu.com>  Thu, 05 Mar 2009 17:34:15 +0000
+
+base-files (5ubuntu2) jaunty; urgency=low
+
+  * debian/{700-dirs,rules}: ship /root mode 700 by default (debian
+    bug 514794).
+
+ -- Kees Cook <kees@ubuntu.com>  Tue, 10 Feb 2009 13:55:51 -0800
+
+base-files (5ubuntu1) jaunty; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    - Branding changes.
+    - Add /etc/lsb-release file.
+    - Add lsb-release-udeb package.
+    - Record md5sums of unmodified /etc/profile versions so that we can
+      upgrade it automatically.
+    - Various bashrc extensions.
+    - Restore order line in /etc/host.conf with a comment.
+    - Add default /etc/networks file.
+    - Implement LSB-3.1, 16.2 (/etc/profile.d).
+    - Added information about the docs web page.
+    - Update the motd upgrade handling to know about /etc/motd.tail.
+    - Do not install /usr/local dirs with staff group writeability, as there
+      are cases where somebody can become any user but root (like NFS).
+    - Change permissions of kernels copied from the Live CD by Ubiquity
+      1.9.4 thru 1.10.9.
+    - Correct group ownership of files changed by Ubiquity 1.7.5 thru
+      1.10.9.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 23 Dec 2008 18:55:10 +0000
+
 base-files (5) unstable; urgency=low
 
   * Changed issue, issue.net and debian_version to read "5.0".
@@ -637,6 +1935,29 @@ base-files (5) unstable; urgency=low
 
  -- Santiago Vila <sanvila@debian.org>  Thu, 04 Dec 2008 10:04:04 +0100
 
+base-files (4.0.6ubuntu1) jaunty; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    - Branding changes.
+    - Add /etc/lsb-release file.
+    - Add lsb-release-udeb package.
+    - Record md5sums of unmodified /etc/profile versions so that we can
+      upgrade it automatically.
+    - Various bashrc extensions.
+    - Restore order line in /etc/host.conf with a comment.
+    - Add default /etc/networks file.
+    - Implement LSB-3.1, 16.2 (/etc/profile.d).
+    - Added information about the docs web page.
+    - Update the motd upgrade handling to know about /etc/motd.tail.
+    - Do not install /usr/local dirs with staff group writeability, as there
+      are cases where somebody can become any user but root (like NFS).
+    - Change permissions of kernels copied from the Live CD by Ubiquity
+      1.9.4 thru 1.10.9.
+    - Correct group ownership of files changed by Ubiquity 1.7.5 thru
+      1.10.9.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 10 Nov 2008 12:00:09 +0000
+
 base-files (4.0.6) unstable; urgency=low
 
   * Changed the way wtmp, btmp and lastlog are handled. They are no longer
@@ -648,6 +1969,36 @@ base-files (4.0.6) unstable; urgency=low
 
  -- Santiago Vila <sanvila@debian.org>  Tue, 04 Nov 2008 20:34:12 +0100
 
+base-files (4.0.5ubuntu2) jaunty; urgency=low
+
+  * Correct copy-and-paste mistake in previous changelog.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 31 Oct 2008 13:30:43 +0000
+
+base-files (4.0.5ubuntu1) jaunty; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    - Branding changes.
+    - Add /etc/lsb-release file.
+    - Add lsb-release-udeb package.
+    - Record md5sums of unmodified /etc/profile versions so that we can
+      upgrade it automatically.
+    - Various bashrc extensions.
+    - Restore order line in /etc/host.conf with a comment.
+    - Add default /etc/networks file.
+    - Implement LSB-3.1, 16.2 (/etc/profile.d).
+    - Added information about the docs web page.
+    - Update the motd upgrade handling to know about /etc/motd.tail.
+    - Do not install /usr/local dirs with staff group writeability, as there
+      are cases where somebody can become any user but root (like NFS).
+    - Change permissions of kernels copied from the Live CD by Ubiquity
+      1.9.4 thru 1.10.9.
+    - Correct group ownership of files changed by Ubiquity 1.7.5 thru
+      1.10.9.
+  * /etc/issue, /etc/issue.net, /etc/lsb-release: Welcome to Jaunty!
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 31 Oct 2008 13:17:58 +0000
+
 base-files (4.0.5) unstable; urgency=low
 
   * Changed awk from Depends to Pre-Depends. Closes: #314571, #469552.
@@ -662,6 +2013,51 @@ base-files (4.0.5) unstable; urgency=low
 
  -- Santiago Vila <sanvila@debian.org>  Tue,  5 Aug 2008 18:06:06 +0200
 
+base-files (4.0.4ubuntu2.2) intrepid-security; urgency=low
+
+  * Ubiquity cleanup: do not fail on missing symlink targets.
+
+ -- Kees Cook <kees@ubuntu.com>  Thu, 30 Oct 2008 10:55:33 -0700
+
+base-files (4.0.4ubuntu2.1) intrepid-security; urgency=low
+
+  * SECURITY UPDATE: change permissions of kernels copied from the Live CD
+    by Ubiquity 1.9.4 thru 1.10.9. LP: #290798.
+
+  * Correct group ownership of files changed by Ubiquity 1.7.5 thru 1.10.9.
+    LP: #288479.
+
+ -- Scott James Remnant <scott@ubuntu.com>  Wed, 29 Oct 2008 20:50:56 +0000
+
+base-files (4.0.4ubuntu2) intrepid; urgency=low
+
+  * Prepare for Intrepid release: etc/{lsb-release,issue,issue.net}.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 20 Oct 2008 12:07:29 +0000
+
+base-files (4.0.4ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable (LP: #247082), remaining changes:
+    - Branding changes
+    - Add /etc/lsb-release file
+    - Add lsb-release-udeb package
+    - Record md5sums of unmodified /etc/profile versions so that we can
+      upgrade it automatically
+    - Various bashrc extensions
+    - Restore order line in /etc/host.conf with a comment
+    - Add default /etc/networks file
+    - Implement LSB-3.1, 16.2 (/etc/profile.d)
+    - Added information about the docs web page
+    - Update the motd upgrade handling to know about /etc/motd.tail
+    - Do not install /usr/local dirs with staff group writeability, as there
+      are cases where somebody can become any user but root (like NFS)
+  * Dropped changes (transitional code):
+    - Add default /etc/networks file on upgrade
+    - Fix 4.0.1ubuntu3 motd upgrade
+    - On amd64, depend on a libc6 that ships /lib64 to avoid broken upgrades
+
+ -- Thierry Carrez <thierry.carrez@ubuntu.com>  Fri, 08 Aug 2008 10:02:16 +0200
+
 base-files (4.0.4) unstable; urgency=low
 
   * Added Apache-2.0 to common-licenses. Closes: #471736.
@@ -684,6 +2080,62 @@ base-files (4.0.2) unstable; urgency=low
 
  -- Santiago Vila <sanvila@debian.org>  Mon, 19 Nov 2007 19:04:10 +0100
 
+base-files (4.0.1ubuntu6) intrepid; urgency=low
+
+  * Update for Intrepid: etc/{lsb-release,issue,issue.net}
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Mon, 28 Apr 2008 12:24:54 -0600
+
+base-files (4.0.1ubuntu5) hardy; urgency=low
+
+  * Prepare for Hardy release: etc/{lsb-release,issue,issue.net}.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 15 Apr 2008 05:05:24 +0000
+
+base-files (4.0.1ubuntu4) hardy; urgency=low
+
+  * Update the motd upgrade handling to know about /etc/motd.tail, which
+    is where the static contents of the motd are stored now with
+    initscripts 2.86.ds1-7 and above; and handle fixing the broken 
+    upgrades introduced in 4.0.1ubuntu3.  LP: #214853
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 10 Apr 2008 00:02:43 +0000
+
+base-files (4.0.1ubuntu3) hardy; urgency=low
+
+  * Added information about the docs web page (LP: #159371)
+
+ -- Nicolas Valcarcel <nvalcarcel@ubuntu.com>  Thu, 03 Apr 2008 00:13:05 -0500
+
+base-files (4.0.1ubuntu2) hardy; urgency=low
+
+  * Implement LSB-3.1, 16.2 (/etc/profile.d). Addresses LP #102105.
+    According to Debian policy 9.9 (Environment variables), programs
+    installed by packages must not depend on environment variables
+    to get reasonable defaults. Do not use this LSB feature to set
+    or modify environment variables.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 06 Feb 2008 15:27:17 +0100
+
+base-files (4.0.1ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable.
+  * Remaining Ubuntu changes:
+    - Branding changes.
+    - Add /etc/lsb-release file.
+    - Add lsb-release-udeb package.
+    - Record md5sums of unmodified /etc/profile versions so that we can
+      upgrade it automatically.
+    - Various bashrc extensions.
+    - Restore order line in /etc/host.conf with a comment.
+    - Add default /etc/networks file.
+  * Ubuntu changes dropped:
+    - Added version 3 of the LGPL license, taken from
+      http://www.gnu.org/licenses/lgpl-3.0.txt
+  * ubuntu-devel -> ubuntu-devel-discuss for the Maintainer field.
+
+ -- Steve Kowalik <stevenk@ubuntu.com>  Mon, 29 Oct 2007 07:31:52 +1100
+
 base-files (4.0.1) unstable; urgency=low
 
   * Added GPL-3 and LGPL-3 to common-licenses, as they are expected to
@@ -694,6 +2146,54 @@ base-files (4.0.1) unstable; urgency=low
 
  -- Santiago Vila <sanvila@debian.org>  Sun, 19 Aug 2007 19:15:30 +0200
 
+base-files (4.0.0ubuntu6) hardy; urgency=low
+
+  * Update for Hardy: etc/{lsb-release,issue,issue.net}.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 19 Oct 2007 19:24:18 +0000
+
+base-files (4.0.0ubuntu5) gutsy; urgency=low
+
+  * Prepare for Gutsy release: etc/{lsb-release,issue,issue.net}.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Mon, 08 Oct 2007 11:21:08 +0200
+
+base-files (4.0.0ubuntu4) gutsy; urgency=low
+
+  * Trigger rebuild for hppa.
+
+ -- LaMont Jones <lamont@ubuntu.com>  Fri, 28 Sep 2007 10:22:50 -0600
+
+base-files (4.0.0ubuntu3) gutsy; urgency=low
+
+  * Added version 3 of the LGPL license, taken from
+    http://www.gnu.org/licenses/lgpl-3.0.txt
+    (LP: #126565)
+
+ -- Mario Limonciello <superm1@ubuntu.com>  Tue, 17 Jul 2007 09:52:08 -0500
+
+base-files (4.0.0ubuntu2) gutsy; urgency=low
+
+  * Added version 3 of the GPL license, taken from
+    http://www.gnu.org/licenses/gpl-3.0.txt (Siegfried-Angel Gevatter Pujals).
+    Closes: LP #123139.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 03 Jul 2007 17:25:11 +0200
+
+base-files (4.0.0ubuntu1) gutsy; urgency=low
+
+  * Resynchronise with Debian (LP: #27924). Remaining changes:
+    - Branding changes.
+    - Add /etc/lsb-release file.
+    - Add lsb-release-udeb package.
+    - Record md5sums of unmodified /etc/profile versions so that we can
+      upgrade it automatically.
+    - Various bashrc extensions.
+    - Restore order line in /etc/host.conf with a comment.
+    - Add default /etc/networks file.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 15 May 2007 17:10:18 +0100
+
 base-files (4.0.0) unstable; urgency=low
 
   * Added GFDL-1.2 from ftp://ftp.gnu.org/gnu/Licenses/COPYING.DOC-1.2
@@ -701,6 +2201,21 @@ base-files (4.0.0) unstable; urgency=low
 
  -- Santiago Vila <sanvila@debian.org>  Tue, 24 Apr 2007 09:39:36 +0200
 
+base-files (4.0ubuntu1) gutsy; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    - Branding changes.
+    - Add /etc/lsb-release file.
+    - Add lsb-release-udeb package.
+    - Record md5sums of unmodified /etc/profile versions so that we can
+      upgrade it automatically.
+    - Various bashrc extensions.
+    - Restore order line in /etc/host.conf with a comment.
+    - Add default /etc/networks file.
+  * /etc/issue, /etc/issue.net, /etc/lsb-release: Welcome to Gutsy!
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 20 Apr 2007 15:03:56 +0100
+
 base-files (4.0) unstable; urgency=low
 
   * Changed issue, issue.net and debian_version to read "lenny/sid".
@@ -708,6 +2223,27 @@ base-files (4.0) unstable; urgency=low
 
  -- Santiago Vila <sanvila@debian.org>  Tue,  3 Apr 2007 11:45:30 +0200
 
+base-files (4ubuntu2) feisty; urgency=low
+
+  * Feisty is about to release, so change codenames to version numbers in
+    /etc/issue{,.net} and the lsb_release output.
+
+ -- Tollef Fog Heen <tfheen@ubuntu.com>  Thu, 12 Apr 2007 08:04:33 +0200
+
+base-files (4ubuntu1) feisty; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    - Branding changes.
+    - Add /etc/lsb-release file.
+    - Add lsb-release-udeb package.
+    - Record md5sums of unmodified /etc/profile versions so that we can
+      upgrade it automatically.
+    - Various bashrc extensions.
+    - Restore order line in /etc/host.conf with a comment.
+    - Add default /etc/networks file.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 20 Dec 2006 15:54:41 +0000
+
 base-files (4) unstable; urgency=low
 
   * Changed issue, issue.net and debian_version to read "4.0".
@@ -716,6 +2252,26 @@ base-files (4) unstable; urgency=low
 
  -- Santiago Vila <sanvila@debian.org>  Sat, 28 Oct 2006 15:44:00 +0200
 
+base-files (3.1.16ubuntu2) feisty; urgency=low
+
+  * Add share/networks: Default networks file with a small explanation and
+    'link-local 169.254.0.0'. (See https://wiki.ubuntu.com/ZeroConfNetworking
+    spec).
+  * debian/postinst: Install that file as /etc/networks if it does not exist
+    yet, on both new installations and upgrades.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Mon, 27 Nov 2006 12:56:59 +0100
+
+base-files (3.1.16ubuntu1) feisty; urgency=low
+
+  * Resynchronise with Debian.
+  * /etc/issue, /etc/issue.net, /etc/lsb-release: Welcome to Feisty!
+  * /etc/host.conf: Restore order line with a comment that it is not used by
+    current libc, since removing it breaks old statically linked binaries
+    (see Debian bug #354115).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 27 Oct 2006 11:04:47 +0100
+
 base-files (3.1.16) unstable; urgency=low
 
   * Changed comment in default /etc/nsswitch.conf so that it refers to
@@ -740,6 +2296,25 @@ base-files (3.1.14) unstable; urgency=lo
 
  -- Santiago Vila <sanvila@debian.org>  Mon,  7 Aug 2006 19:21:54 +0200
 
+base-files (3.1.13ubuntu2) edgy; urgency=low
+
+  * /etc/lsb-release, /etc/issue, /etc/issue.net: Ubuntu 6.10.
+
+ -- Tollef Fog Heen <tfheen@ubuntu.com>  Thu, 19 Oct 2006 10:16:59 +0200
+
+base-files (3.1.13ubuntu1) edgy; urgency=low
+
+  * Merge from debian unstable; remaining changes:
+    - branding changes,
+    - /etc/lsb-release file,
+    - lsb-release-udeb package,
+    - profile md5sum checking,
+    - extended bashrc.
+
+  * Fix missing space from share/profile so the md5sum matches.
+
+ -- Scott James Remnant <scott@ubuntu.com>  Mon,  3 Jul 2006 17:17:41 +0100
+
 base-files (3.1.13) unstable; urgency=low
 
   * Updated LGPL-2 from ftp://ftp.gnu.org/gnu/Licenses (Closes: #332390).
@@ -768,6 +2343,78 @@ base-files (3.1.10) unstable; urgency=me
 
  -- Santiago Vila <sanvila@debian.org>  Thu,  9 Feb 2006 18:41:22 +0100
 
+base-files (3.1.9ubuntu9) edgy; urgency=low
+
+  * And due to the changes in the last upload, we need to depend on a
+    libc6 new enough that we get /lib64 created BEFORE we remove our
+    copy, so dpkg doesn't suddenly stop working, mid-unpack.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Thu,  8 Jun 2006 23:31:35 +1000
+
+base-files (3.1.9ubuntu8) edgy; urgency=low
+
+  * /etc/{lsb-release,issue,issue.net}: Welcome to edgy!
+  * Stop shipping /usr/lib64 and /lib64 symlinks, moved to libc6.
+  * Drop /usr/X11R6/lib64 as a final step toward X11R7 nirvana.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Thu,  8 Jun 2006 19:34:02 +1000
+
+base-files (3.1.9ubuntu7) dapper; urgency=low
+
+  * /etc/lsb-release: Revert DISTRIB_RELEASE to 6.06; code relies on this
+    and it's too late to change it.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 22 May 2006 09:44:40 +0100
+
+base-files (3.1.9ubuntu6) dapper; urgency=low
+
+  * /etc/lsb-release, /etc/issue, /etc/issue.net: s/6.06LTS/6.06 LTS/ for
+    everything except the LSB DISTRIB_RELEASE, which is a version number.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Mon, 22 May 2006 09:24:28 +1000
+
+base-files (3.1.9ubuntu5) dapper; urgency=low
+
+  * /etc/lsb-release, /etc/issue, /etc/issue.net: Ubuntu 6.06LTS
+
+ -- Matt Zimmerman <mdz@ubuntu.com>  Sun, 21 May 2006 10:54:36 -0700
+
+base-files (3.1.9ubuntu4) dapper; urgency=low
+
+  * /etc/lsb-release, /etc/issue, /etc/issue.net: Change Dapper version
+    number to 6.06 (closes: Malone #36820).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 27 Mar 2006 10:17:18 +0100
+
+base-files (3.1.9ubuntu3) dapper; urgency=low
+
+  * Implement OneTruePathSpec:
+  * share/profile: Remove PATH setting.
+  * debian/control: Add dependency libpam-modules (>= 0.79-3ubuntu3) so that
+    the user does not end up without any $PATH at all.
+  * Add share/profile.md5sums: Record the md5sums of unmodified /etc/profile
+    of warty, hoary, breezy, current dapper, and this new version for dapper.
+  * debian/postinst: If /etc/profile matches one of the recorded md5sums,
+    replace it with the current version on upgrades.
+  * debian/rules, clean rule: Automatically update share/profile.md5sums with
+    the current md5sum of share/profile.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Wed, 18 Jan 2006 11:32:32 +0100
+
+base-files (3.1.9ubuntu2) dapper; urgency=low
+
+  * Supply /etc/lsb-release and lsb-release-udeb, moved from the lsb-release
+    package.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed,  9 Nov 2005 15:43:25 -0500
+
+base-files (3.1.9ubuntu1) dapper; urgency=low
+
+  * Resynchronise with Debian.
+  * /etc/issue, /etc/issue.net: Welcome to Dapper!
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 25 Oct 2005 11:49:43 +0100
+
 base-files (3.1.9) unstable; urgency=low
 
   * The file /etc/inputrc is now handled by readline-common.
@@ -798,6 +2445,31 @@ base-files (3.1.6) unstable; urgency=low
 
  -- Santiago Vila <sanvila@debian.org>  Tue, 12 Jul 2005 17:29:48 +0200
 
+base-files (3.1.5ubuntu4) breezy; urgency=low
+
+  * Breezy's about to release, so drop "Development Branch" from /etc/issue
+    and /etc/issue.net.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed,  5 Oct 2005 10:08:47 +0100
+
+base-files (3.1.5ubuntu3) breezy; urgency=low
+
+  * inputrc: Remove trailing whitespace.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 12 Sep 2005 12:20:50 +0000
+
+base-files (3.1.5ubuntu2) breezy; urgency=low
+
+  * /root/.bashrc: sync with bash skeleton file.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon,  5 Sep 2005 18:30:12 +0200
+
+base-files (3.1.5ubuntu1) breezy; urgency=low
+
+  * Resynchronise with Debian.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 19 Jul 2005 18:51:32 +0100
+
 base-files (3.1.5) unstable; urgency=medium
 
   * Updated GPL-2 and LGPL-2.1 from ftp://ftp.gnu.org/gnu/Licenses again.
@@ -821,6 +2493,13 @@ base-files (3.1.3) unstable; urgency=low
 
  -- Santiago Vila <sanvila@debian.org>  Mon,  6 Jun 2005 19:32:20 +0200
 
+base-files (3.1.2ubuntu1) breezy; urgency=low
+
+  * Resynchronise with Debian.
+  * /etc/issue, /etc/issue.net: Welcome to Breezy!
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 14 Apr 2005 09:45:02 +0100
+
 base-files (3.1.2) unstable; urgency=low
 
   * Changed example line in default /root/.bashrc from eval `dircolors` to
@@ -837,6 +2516,30 @@ base-files (3.1.1) unstable; urgency=low
 
  -- Santiago Vila <sanvila@debian.org>  Tue, 14 Dec 2004 19:06:00 +0100
 
+base-files (3.1.0ubuntu3) hoary; urgency=low
+
+  * Hoary's about to release, so drop "Development Branch" from /etc/issue
+    and /etc/issue.net.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 31 Mar 2005 19:27:50 +0100
+
+base-files (3.1.0ubuntu2) hoary; urgency=low
+
+  * debian/postinst: Do not install /usr/local and subdirectories with "staff"
+    group writeability. This group is essentially root-equivalent, but there
+    are cases where somebody can become any user but root (like NFS).
+  * debian/rules: Do not install /home as root:staff, it makes no sense.
+  * debian/2775-dirs: Remove "home".
+  * Ubuntu bug #7449
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Fri, 11 Mar 2005 11:30:07 +0100
+
+base-files (3.1.0ubuntu1) hoary; urgency=low
+
+  * Resynchronise with Debian.
+
+ -- Colin Watson <cjwatson@canonical.com>  Wed, 17 Nov 2004 12:35:43 +0000
+
 base-files (3.1.0) unstable; urgency=low
 
   * Moved PATH definition for root from the default /root/.profile to the
@@ -847,12 +2550,64 @@ base-files (3.1.0) unstable; urgency=low
 
  -- Santiago Vila <sanvila@debian.org>  Wed, 10 Nov 2004 17:32:00 +0100
 
+base-files (3.1ubuntu2) hoary; urgency=low
+
+  * /etc/inputrc: Enable some key bindings by default (closes: #2525).
+
+ -- Matthias Klose <m@klose.in-berlin.de>  Wed, 17 Nov 2004 00:46:24 +0000
+
+base-files (3.1ubuntu1) hoary; urgency=low
+
+  * Resynchronise with Debian.
+  * /etc/issue, /etc/issue.net: Welcome to Hoary!
+
+ -- Colin Watson <cjwatson@canonical.com>  Fri, 29 Oct 2004 15:38:49 +0100
+
 base-files (3.1) unstable; urgency=high
 
   * Changed issue, issue.net and debian_version to read "3.1".
 
  -- Santiago Vila <sanvila@debian.org>  Mon, 26 Jul 2004 20:25:32 +0200
 
+base-files (3.0.16ubuntu6) warty; urgency=low
+
+  * /etc/profile: source /etc/bash.bashrc for the bash case.
+  * /root/.profile: only source /root/.bashrc for the bash case.
+  * /root/.bashrc, /root/.profile, /etc/bash.bashrc: sync with bash
+    skeleton files.
+
+ -- Matthias Klose <m@klose.in-berlin.de>  Tue, 21 Sep 2004 18:51:00 +0200
+
+base-files (3.0.16ubuntu5) warty; urgency=low
+
+  * etc/profile: Add sbin directories to default PATH
+
+ -- Matt Zimmerman <mdz@canonical.com>  Wed,  8 Sep 2004 19:04:58 -0700
+
+base-files (3.0.16ubuntu4) warty; urgency=low
+
+  * share/dot.bashrc: color ls and (optional) color prompt for root
+
+ -- Nathaniel McCallum <npmccallum@gentoo.org>  Tue, 24 Aug 2004 09:49:29 -0400
+
+base-files (3.0.16ubuntu3) warty; urgency=low
+
+  * etc/motd, etc/issue, etc/issue.net, share/info.dir: Ubuntu branding.
+
+ -- Colin Watson <cjwatson@flatline.org.uk>  Mon, 23 Aug 2004 23:50:03 +0100
+
+base-files (3.0.16ubuntu2) warty; urgency=low
+
+  * Only deliver said links on amd64.
+
+ -- LaMont Jones <lamont@mmjgroup.com>  Tue, 13 Jul 2004 22:53:11 +0000
+
+base-files (3.0.16ubuntu1) unstable; urgency=low
+
+  * Added lib64 symlinks for the amd64.  From debian-amd64.
+
+ -- LaMont Jones <lamont@mmjgroup.com>  Tue, 13 Jul 2004 21:31:10 +0100
+
 base-files (3.0.16) unstable; urgency=low
 
   * Changed -a to && in postinst (Closes #254781).
@@ -1527,3 +3282,4 @@ base-files (1.2.0-1) unstable; urgency=l
     /etc/passwd and /etc/group are installed by the "base-passwd" package.
 
  -- Bruce Perens <bruce@pixar.com>  Thu, 14 Nov 1996 21:02:09 -0800
+
diff -pruN 12.3/debian/clean 12.3ubuntu1/debian/clean
--- 12.3/debian/clean	2019-07-09 09:00:00.000000000 +0000
+++ 12.3ubuntu1/debian/clean	2022-10-17 14:42:59.000000000 +0000
@@ -1,2 +1,3 @@
 debian/postinst
 debian/copyright
+locale-check
diff -pruN 12.3/debian/control 12.3ubuntu1/debian/control
--- 12.3/debian/control	2021-04-10 20:15:00.000000000 +0000
+++ 12.3ubuntu1/debian/control	2022-10-17 14:42:58.000000000 +0000
@@ -1,7 +1,8 @@
 Source: base-files
 Section: admin
 Priority: required
-Maintainer: Santiago Vila <sanvila@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Santiago Vila <sanvila@debian.org>
 Standards-Version: 4.1.3
 Build-Depends: debhelper-compat (= 13)
 
@@ -9,14 +10,27 @@ Package: base-files
 Provides: base
 Architecture: any
 Pre-Depends: awk
-Depends: ${misc:Depends}
+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.453)
 Multi-Arch: foreign
 Description: Debian base system miscellaneous files
  This package contains the basic filesystem hierarchy of a Debian system, and
  several important miscellaneous files, such as /etc/debian_version,
  /etc/host.conf, /etc/issue, /etc/motd, /etc/profile, and others,
  and the text of several common licenses in use on Debian systems.
+
+Package: motd-news-config
+Architecture: all
+Priority: optional
+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
+ shipped in the base-files package.
+ .
+ Install this package if you want motd-news to be enabled.
diff -pruN 12.3/debian/lsb-release-udeb.install 12.3ubuntu1/debian/lsb-release-udeb.install
--- 12.3/debian/lsb-release-udeb.install	1970-01-01 00:00:00.000000000 +0000
+++ 12.3ubuntu1/debian/lsb-release-udeb.install	2022-04-22 14:26:13.000000000 +0000
@@ -0,0 +1 @@
+etc/lsb-release
diff -pruN 12.3/debian/motd-news 12.3ubuntu1/debian/motd-news
--- 12.3/debian/motd-news	1970-01-01 00:00:00.000000000 +0000
+++ 12.3ubuntu1/debian/motd-news	2022-04-22 14:26:13.000000000 +0000
@@ -0,0 +1,19 @@
+# Enable/disable the dynamic MOTD news service
+# This is a useful way to provide dynamic, informative
+# information pertinent to the users and administrators
+# of the local system
+ENABLED=1
+
+# Configure the source of dynamic MOTD news
+# White space separated list of 0 to many news services
+# For security reasons, these must be https
+# and have a valid certificate
+# Canonical runs a service at motd.ubuntu.com, and you
+# can easily run one too
+URLS="https://motd.ubuntu.com"
+
+# Specify the time in seconds, you're willing to wait for
+# dynamic MOTD news
+# Note that news messages are fetched in the background by
+# a systemd timer, so this should never block boot or login
+WAIT=5
diff -pruN 12.3/debian/motd-news-config.install 12.3ubuntu1/debian/motd-news-config.install
--- 12.3/debian/motd-news-config.install	1970-01-01 00:00:00.000000000 +0000
+++ 12.3ubuntu1/debian/motd-news-config.install	2022-04-22 14:29:15.000000000 +0000
@@ -0,0 +1 @@
+debian/motd-news etc/default
diff -pruN 12.3/debian/motd-news-config.lintian-overrides 12.3ubuntu1/debian/motd-news-config.lintian-overrides
--- 12.3/debian/motd-news-config.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ 12.3ubuntu1/debian/motd-news-config.lintian-overrides	2022-04-22 14:29:15.000000000 +0000
@@ -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 -pruN 12.3/debian/motd-news-config.postinst 12.3ubuntu1/debian/motd-news-config.postinst
--- 12.3/debian/motd-news-config.postinst	1970-01-01 00:00:00.000000000 +0000
+++ 12.3ubuntu1/debian/motd-news-config.postinst	2022-04-22 14:29:15.000000000 +0000
@@ -0,0 +1,55 @@
+#!/bin/sh
+# postinst script for motd-news-config
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see https://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    configure)
+      # only run on new installs, $2 will be empty then
+      if [ -z "$2" ]; then
+          # /e/d/motd-news was moved from pkg:base-files to this package.
+          # base-files runs rm_conffile which, if it was modified, leaves
+          # /e/d/motd-news.dpkg-bak around. We want to preserve that *changed*
+          # config file in this migration, and this is something that
+          # rm_conffile is not handling.  In that case, let's put the backup
+          # file back in place
+          if [ -e /etc/default/motd-news.dpkg-bak ]; then
+              mv /etc/default/motd-news.dpkg-bak /etc/default/motd-news
+          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
+          fi
+      fi
+      rm -f /etc/default/motd-news.wasremoved
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff -pruN 12.3/debian/motd-news.service 12.3ubuntu1/debian/motd-news.service
--- 12.3/debian/motd-news.service	1970-01-01 00:00:00.000000000 +0000
+++ 12.3ubuntu1/debian/motd-news.service	2022-04-22 14:26:13.000000000 +0000
@@ -0,0 +1,8 @@
+[Unit]
+Description=Message of the Day
+After=network-online.target
+Documentation=man:update-motd(8)
+
+[Service]
+Type=oneshot
+ExecStart=/etc/update-motd.d/50-motd-news --force
diff -pruN 12.3/debian/motd-news.timer 12.3ubuntu1/debian/motd-news.timer
--- 12.3/debian/motd-news.timer	1970-01-01 00:00:00.000000000 +0000
+++ 12.3ubuntu1/debian/motd-news.timer	2022-04-22 14:26:13.000000000 +0000
@@ -0,0 +1,11 @@
+[Unit]
+Description=Message of the Day
+
+[Timer]
+OnCalendar=00,12:00:00
+RandomizedDelaySec=12h
+Persistent=true
+OnStartupSec=1min
+
+[Install]
+WantedBy=timers.target
diff -pruN 12.3/debian/postinst.in 12.3ubuntu1/debian/postinst.in
--- 12.3/debian/postinst.in	2022-01-19 22:34:00.000000000 +0000
+++ 12.3ubuntu1/debian/postinst.in	2022-10-17 14:42:59.000000000 +0000
@@ -13,10 +13,6 @@ install_local_dir() {
   if [ ! -d "$DPKG_ROOT$1" ]; then
     mkdir -p "$DPKG_ROOT$1"
   fi
-  if [ -f "$DPKG_ROOT/etc/staff-group-for-usr-local" ]; then
-    chown root:staff "$DPKG_ROOT$1" 2>/dev/null || true
-    chmod 2775 "$DPKG_ROOT$1" 2> /dev/null || true
-  fi
 }
 
 install_from_default() {
@@ -62,7 +58,7 @@ if [ "$1" = "configure" ] && [ "$2" = ""
   install_from_default dot.profile   /root/.profile
   install_from_default dot.bashrc    /root/.bashrc
   install_from_default profile       /etc/profile
-  install_from_default motd          /etc/motd
+  install_from_default networks      /etc/networks
   install_directory mnt       755 root
   install_directory srv       755 root
   install_directory opt       755 root
@@ -100,9 +96,36 @@ if [ -d "$DPKG_ROOT/usr/share/info" ] &&
 fi
 
 if [ "$1" = "configure" ] && [ "$2" != "" ]; then
+  # If we're upgrading base-files, remove the upgrade-available flag
+  # maintained by update-manager, and rerun the release-upgrade check
+  # immediately (in the background) to update the flag.
+  rm -f $DPKG_ROOT/var/lib/update-notifier/release-upgrade-available
+  if [ -x $DPKG_ROOT/usr/lib/update-manager/check-new-release ]; then
+    $DPKG_ROOT/usr/lib/update-manager/check-new-release -q > $DPKG_ROOT/var/lib/update-notifier/release-upgrade-available  &
+  fi
+
   update_to_current_default profile       /etc/profile
   update_to_current_default dot.profile   /root/.profile
   if dpkg --compare-versions "$2" lt-nl "7.7"; then
     install_directory mnt 755 root
   fi
 fi
+
+# special case of having /etc/default/motd-news removed by hand
+# signal the motd-news-config package that this happened, so that
+# it does not put back the file with default contents which would
+# re-enable motd-news
+motd_news_config="$DPKG_ROOT/etc/default/motd-news"
+# 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 -pruN 12.3/debian/rules 12.3ubuntu1/debian/rules
--- 12.3/debian/rules	2019-07-09 09:00:00.000000000 +0000
+++ 12.3ubuntu1/debian/rules	2022-10-17 14:42:58.000000000 +0000
@@ -8,13 +8,16 @@ ifeq ($(DEB_HOST_GNU_SYSTEM),gnu)
   OSNAME=GNU/Hurd
 endif
 
-VENDORFILE = debian
+VENDORFILE = ubuntu
 DESTDIR = debian/base-files
 
 %:
 	dh $@
 
-override_dh_auto_build:
+locale-check:
+	$(CC) $(CFLAGS) $(LDFLAGS) -o locale-check locale-check.c
+
+override_dh_auto_build: locale-check
 	sh debian/check-md5sum-etc profile
 	sed -e "s&#OSNAME#&$(OSNAME)&g" debian/copyright.in > debian/copyright
 	sed -e "s/#VENDORFILE#/$(VENDORFILE)/g" debian/postinst.in > debian/postinst
@@ -22,9 +25,16 @@ override_dh_auto_build:
 override_dh_auto_install:
 	install -p -m 644 etc/*      $(DESTDIR)/etc
 	install -p -m 755 motd/*     $(DESTDIR)/etc/update-motd.d
+	install -p -m 644 debian/motd-news.service $(DESTDIR)/lib/systemd/system/
+	install -p -m 644 debian/motd-news.timer $(DESTDIR)/lib/systemd/system/
 	install -p -m 644 licenses/* $(DESTDIR)/usr/share/common-licenses
 	install -p -m 644 origins/*  $(DESTDIR)/etc/dpkg/origins
 	install -p -m 644 share/*    $(DESTDIR)/usr/share/base-files
+	mkdir $(DESTDIR)/usr/share/pixmaps
+	install -p -m 644 logos/*    $(DESTDIR)/usr/share/pixmaps
+	install -p -m 644 share/*    $(DESTDIR)/usr/share/
+	install -p -m 644 profile.d/* $(DESTDIR)/etc/profile.d
+	install -p -m 755 locale-check $(DESTDIR)/usr/bin
 ifeq ($(DEB_HOST_GNU_SYSTEM),gnu)
 	rmdir $(DESTDIR)/sys
 endif
@@ -36,6 +46,10 @@ endif
 	mv $(DESTDIR)/etc/os-release $(DESTDIR)/usr/lib/os-release
 	ln -s ../usr/lib/os-release $(DESTDIR)/etc/os-release
 
+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 -pruN 12.3/etc/host.conf 12.3ubuntu1/etc/host.conf
--- 12.3/etc/host.conf	2006-08-07 17:14:09.000000000 +0000
+++ 12.3ubuntu1/etc/host.conf	2022-10-17 14:42:59.000000000 +0000
@@ -1 +1,3 @@
+# The "order" line is only used by old versions of the C library.
+order hosts,bind
 multi on
diff -pruN 12.3/etc/issue 12.3ubuntu1/etc/issue
--- 12.3/etc/issue	2021-08-22 17:00:00.000000000 +0000
+++ 12.3ubuntu1/etc/issue	2022-10-28 13:31:12.000000000 +0000
@@ -1,2 +1,2 @@
-Debian #OSNAME# bookworm/sid \n \l
+Ubuntu Lunar Lobster (development branch) \n \l
 
diff -pruN 12.3/etc/issue.net 12.3ubuntu1/etc/issue.net
--- 12.3/etc/issue.net	2021-08-22 17:00:00.000000000 +0000
+++ 12.3ubuntu1/etc/issue.net	2022-10-28 13:31:30.000000000 +0000
@@ -1 +1 @@
-Debian #OSNAME# bookworm/sid
+Ubuntu Lunar Lobster (development branch)
diff -pruN 12.3/etc/legal 12.3ubuntu1/etc/legal
--- 12.3/etc/legal	1970-01-01 00:00:00.000000000 +0000
+++ 12.3ubuntu1/etc/legal	2022-04-22 14:26:13.000000000 +0000
@@ -0,0 +1,8 @@
+
+The programs included with the Ubuntu system are free software;
+the exact distribution terms for each program are described in the
+individual files in /usr/share/doc/*/copyright.
+
+Ubuntu comes with ABSOLUTELY NO WARRANTY, to the extent permitted by
+applicable law.
+
diff -pruN 12.3/etc/lsb-release 12.3ubuntu1/etc/lsb-release
--- 12.3/etc/lsb-release	1970-01-01 00:00:00.000000000 +0000
+++ 12.3ubuntu1/etc/lsb-release	2022-10-28 13:32:07.000000000 +0000
@@ -0,0 +1,4 @@
+DISTRIB_ID=Ubuntu
+DISTRIB_RELEASE=23.04
+DISTRIB_CODENAME=lunar
+DISTRIB_DESCRIPTION="Ubuntu Lunar Lobster (development branch)"
diff -pruN 12.3/etc/os-release 12.3ubuntu1/etc/os-release
--- 12.3/etc/os-release	2022-10-03 21:30:00.000000000 +0000
+++ 12.3ubuntu1/etc/os-release	2022-10-28 13:30:34.000000000 +0000
@@ -1,7 +1,13 @@
-PRETTY_NAME="Debian #OSNAME# bookworm/sid"
-NAME="Debian #OSNAME#"
-VERSION_CODENAME=bookworm
-ID=debian
-HOME_URL="https://www.debian.org/"
-SUPPORT_URL="https://www.debian.org/support"
-BUG_REPORT_URL="https://bugs.debian.org/"
+PRETTY_NAME="Ubuntu Lunar Lobster (development branch)"
+NAME="Ubuntu"
+VERSION_ID="23.04"
+VERSION="23.04 (Lunar Lobster)"
+VERSION_CODENAME=lunar
+ID=ubuntu
+ID_LIKE=debian
+HOME_URL="https://www.ubuntu.com/"
+SUPPORT_URL="https://help.ubuntu.com/"
+BUG_REPORT_URL="https://bugs.launchpad.net/ubuntu/"
+PRIVACY_POLICY_URL="https://www.ubuntu.com/legal/terms-and-policies/privacy-policy"
+UBUNTU_CODENAME=lunar
+LOGO=ubuntu-logo
diff -pruN 12.3/locale-check.c 12.3ubuntu1/locale-check.c
--- 12.3/locale-check.c	1970-01-01 00:00:00.000000000 +0000
+++ 12.3ubuntu1/locale-check.c	2022-04-22 14:26:13.000000000 +0000
@@ -0,0 +1,80 @@
+#include <locale.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+char *help = "locale-check DEFAULT_LOCALE\n"
+	"\n"
+	"Check that the various locale-related environment variables contain\n"
+	"values that can be set. Output shell that can be passed to eval to\n"
+	"set any invalid environment variables to DEFAULT_LOCALE\n";
+
+static void usage(void) {
+	fprintf(stderr, "%s", help);
+	exit(1);
+}
+
+static void check(int category, char* varname, char* defvalue) {
+	if (getenv(varname) != NULL) {
+		if (setlocale(category, "") == NULL) {
+			printf("%s=%s\n", varname, defvalue);
+		}
+	}
+}
+
+#define SINGLEQUOTE '\''
+#define BACKSLASH   '\\'
+
+/* Quote 'val' for shell */
+static char *quote(char* val) {
+	/* This implementation single quotes val and replaces single quotes
+	   with SINGLEQUOTE BACKSLASH SINGLEQUOTE SINGLEQUOTE. The worst
+	   case is that val is entirely single quotes, in which case each
+	   character of the input becomes 4 bytes. Then 3 bytes for
+	   surrounding quotes and terminating NUL. */
+	char *ret = malloc(strlen(val)*4+3);
+	char *source = val;
+	char *dest = ret;
+
+	*dest++ = SINGLEQUOTE;
+	while (*source) {
+		if (*source == SINGLEQUOTE) {
+			*dest++ = SINGLEQUOTE;
+			*dest++ = BACKSLASH;
+			*dest++ = SINGLEQUOTE;
+		}
+		*dest++ = *source++;
+	}
+	*dest++ = SINGLEQUOTE;
+	*dest++ = 0;
+	return ret;
+}
+
+#define CHECK(cat, def) check(cat, #cat, def);
+
+int main(int argc, char** argv) {
+	char *defval;
+	if (argc != 2) {
+		usage();
+	}
+	defval = quote(argv[1]);
+	/* setlocale will never consult LANG if LC_ALL is set */
+	if (getenv("LC_ALL") == NULL) {
+		check(LC_ALL, "LANG", defval);
+	} else {
+		CHECK(LC_ALL, defval);
+	}
+	CHECK(LC_ADDRESS, defval);
+	CHECK(LC_COLLATE, defval);
+	CHECK(LC_CTYPE, defval);
+	CHECK(LC_IDENTIFICATION, defval);
+	CHECK(LC_MEASUREMENT, defval);
+	CHECK(LC_MESSAGES, defval);
+	CHECK(LC_MONETARY, defval);
+	CHECK(LC_NAME, defval);
+	CHECK(LC_NUMERIC, defval);
+	CHECK(LC_PAPER, defval);
+	CHECK(LC_TELEPHONE, defval);
+	CHECK(LC_TIME, defval);
+	return 0;
+}
diff -pruN 12.3/logos/ubuntu-logo.svg 12.3ubuntu1/logos/ubuntu-logo.svg
--- 12.3/logos/ubuntu-logo.svg	1970-01-01 00:00:00.000000000 +0000
+++ 12.3ubuntu1/logos/ubuntu-logo.svg	2022-07-11 15:57:54.000000000 +0000
@@ -0,0 +1 @@
+<svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><defs><style>.cls-1{fill:#e95420;}.cls-2{fill:#fff;}</style></defs><rect class="cls-1" width="32" height="32"/><circle class="cls-2" cx="7.18" cy="15.82" r="3.35"/><circle class="cls-2" cx="21.1" cy="8.48" r="3.35"/><path class="cls-2" d="M14.73,24.42a8.08,8.08,0,0,1-5.55-4.25,4.83,4.83,0,0,1-2.85.35,10.87,10.87,0,0,0,7.85,6.58,11,11,0,0,0,2.37.25,4.71,4.71,0,0,1-1-2.8A2.89,2.89,0,0,1,14.73,24.42Z"/><circle class="cls-2" cx="20.35" cy="24.45" r="3.35"/><path class="cls-2" d="M25,23.23a11,11,0,0,0,.55-12.83,4.85,4.85,0,0,1-1.88,2.2,8.22,8.22,0,0,1,.78,5.55,8.08,8.08,0,0,1-1.05,2.6A4.58,4.58,0,0,1,25,23.23Z"/><path class="cls-2" d="M6.9,11h.25a4.65,4.65,0,0,1,1,.1,4.84,4.84,0,0,1,1.52.63,8.12,8.12,0,0,1,6.58-3.52,6.42,6.42,0,0,1,.1-.75,4.63,4.63,0,0,1,.92-1.95A11,11,0,0,0,6.9,11Z"/></svg>
\ No newline at end of file
Binary files 12.3/logos/ubuntu-logo-text-dark.png and 12.3ubuntu1/logos/ubuntu-logo-text-dark.png differ
Binary files 12.3/logos/ubuntu-logo-text.png and 12.3ubuntu1/logos/ubuntu-logo-text.png differ
diff -pruN 12.3/motd/00-header 12.3ubuntu1/motd/00-header
--- 12.3/motd/00-header	1970-01-01 00:00:00.000000000 +0000
+++ 12.3ubuntu1/motd/00-header	2022-04-22 14:26:13.000000000 +0000
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+#    00-header - create the header of the MOTD
+#    Copyright (C) 2009-2010 Canonical Ltd.
+#
+#    Authors: Dustin Kirkland <kirkland@canonical.com>
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License along
+#    with this program; if not, write to the Free Software Foundation, Inc.,
+#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+[ -r /etc/lsb-release ] && . /etc/lsb-release
+
+if [ -z "$DISTRIB_DESCRIPTION" ] && [ -x /usr/bin/lsb_release ]; then
+	# Fall back to using the very slow lsb_release utility
+	DISTRIB_DESCRIPTION=$(lsb_release -s -d)
+fi
+
+printf "Welcome to %s (%s %s %s)\n" "$DISTRIB_DESCRIPTION" "$(uname -o)" "$(uname -r)" "$(uname -m)"
diff -pruN 12.3/motd/10-help-text 12.3ubuntu1/motd/10-help-text
--- 12.3/motd/10-help-text	1970-01-01 00:00:00.000000000 +0000
+++ 12.3ubuntu1/motd/10-help-text	2022-04-22 14:26:13.000000000 +0000
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+#    10-help-text - print the help text associated with the distro
+#    Copyright (C) 2009-2010 Canonical Ltd.
+#
+#    Authors: Dustin Kirkland <kirkland@canonical.com>,
+#             Brian Murray <brian@canonical.com>
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License along
+#    with this program; if not, write to the Free Software Foundation, Inc.,
+#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+printf "\n"
+printf " * Documentation:  https://help.ubuntu.com\n"
+printf " * Management:     https://landscape.canonical.com\n"
+printf " * Support:        https://ubuntu.com/advantage\n"
diff -pruN 12.3/motd/10-uname 12.3ubuntu1/motd/10-uname
--- 12.3/motd/10-uname	2017-04-04 12:00:00.000000000 +0000
+++ 12.3ubuntu1/motd/10-uname	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-#!/bin/sh
-uname -snrvm
diff -pruN 12.3/motd/50-motd-news 12.3ubuntu1/motd/50-motd-news
--- 12.3/motd/50-motd-news	1970-01-01 00:00:00.000000000 +0000
+++ 12.3ubuntu1/motd/50-motd-news	2022-04-22 14:29:15.000000000 +0000
@@ -0,0 +1,146 @@
+#!/bin/sh
+#
+#    50-motd-news - print the live news from the Ubuntu wire
+#    Copyright (C) 2016-2020 Canonical Ltd.
+#    Copyright (C) 2016-2017 Dustin Kirkland
+#
+#    Authors: Dustin Kirkland <kirkland@canonical.com>
+#             Steve Langasek <steve.langasek@canonical.com>
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License along
+#    with this program; if not, write to the Free Software Foundation, Inc.,
+#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+##############################################################################
+# This program could be rewritten in C or Golang for faster performance.
+# Or it could be rewritten in Python or another higher level language
+# for more modularity.
+# However, I've insisted on shell here for transparency!
+#                                                                     - Dustin
+##############################################################################
+
+# Source the local configuration
+[ -r /etc/default/motd-news ] && . /etc/default/motd-news
+
+# Exit immediately, unless we're enabled
+# This makes this script very easy to disable in /etc/default/motd-news configuration
+[ "$ENABLED" = "1" ] || exit 0
+
+# Ensure sane defaults
+[ -n "$URLS" ] || URLS="https://motd.ubuntu.com"
+[ -n "$WAIT" ] || WAIT=5
+[ -n "$CACHE" ] || CACHE="/var/cache/motd-news"
+[ "$1" = "--force" ] && FORCED=1
+
+# Ensure we print safely, maximum of the first 10 lines,
+# maximum of the first 80 chars per line, no control chars
+safe_print() {
+	cat "$1" | head -n 10 | tr -d '\000-\011\013\014\016-\037' | cut -c -80
+}
+
+
+# If we're not forcing an update, and we have a cached motd-news file,
+# then just print it and exit as quickly as possible, for login performance.
+# Note that systemd should keep this cache file up to date, asynchronously
+if [ "$FORCED" != "1" ]; then
+  	if [ -r $CACHE ]; then
+		echo
+		safe_print $CACHE
+	elif [ "$(id -u)" -eq 0 ]; then
+		: > $CACHE
+	fi
+	exit 0
+fi
+
+# If we've made it here, we've been given the --force argument,
+# probably from the systemd motd-news.service.  Let's update...
+
+# Abort early if wget is missing
+[ -x /usr/bin/wget ] || exit 0
+
+# Generate our temp files, clean up when done
+NEWS=$(mktemp) || exit 1
+ERR=$(mktemp) || exit 1
+CLOUD=$(mktemp) || exit 1
+trap "rm -f $NEWS $ERR $CLOUD" HUP INT QUIT ILL TRAP KILL BUS TERM
+
+# Construct a user agent, similar to Firefox/Chrome/Safari/IE to
+# ensure a proper, tailored, accurate message of the day
+
+# wget browser version, for debug purposes
+wget_ver="$(dpkg -l wget | awk '$1 == "ii" { print($3); exit(0); }')"
+
+# Distribution version, for messages releated to this Ubuntu release
+. /etc/lsb-release
+lsb=$(echo "$DISTRIB_DESCRIPTION" | sed -e "s/ /\//g")
+codename="$DISTRIB_CODENAME"
+
+# Kernel version and CPU type, for messages related to a particular revision or hardware
+platform="$(uname -o)/$(uname -r)/$(uname -m)"
+arch="$(uname -m)"
+cpu="$(grep -m1 "^model name" /proc/cpuinfo | sed -e "s/.*: //" -e "s:\s\+:/:g")"
+cloud_id="unknown"
+if [ -x /usr/bin/cloud-id ]; then
+    /usr/bin/cloud-id > "$CLOUD" 2>/dev/null
+    if [ "$?" -eq "0" ]; then
+        # sanitize it a bit, just in case
+        cloud_id=$(cut -c -40 "${CLOUD}" | tr -c -d '[:alnum:]')
+        if [ -z "${cloud_id}" ]; then
+            cloud_id="unknown"
+        fi
+    fi
+fi
+
+# Piece together the user agent
+USER_AGENT="wget/$wget_ver $lsb $platform $cpu cloud_id/$cloud_id"
+
+# Loop over any configured URLs
+for u in $URLS; do
+	# Ensure https:// protocol, for security reasons
+	case $u in
+		https://*)
+			true
+		;;
+		https://motd.ubuntu.com)
+			u="$u/$codename/$arch"
+		;;
+		*)
+			continue
+		;;
+	esac
+	# If we're forced, set the wait to much higher (1 minute)
+	[ "$FORCED" = "1" ] && WAIT=60
+	# Fetch and print the news motd
+	result=0
+	not_found_is_ok=0
+	wget --timeout "$WAIT" -U "$USER_AGENT" -O- --content-on-error "$u" >"$NEWS" 2>"$ERR" || result=$?
+	# from wget's manpage: 8   Server issued an error response.
+	if [ $result -eq 8 ]; then
+		if grep -q "ERROR 404" "$ERR"; then
+			# The server's 404 document is the generic, non cloud-specific, motd-news
+			# content present in the index.txt file
+			not_found_is_ok=1
+		fi
+	fi
+	if [ $result -eq 0 ] || [ $not_found_is_ok -eq 1 ]; then
+		echo
+		# At most, 10 lines of text, remove control characters, print at most 80 characters per line
+		safe_print "$NEWS"
+		# Try to update the cache
+		safe_print "$NEWS" 2>/dev/null >$CACHE || true
+	else
+		: > "$CACHE"
+ 	fi
+done
+rm -f "$NEWS" "$ERR" "$CLOUD"
+exit 0
diff -pruN 12.3/origins/ubuntu 12.3ubuntu1/origins/ubuntu
--- 12.3/origins/ubuntu	1970-01-01 00:00:00.000000000 +0000
+++ 12.3ubuntu1/origins/ubuntu	2022-04-22 14:26:13.000000000 +0000
@@ -0,0 +1,4 @@
+Vendor: Ubuntu
+Vendor-URL: http://www.ubuntu.com/
+Bugs: https://bugs.launchpad.net/ubuntu/+filebug
+Parent: Debian
diff -pruN 12.3/profile.d/01-locale-fix.sh 12.3ubuntu1/profile.d/01-locale-fix.sh
--- 12.3/profile.d/01-locale-fix.sh	1970-01-01 00:00:00.000000000 +0000
+++ 12.3ubuntu1/profile.d/01-locale-fix.sh	2022-04-22 14:26:13.000000000 +0000
@@ -0,0 +1,2 @@
+# Make sure the locale variables are set to valid values.
+eval $(/usr/bin/locale-check C.UTF-8)
diff -pruN 12.3/share/dot.bashrc 12.3ubuntu1/share/dot.bashrc
--- 12.3/share/dot.bashrc	2021-04-10 20:00:00.000000000 +0000
+++ 12.3ubuntu1/share/dot.bashrc	2022-10-17 14:42:58.000000000 +0000
@@ -1,18 +1,99 @@
 # ~/.bashrc: executed by bash(1) for non-login shells.
+# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
+# for examples
 
-# Note: PS1 and umask are already set in /etc/profile. You should not
-# need this unless you want different defaults for root.
-# PS1='${debian_chroot:+($debian_chroot)}\h:\w\$ '
-# umask 022
-
-# You may uncomment the following lines if you want `ls' to be colorized:
-# export LS_OPTIONS='--color=auto'
-# eval "$(dircolors)"
-# alias ls='ls $LS_OPTIONS'
-# alias ll='ls $LS_OPTIONS -l'
-# alias l='ls $LS_OPTIONS -lA'
-#
-# Some more alias to avoid making mistakes:
-# alias rm='rm -i'
-# alias cp='cp -i'
-# alias mv='mv -i'
+# If not running interactively, don't do anything
+[ -z "$PS1" ] && return
+
+# don't put duplicate lines in the history. See bash(1) for more options
+# ... or force ignoredups and ignorespace
+HISTCONTROL=ignoredups:ignorespace
+
+# append to the history file, don't overwrite it
+shopt -s histappend
+
+# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
+HISTSIZE=1000
+HISTFILESIZE=2000
+
+# check the window size after each command and, if necessary,
+# update the values of LINES and COLUMNS.
+shopt -s checkwinsize
+
+# make less more friendly for non-text input files, see lesspipe(1)
+[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
+
+# set variable identifying the chroot you work in (used in the prompt below)
+if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then
+    debian_chroot=$(cat /etc/debian_chroot)
+fi
+
+# set a fancy prompt (non-color, unless we know we "want" color)
+case "$TERM" in
+    xterm-color) color_prompt=yes;;
+esac
+
+# uncomment for a colored prompt, if the terminal has the capability; turned
+# off by default to not distract the user: the focus in a terminal window
+# should be on the output of commands, not on the prompt
+#force_color_prompt=yes
+
+if [ -n "$force_color_prompt" ]; then
+    if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
+	# We have color support; assume it's compliant with Ecma-48
+	# (ISO/IEC-6429). (Lack of such support is extremely rare, and such
+	# a case would tend to support setf rather than setaf.)
+	color_prompt=yes
+    else
+	color_prompt=
+    fi
+fi
+
+if [ "$color_prompt" = yes ]; then
+    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
+else
+    PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
+fi
+unset color_prompt force_color_prompt
+
+# If this is an xterm set the title to user@host:dir
+case "$TERM" in
+xterm*|rxvt*)
+    PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
+    ;;
+*)
+    ;;
+esac
+
+# enable color support of ls and also add handy aliases
+if [ -x /usr/bin/dircolors ]; then
+    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
+    alias ls='ls --color=auto'
+    #alias dir='dir --color=auto'
+    #alias vdir='vdir --color=auto'
+
+    alias grep='grep --color=auto'
+    alias fgrep='fgrep --color=auto'
+    alias egrep='egrep --color=auto'
+fi
+
+# some more ls aliases
+alias ll='ls -alF'
+alias la='ls -A'
+alias l='ls -CF'
+
+# Alias definitions.
+# You may want to put all your additions into a separate file like
+# ~/.bash_aliases, instead of adding them here directly.
+# See /usr/share/doc/bash-doc/examples in the bash-doc package.
+
+if [ -f ~/.bash_aliases ]; then
+    . ~/.bash_aliases
+fi
+
+# enable programmable completion features (you don't need to enable
+# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
+# sources /etc/bash.bashrc).
+#if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
+#    . /etc/bash_completion
+#fi
diff -pruN 12.3/share/info.dir 12.3ubuntu1/share/info.dir
--- 12.3/share/info.dir	2006-04-15 16:36:50.000000000 +0000
+++ 12.3ubuntu1/share/info.dir	2022-10-17 14:42:58.000000000 +0000
@@ -11,7 +11,7 @@ File: dir	Node: Top	This is the top of t
   it.
   --- PLEASE ADD DOCUMENTATION TO THIS TREE. (See INFO topic first.) ---
 
-In Debian #OSNAME#, Info `dir' entries are added with the command
+In Ubuntu, Info `dir' entries are added with the command
 `install-info'.  Please refer to install-info(8) for usage details.
 
 * Menu: The list of major topics begins on the next line.
diff -pruN 12.3/share/networks 12.3ubuntu1/share/networks
--- 12.3/share/networks	1970-01-01 00:00:00.000000000 +0000
+++ 12.3ubuntu1/share/networks	2022-04-22 14:26:13.000000000 +0000
@@ -0,0 +1,2 @@
+# symbolic names for networks, see networks(5) for more information
+link-local 169.254.0.0
diff -pruN 12.3/share/profile 12.3ubuntu1/share/profile
--- 12.3/share/profile	2021-04-10 20:00:00.000000000 +0000
+++ 12.3ubuntu1/share/profile	2022-10-17 14:42:58.000000000 +0000
@@ -1,13 +1,6 @@
 # /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
-  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"
-fi
-export PATH
-
 if [ "${PS1-}" ]; then
   if [ "${BASH-}" ] && [ "$BASH" != "/bin/sh" ]; then
     # The file bash.bashrc already sets the default PS1.
diff -pruN 12.3/share/profile.md5sums 12.3ubuntu1/share/profile.md5sums
--- 12.3/share/profile.md5sums	2021-04-10 20:00:00.000000000 +0000
+++ 12.3ubuntu1/share/profile.md5sums	2022-10-17 14:42:58.000000000 +0000
@@ -1,15 +1,12 @@
-356d504b5bf759b7bfef6cdc9e3c66e1 3.1.1 to 3.1.16
-f8b8e27b1a1b30a721a032baa254c973 4 to 5.0.0
-bfabfb83a6d9a773eb5e4fc81af9030e 5.1 and 5.2
-138403cbdd92a069480fefbf99ccbac8 5.3
-ab8413a709112f5ce298462fa445b190 5.4
-caefbdc2b725c2acb43d205f61779f9c 5.5
-bd615094228169d947e3af41c140ac57 5.6
-3bde72168bca3746e9281e863d43d6dc 5.7 and 5.8
-b94c2e3df2a779ac12080942df4d86ea 5.9 to 6.4
-89126d8bba3325594e1539bcc97847f3 buggy version by sendfile
-91901ce5707909cfec8b3a1a6efbfa61 6.5 to 7.6
-6c56009f8aabda9400878ce3c7fd91af 7.7
-ff2bae0480885c074afadec201f5c668 7.8 to 9.5
-2255054e61cee1a99dbe893377820dde 9.6 to 11
-48a30a427d1794feb49f102b87ddce2b 11.1 to current
+4a409a5f2242928822658b14918b2ee1
+61a3f85a2dc30f4e920f615109137be5
+67f902de4d3fb8cd2f4778cad06d9b17
+863ed3bf8041b035234cce25d4792fdd
+9519666d98e08940df6f25dcf4598bef
+9a279ae6bdd1251f64b7e70e960ef00d
+aa3516b5ca8ed326d75e56cc856e7d48
+b59ea6ac3a1ad8c0527ec94f73bafca0
+c3a1d42cddcc565f16b48eb9c2119d9d
+85a2a7227b884e4c84ff950626fcc89f
+9d5ee34149287021622dd9e21c17ec26
+9926b56bc6e576d4ad206dd82d38deff
