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

diff --cc debian/changelog
index 690043f300c992c74576ba41929d7450c58539ec,cb72d360f96c8a557048927022ab0bc59bfdbb79..7212efdec66bcbf8e9cd62315530d9919f3fc363
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,23 +1,41 @@@
- base-files (13+rpi1) trixie-staging; urgency=medium
++base-files (13.2+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>  Sun, 17 Sep 2023 18:46:01 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 30 May 2024 23:07:39 +0000
++
+ base-files (13.2) unstable; urgency=medium
+ 
+   * Document that /etc/profile is not a conffile anymore. Closes: #868095.
+   * Use a regexp to source files in /etc/profile.d. The behaviour should now be
+     well defined and consistent. Closes: #885414, #1069279.
+   * Add NEWS.Debian entry for the above.
+   * Document that the default umask is defined in /etc/login.defs. Closes: #983606.
+   * Add #DEBHELPER# token to postinst to make lintian happy.
+   * Make binary package to be git-reproducible.
+ 
+  -- Santiago Vila <sanvila@debian.org>  Fri, 03 May 2024 18:15:00 +0200
+ 
+ base-files (13.1) unstable; urgency=medium
+ 
+   * Rename postinst.in to postinst. Use dh_installdeb token feature instead.
+   * Add /usr/local/libexec. Closes: #994220.
+   * Machine-readable copyright file. Closes: #1020828.
+   * Add a debian/gbp.conf file.
+ 
+  -- Santiago Vila <sanvila@debian.org>  Wed, 17 Apr 2024 12:45:00 +0200
  
  base-files (13) unstable; urgency=medium
  

diff --cc debian/postinst
index 0000000000000000000000000000000000000000,2708d1787999f6e2f7d0d082633dd074bf954906..a80fd9330fc971d17f06a35b50fff3378f66ae93
mode 000000,100644..100644
--- /dev/null
--- 2/debian/postinst
+++ b/debian/postinst
@@@ -1,0 -1,111 +1,111 @@@
 -if [ ! -e "$DPKG_ROOT/etc/dpkg/origins/default" ]; then
+ #!/bin/sh
+ set -e
+ 
+ ensure_file_owner_mode() {
+   if [ ! -f "$DPKG_ROOT$1" ]; then
+     : > "$DPKG_ROOT$1"
+   fi
+   chown "$2" "$DPKG_ROOT$1"
+   chmod "$3" "$DPKG_ROOT$1"
+ }
+ 
+ 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() {
+   if [ ! -f "$DPKG_ROOT$2" ]; then
+     cp -p "$DPKG_ROOT/usr/share/base-files/$1" "$DPKG_ROOT$2"
+   fi
+ }
+ 
+ install_directory() {
+   if [ ! -d "$DPKG_ROOT/$1" ]; then
+     mkdir "$DPKG_ROOT/$1"
+     chown "root:$3" "$DPKG_ROOT/$1"
+     chmod "$2" "$DPKG_ROOT/$1"
+   fi
+ }
+ 
+ migrate_directory() {
+   if [ ! -L "$DPKG_ROOT$1" ]; then
+     rmdir "$DPKG_ROOT$1"
+     ln -s "$2" "$DPKG_ROOT$1"
+   fi
+ }
+ 
+ update_to_current_default() {
+   if [ -f "$2" ]; then
+     md5=$(md5sum "$2" | cut -f 1 -d " ")
+     if grep -q "$md5" "/usr/share/base-files/$1.md5sums"; then
+       if ! cmp -s "/usr/share/base-files/$1" "$2"; then
+         cp -p "/usr/share/base-files/$1" "$2"
+         echo Updating $2 to current default.
+       fi
+     fi
+   fi
+ }
+ 
 -fi
++#if [ ! -e "$DPKG_ROOT/etc/dpkg/origins/default" ]; then
+   if [ -e "$DPKG_ROOT/etc/dpkg/origins/#VENDORFILE#" ]; then
+     ln -sf #VENDORFILE# "$DPKG_ROOT/etc/dpkg/origins/default"
+   fi
++#fi
+ 
+ if [ "$1" = "configure" ] && [ "$2" = "" ]; then
+   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_directory mnt       755 root
+   install_directory srv       755 root
+   install_directory opt       755 root
+   install_directory etc/opt   755 root
+   install_directory var/opt   755 root
+   install_directory media     755 root
+   install_directory var/mail 2775 mail
+   if [ ! -L "$DPKG_ROOT/var/spool/mail" ]; then
+     ln -s ../mail "$DPKG_ROOT/var/spool/mail"
+   fi
+   install_directory run/lock 1777 root
+   migrate_directory /var/run /run
+   migrate_directory /var/lock /run/lock
+ 
+   install_local_dir /usr/local
+   install_local_dir /usr/local/share
+   install_local_dir /usr/local/share/man
+   install_local_dir /usr/local/bin
+   install_local_dir /usr/local/games
+   install_local_dir /usr/local/lib
+   install_local_dir /usr/local/libexec
+   install_local_dir /usr/local/include
+   install_local_dir /usr/local/sbin
+   install_local_dir /usr/local/src
+   install_local_dir /usr/local/etc
+   ln -sf share/man "$DPKG_ROOT/usr/local/man"
+ 
+   ensure_file_owner_mode /var/log/wtmp root:utmp 664
+   ensure_file_owner_mode /var/log/btmp root:utmp 660
+   ensure_file_owner_mode /var/log/lastlog root:utmp 664
+ fi
+ 
+ if [ -d "$DPKG_ROOT/usr/share/info" ] && [ ! -f "$DPKG_ROOT/usr/info/dir" ] && [ ! -f "$DPKG_ROOT/usr/share/info/dir" ]; then
+   install_from_default info.dir /usr/share/info/dir
+   chmod 644 $DPKG_ROOT/usr/share/info/dir
+ fi
+ 
+ if [ "$1" = "configure" ] && [ "$2" != "" ]; then
+   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
+ 
+ #DEBHELPER#

diff --cc debian/rules
Simple merge