Merge version 14+rpi1 and 14.2 to produce 14.2+rpi1

diff --cc debian/changelog
index f6364045a18021429409a70f1342601592cc7cbf,dedda29bf925567cef1fb926e91b2b50fb9e5b3a..9763913acd513e08684d1dc56b9ec3f7bc87bd7d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,38 +1,56 @@@
- base-files (14+rpi1) forky-staging; urgency=medium
++base-files (14.2+rpi1) forky-staging; urgency=medium
 +
 +  [changes brought forward from 8+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 07 Jan 2015 02:03:42 +0000]
 +  * Modify default vendor etc for raspbian.
 +  * Modify maintainer scripts so default will be set to raspbian even when
 +    upgrading
 +  [changes introduced in 10+rpi1 by Peter Michael Green]
 +  * Make some changes using sed in debian/rules rather than directly in source
 +    package to avoid merge conflicts.
 +  [changes introduced in 10.3+rpi1 by Peter Michael Green]
 +  * Make further changes in debian/rules rather than directly to files in
 +    package to further avoid merge conflicts.
 +  * Make changes in debian/rules in the "install" step to avoid the need for
 +    code to revert them.
 +  * Add build-dependency on moreutils to support new code in debian/rules.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 13 Jan 2026 17:12:49 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 05 Jun 2026 20:40:21 +0000
++
+ base-files (14.2) unstable; urgency=medium
+ 
+   * Make it easier for derivatives to change the name of the system.
+     Thanks to Arnaud Rebillout. Closes: #1111436.
+   * Fix copyright-refers-to-symlink-license lintian warning.
+   * Fix missing-field-in-dep5-copyright lintian warning.
+   * Drop some unused lintian overrides.
+ 
+  -- Santiago Vila <sanvila@debian.org>  Sun, 31 May 2026 11:20:00 +0200
+ 
+ base-files (14.1) unstable; urgency=medium
+ 
+   * Do not create empty lastlog, btmp or wtmp in the initial install anymore.
+     Closes: #1115946.
+   * README: Reword answer to the question about common-licenses.
+   * Add reportbug hook to warn users that requests for new common licenses
+     should be discussed in debian-policy first. Closes: #1122915.
+     Thanks to Rafael Laboissière.
+   * Add AGPL-3.0, Artistic-2.0, BSL-1.0, CC-BY-3.0, CC-BY-4.0, CC-BY-SA-3.0,
+     CC-BY-SA-4.0, GFDL-1.1 and OFL-1.1 to common-licenses, following a
+     proposal from Mechtilde Stehmann. Closes: #1136090.
+ 
+  -- Santiago Vila <sanvila@debian.org>  Fri, 29 May 2026 13:30:00 +0200
+ 
+ base-files (14.0) unstable; urgency=medium
+ 
+   * Do not ship the BSD license anymore. Closes: #1132426.
+     Thanks a lot to Bastian Germann.
+   * Update the Artistic license from perl_5.36.0.orig.tar.xz.
+     (Fixes old typo MERCHANTIBILITY -> MERCHANTABILITY).
+   * Drop "Rules-Requires-Root: no" (default).
+   * Update standards-version.
+   * Fine-tune salsa-ci.yml.
+ 
+  -- Santiago Vila <sanvila@debian.org>  Mon, 11 May 2026 17:40:00 +0200
  
  base-files (14) unstable; urgency=medium
  

diff --cc debian/control
index d182f48a59c7c4a42634b6562a9a5d17ae45b5f5,8ce5ea8be99f54961d9c98959ebe6cc1a5395374..38b9bcf540f43f7f1f75e90b493222a12daadd53
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -2,11 -2,10 +2,10 @@@ Source: base-file
  Section: admin
  Priority: required
  Maintainer: Santiago Vila <sanvila@debian.org>
- Standards-Version: 4.7.2
+ Standards-Version: 4.7.4
 -Build-Depends: debhelper-compat (= 13), debhelper (>= 13.10~)
 +Build-Depends: debhelper-compat (= 13), debhelper (>= 13.10~), moreutils
  Vcs-Git: https://salsa.debian.org/sanvila/base-files.git
  Vcs-Browser: https://salsa.debian.org/sanvila/base-files
- Rules-Requires-Root: no
  
  Package: base-files
  Provides: base, usr-is-merged

diff --cc debian/postinst
Simple merge

diff --cc debian/rules
index a269656b6c7d3d6428fdadb73a2fc034d1d7ad38,e8127a05fc552e57e18bb8212e2ba00846a0ef7d..5ed6d9bde1a59acf287708421972c6ce22153713
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -2,15 -2,15 +2,15 @@@
  
  include /usr/share/dpkg/architecture.mk
  
- OSNAME = "GNU/`uname | sed -e 's/GNU\///'`"
+ OSNAME = Debian GNU/$(shell uname | sed -e 's/GNU\///')
  ifeq ($(DEB_HOST_GNU_SYSTEM),linux)
-   OSNAME=GNU/Linux
+   OSNAME = Debian GNU/Linux
  endif
  ifeq ($(DEB_HOST_GNU_SYSTEM),gnu)
-   OSNAME=GNU/Hurd
+   OSNAME = Debian GNU/Hurd
  endif
  
 -VENDORFILE = debian
 +VENDORFILE = raspbian
  DESTDIR = debian/base-files
  
  ifneq (,$(filter $(DEB_HOST_ARCH),amd64 loong64 mips64el ppc64 ppc64el sparc64))