From: Raspbian automatic forward porter Date: Sat, 17 Aug 2024 22:04:53 +0000 (+0100) Subject: Merge version 13.3+rpi1 and 13.5 to produce 13.5+rpi1 X-Git-Tag: archive/raspbian/13.5+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9657d6194bf7231cf9e6bf30b24cfad436a2616f;p=base-files.git Merge version 13.3+rpi1 and 13.5 to produce 13.5+rpi1 --- 9657d6194bf7231cf9e6bf30b24cfad436a2616f diff --cc debian/changelog index 2065ed9,5974f99..ea4cf3c --- a/debian/changelog +++ b/debian/changelog @@@ -1,20 -1,22 +1,40 @@@ - base-files (13.3+rpi1) trixie-staging; urgency=medium ++base-files (13.5+rpi1) trixie-staging; urgency=medium + + [changes brought forward from 8+rpi1 by Peter Michael Green 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 Fri, 14 Jun 2024 10:20:53 +0000 ++ -- Raspbian forward porter Sat, 17 Aug 2024 22:04:52 +0000 ++ + base-files (13.5) unstable; urgency=medium + + [ Chris Hofstaedtler ] + * Fix typo in preinst: lib64 -> libx32. Closes: #1077863. + [ Helmut Grohne ] + * Work around /lib64 link created by systemd-nspawn. Closes: #1077866. + [ Santiago Vila ] + * Add lintian overrides for the directories that have become symlinks. + + -- Santiago Vila Sun, 04 Aug 2024 23:30:00 +0200 + + base-files (13.4) unstable; urgency=medium + + [ Helmut Grohne ] + * Tighten the merged-/usr preinst check. Closes: #1076491. + [ Santiago Vila ] + * Raise Standards-Version to 4.7.0. + + -- Santiago Vila Thu, 01 Aug 2024 12:30:00 +0200 base-files (13.3) unstable; urgency=medium diff --cc debian/control index 05f6742,8262403..c0368df --- a/debian/control +++ b/debian/control @@@ -2,8 -2,8 +2,8 @@@ Source: base-file Section: admin Priority: required Maintainer: Santiago Vila - Standards-Version: 4.6.2 + Standards-Version: 4.7.0 -Build-Depends: debhelper-compat (= 13), debhelper (>= 13.10~) +Build-Depends: debhelper-compat (= 13), debhelper (>= 13.10~), moreutils Rules-Requires-Root: binary-targets Package: base-files