From: Raspbian automatic forward porter Date: Thu, 5 Sep 2024 19:25:24 +0000 (+0100) Subject: Merge version 11.1+rpi1+deb11u10 and 11.1+deb11u11 to produce 11.1+rpi1+deb11u11 X-Git-Tag: archive/raspbian/11.1+rpi1+deb11u11 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=858d5d35cd201defd3180678d3c70bb54d45130a;p=base-files.git Merge version 11.1+rpi1+deb11u10 and 11.1+deb11u11 to produce 11.1+rpi1+deb11u11 --- aa3fb4e590339ade9919a3a7b23ef7e379267343 diff --cc debian/changelog index 748c706,e723d4d..b4bfae6 --- a/debian/changelog +++ b/debian/changelog @@@ -1,20 -1,8 +1,26 @@@ - base-files (11.1+rpi1+deb11u10) bullseye-staging; urgency=medium ++base-files (11.1+rpi1+deb11u11) bullseye-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 Sun, 30 Jun 2024 18:01:46 +0000 ++ -- Raspbian forward porter Thu, 05 Sep 2024 19:25:24 +0000 ++ + base-files (11.1+deb11u11) bullseye; urgency=medium + + * Change /etc/debian_version to 11.11, for Debian 11.11 point release. + + -- Santiago Vila Wed, 14 Aug 2024 18:05:00 +0200 base-files (11.1+deb11u10) bullseye; urgency=medium