From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sun, 12 Jun 2022 12:09:31 +0000 (+0100)
Subject: Merge version 1.206+rpi1 and 1.207 to produce 1.207+rpi1
X-Git-Tag: archive/raspbian/1.207+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d5a91342085f2aaf2c803e4f4c07da1e1de26dcb;p=base-installer.git

Merge version 1.206+rpi1 and 1.207 to produce 1.207+rpi1
---

d5a91342085f2aaf2c803e4f4c07da1e1de26dcb
diff --cc debian/changelog
index 05c591d,f2ae306..fcf664d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,25 +1,32 @@@
- base-installer (1.206+rpi1) bullseye-staging; urgency=medium
++base-installer (1.207+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 1.148+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 30 Jul 2014 05:27:29 +0000]
 +  * Use raspbian-archive-keyring instead of debian-archive-keyring.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 06 Aug 2021 23:59:11 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 12 Jun 2022 12:09:31 +0000
++
+ base-installer (1.207) unstable; urgency=medium
+ 
+   * Team upload
+ 
+   [ Updated translations ]
+   * Welsh (cy.po) by Ceiri Wyn Tudur
+   * Danish (da.po) by Joe Hansen
+   * Dutch (nl.po) by Frans Spiesschaert
+   * Norwegian Nynorsk (nn.po) by aujawindar
+   * Polish (pl.po) by Matthaiks
+   * Ukrainian (uk.po) by Taras Panchenko
+   * Simplified Chinese (zh_CN.po) by Wenbin Lv
+ 
+   [ Debian Janitor ]
+   * Add missing ${misc:Depends} to Depends for bootstrap-base.
+   * Bump debhelper dependency to >= 9, since that's what is used in
+     debian/compat.
+   * Use ?= for assignments to architecture variables.
+   * Bump debhelper from deprecated 9 to 13.
+   * Set debhelper-compat version in Build-Depends.
+ 
+  -- Holger Wansing <hwansing@mailbox.org>  Fri, 27 May 2022 00:07:56 +0200
  
  base-installer (1.206) unstable; urgency=medium
  
diff --cc debian/control
index cde1e39,6fd90ed..7300071
--- a/debian/control
+++ b/debian/control
@@@ -16,7 -16,7 +16,7 @@@ Description: base system installation f
  Package: bootstrap-base
  Package-Type: udeb
  Architecture: any
- Depends: ${shlibs:Depends}, mounted-partitions, created-fstab, base-installer, debootstrap-udeb (>= 1.0.7), gpgv-udeb, raspbian-archive-keyring-udeb, archdetect
 -Depends: ${shlibs:Depends}, mounted-partitions, created-fstab, base-installer, debootstrap-udeb, gpgv-udeb, debian-archive-keyring-udeb, archdetect, ${misc:Depends}
++Depends: ${shlibs:Depends}, ${misc:Depends}, mounted-partitions, created-fstab, base-installer, debootstrap-udeb, gpgv-udeb, raspbian-archive-keyring-udeb, archdetect
  Provides: kernel-installer, installed-base
  XB-Installer-Menu-Item: 6500
  Description: Install the base system