From 426e3be14e1862d0e2abd293bb5bc66d4b00183b Mon Sep 17 00:00:00 2001 From: CloudBuilder Date: Mon, 20 Sep 2021 21:32:33 +0000 Subject: [PATCH] Imported 2.738 No reason for CPC update specified. --- debian/changelog | 7 +++++++ live-build/auto/build | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0744d5c3..a79d77db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.738) impish; urgency=medium + + [ Thomas Bechtold ] + * Keep changelogs for native deb pkgs in minimized builds. LP: #1943114. + + -- Steve Langasek Mon, 20 Sep 2021 09:40:28 -0700 + livecd-rootfs (2.737) impish; urgency=medium * Generate source catalogs for the desktop canary build. diff --git a/live-build/auto/build b/live-build/auto/build index 3133972b..950d95db 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -188,8 +188,8 @@ path-exclude=/usr/share/doc/* # ... except copyright files ... path-include=/usr/share/doc/*/copyright -# ... and Debian changelogs -path-include=/usr/share/doc/*/changelog.Debian.* +# ... and Debian changelogs for native & non-native packages +path-include=/usr/share/doc/*/changelog.* EOF # Remove docs installed by bootstrap