From: Raspbian automatic forward porter Date: Thu, 21 May 2026 22:01:48 +0000 (+0100) Subject: Merge version 14+rpi1 and 14.0 to produce 14.0+rpi1 X-Git-Tag: archive/raspbian/14.0+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0b88df11c9516bc7512c3bbb40ed335733033b06;p=base-files.git Merge version 14+rpi1 and 14.0 to produce 14.0+rpi1 --- 0b88df11c9516bc7512c3bbb40ed335733033b06 diff --cc debian/changelog index f636404,c9ce9a7..fe2b08e --- a/debian/changelog +++ b/debian/changelog @@@ -1,20 -1,14 +1,32 @@@ - base-files (14+rpi1) forky-staging; urgency=medium ++base-files (14.0+rpi1) forky-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, 13 Jan 2026 17:12:49 +0000 ++ -- Raspbian forward porter Thu, 21 May 2026 22:01:48 +0000 ++ + base-files (14.0) unstable; urgency=medium + + * Do not ship the BSD license anymore. Closes: #1132426. + Thanks a lot to Bastian Germann. + * Update the Artistic license from perl_5.36.0.orig.tar.xz. + (Fixes old typo MERCHANTIBILITY -> MERCHANTABILITY). + * Drop "Rules-Requires-Root: no" (default). + * Update standards-version. + * Fine-tune salsa-ci.yml. + + -- Santiago Vila Mon, 11 May 2026 17:40:00 +0200 base-files (14) unstable; urgency=medium diff --cc debian/control index d182f48,8ce5ea8..38b9bcf --- a/debian/control +++ b/debian/control @@@ -2,11 -2,10 +2,10 @@@ Source: base-file Section: admin Priority: required Maintainer: Santiago Vila - Standards-Version: 4.7.2 + Standards-Version: 4.7.4 -Build-Depends: debhelper-compat (= 13), debhelper (>= 13.10~) +Build-Depends: debhelper-compat (= 13), debhelper (>= 13.10~), moreutils Vcs-Git: https://salsa.debian.org/sanvila/base-files.git Vcs-Browser: https://salsa.debian.org/sanvila/base-files - Rules-Requires-Root: no Package: base-files Provides: base, usr-is-merged