From: Peter Michael Green <plugwash@raspbian.org>
Date: Tue, 15 Feb 2022 20:21:45 +0000 (+0000)
Subject: Manual merge of version 12+rpi1 and 12.2 to produce 12.2+rpi1
X-Git-Tag: archive/raspbian/12.2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e61e6eefea40c453d79cf91e20933e61fd1880b0;p=base-files.git

Manual merge of version 12+rpi1 and 12.2 to produce 12.2+rpi1
---

e61e6eefea40c453d79cf91e20933e61fd1880b0
diff --cc debian/changelog
index 82ef289,6b6c531..a65fe8f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,16 +1,34 @@@
- base-files (12+rpi1) bookworm-staging; urgency=medium
++base-files (12.2+rpi1) bookworm-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>  Sat, 28 Aug 2021 18:32:16 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 15 Feb 2022 20:21:05 +0000
++
+ base-files (12.2) unstable; urgency=medium
+ 
+   * A simplified version of the patch for DPKG_ROOT was applied, but the
+     simplification went too far and was incorrect. Closes: #824594.
+   * Use $() instead of `` when calling md5sum.
+ 
+  -- Santiago Vila <sanvila@debian.org>  Wed, 19 Jan 2022 23:35:00 +0100
+ 
+ base-files (12.1) unstable; urgency=medium
+ 
+   * Add support for DPKG_ROOT to postinst. Closes: #824594
+ 
+  -- Santiago Vila <sanvila@debian.org>  Wed, 19 Jan 2022 22:40:00 +0100
  
  base-files (12) unstable; urgency=medium
  
diff --cc debian/postinst.in
index 8283e74,0ad4ce3..992127d
--- a/debian/postinst.in
+++ b/debian/postinst.in
@@@ -44,11 -52,11 +52,11 @@@ update_to_current_default() 
    fi
  }
  
- #if [ ! -e /etc/dpkg/origins/default ]; then
-   if [ -e /etc/dpkg/origins/#VENDORFILE# ]; then
-     ln -sf #VENDORFILE# /etc/dpkg/origins/default
 -if [ ! -e "$DPKG_ROOT/etc/dpkg/origins/default" ]; then
++#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
 +#fi
  
  if [ "$1" = "configure" ] && [ "$2" = "" ]; then
    install_from_default dot.profile   /root/.profile