From: Raspbian automatic forward porter <root@raspbian.org>
Date: Fri, 14 Jun 2024 10:20:53 +0000 (+0100)
Subject: Merge version 13.2+rpi1 and 13.3 to produce 13.3+rpi1
X-Git-Tag: raspbian/13.3+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=aa6e32e3046fa34f96a8d53cf8e0d9906fa46e51;p=base-files.git

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

d8edb8a768a3321c5b79dccf8925c1a39dd08a20
diff --cc debian/changelog
index 7212efd,43086e5..2065ed9
--- a/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/rules
index 6a53783,17ad36f..c1b0dad
--- a/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 $@