From: Raspbian automatic forward porter Date: Wed, 12 Mar 2025 02:04:29 +0000 (+0000) Subject: Merge version 13.6+rpi1 and 13.7 to produce 13.7+rpi1 X-Git-Tag: archive/raspbian/13.7+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8e60d5172c363fafbee641e990b12bfea7792340;p=base-files.git Merge version 13.6+rpi1 and 13.7 to produce 13.7+rpi1 --- 8e60d5172c363fafbee641e990b12bfea7792340 diff --cc debian/changelog index 42ffdb2,b04601a..c8fa1ea --- a/debian/changelog +++ b/debian/changelog @@@ -1,20 -1,12 +1,30 @@@ - base-files (13.6+rpi1) trixie-staging; urgency=medium ++base-files (13.7+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 Tue, 10 Dec 2024 15:23:20 +0000 ++ -- Raspbian forward porter Wed, 12 Mar 2025 02:04:29 +0000 ++ + base-files (13.7) unstable; urgency=medium + + * Make /var/local to be root:root and 755 by default on new installs. + On upgrades from Debian 12, the permissions of /var/local are kept, + which is what we want for backwards compatibility. Closes: #1039973. + * Raise Standards-Version to 4.7.2. + * Add debian/salsa-ci.yml. + + -- Santiago Vila Tue, 04 Mar 2025 12:20:00 +0100 base-files (13.6) unstable; urgency=medium diff --cc debian/control index c0368df,3a3b75e..82b8b8b --- 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.7.0 + Standards-Version: 4.7.2 -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