From: Raspbian automatic forward porter <root@raspbian.org>
Date: Thu, 9 Jan 2025 18:08:15 +0000 (+0000)
Subject: Merge version 2024.01+dfsg-5+rpi1 and 2024.01+dfsg-6 to produce 2024.01+dfsg-6+rpi1
X-Git-Tag: archive/raspbian/2024.01+dfsg-6+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=78c026bfb49e5afcf9b54939732f321119e9991a;p=u-boot.git

Merge version 2024.01+dfsg-5+rpi1 and 2024.01+dfsg-6 to produce 2024.01+dfsg-6+rpi1
---

78c026bfb49e5afcf9b54939732f321119e9991a
diff --cc debian/changelog
index 7a333ee0f,ba49529b8..d335a2137
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,13 +1,30 @@@
- u-boot (2024.01+dfsg-5+rpi1) trixie-staging; urgency=medium
++u-boot (2024.01+dfsg-6+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 2014.10+dfsg1-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 28 Nov 2014 06:00:07 +0000]
 +  * Don't build versions for various armv7 devices, build rpi version instead.
 +
 +  [changes introduced in 2021.01+dfsg-4+rpi1 by Peter Michael Green]
 +  * Don't build powerpc targets for qemu, my attempts to build the nessacery
 +    cross-compiler in raspbian failed.
 +
 +  [changes introduced in 2024.01+dfsg-5+rpi1 by Peter Michael Green]
 +  * Don't build mips* targets for quemu either. I don't want to add
 +    more cross-compilers to raspbian.
 +  * Always pass armv7 flags when building for armv7 (don't use cc-option,
 +    whatever that is).
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 19 Sep 2024 15:59:18 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 09 Jan 2025 18:08:14 +0000
++
+ u-boot (2024.01+dfsg-6) unstable; urgency=medium
+ 
+   * Use system dtc from device-tree-compiler (Closes: #1091125)
+   * debian/control: Move device-tree-compiler from Build-Depends-Arch to
+     Build-Depends.
+   * debian/control: Mark python3-libfdt, python3-jsonschema, and
+     python3-yaml as native to fix cross-building.
+   * debian/control: Update to Standards-Version 4.7.0.
+ 
+  -- Vagrant Cascadian <vagrant@debian.org>  Thu, 02 Jan 2025 13:47:07 -0800
  
  u-boot (2024.01+dfsg-5) unstable; urgency=medium
  
diff --cc debian/control
index 2a32bf11b,193927ffb..34aa5b787
--- a/debian/control
+++ b/debian/control
@@@ -38,8 -39,11 +39,8 @@@ Build-Depends-Indep
   gcc-aarch64-linux-gnu [!arm64],
   gcc-riscv64-linux-gnu [!riscv64],
   gcc-x86-64-linux-gnu [!amd64],
 - gcc-powerpc-linux-gnu [!powerpc],
 - gcc-mips64el-linux-gnuabi64 [!mips64el],
 - gcc-mipsel-linux-gnu [!mipsel],
  Rules-Requires-Root: no
- Standards-Version: 4.6.2
+ Standards-Version: 4.7.0
  Homepage: https://www.denx.de/wiki/U-Boot/
  Vcs-Browser: https://salsa.debian.org/debian/u-boot
  Vcs-Git: https://salsa.debian.org/debian/u-boot.git