Merge version 13.2+rpi1 and 13.3 to produce 13.3+rpi1

diff --cc debian/changelog
index 7212efdec66bcbf8e9cd62315530d9919f3fc363,43086e5e41843b5ebedb969862c41606dd791dfd..2065ed962e68c23928ed30969ef2a203baba267f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,9 +1,27 @@@
- base-files (13.2+rpi1) trixie-staging; urgency=medium
++base-files (13.3+rpi1) trixie-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>  Thu, 30 May 2024 23:07:39 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 14 Jun 2024 10:20:53 +0000
++
+ base-files (13.3) unstable; urgency=medium
+ 
+   [ Helmut Grohne ]
+   * DEP17: Install /usr-merge aliasing symlinks. Closes: #1064459.
+ 
+  -- Santiago Vila <sanvila@debian.org>  Thu, 06 Jun 2024 00:35:00 +0200
  
  base-files (13.2) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/postinst
Simple merge

diff --cc debian/rules
index 6a537839f301ddfc329383d24e26049fdb67457a,17ad36f331eafa81a67e9ffd4fc6b99c8922744b..c1b0dadf4179c64f4b1ae5ebb990fd1f1b4d9bd4
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -8,9 -10,17 +10,17 @@@ ifeq ($(DEB_HOST_GNU_SYSTEM),gnu
    OSNAME=GNU/Hurd
  endif
  
 -VENDORFILE = debian
 +VENDORFILE = raspbian
  DESTDIR = debian/base-files
  
+ ifneq (,$(filter $(DEB_HOST_ARCH),amd64 loong64 mips64el ppc64 ppc64el sparc64))
+   USR_MERGE_RTLDLIB = lib64
+ else ifneq (,$(filter $(DEB_HOST_ARCH),x32))
+   USR_MERGE_RTLDLIB = libx32
+ endif
+ USR_MERGE = bin lib sbin $(USR_MERGE_RTLDLIB)
+ USR_MERGE_MULTILIB = $(filter-out $(USR_MERGE),lib32 lib64 libo32 libx32)
+ 
  %:
        dh $@