diff -pruN 14.0.0~pre2/debian/changelog 14.0.0~pre2ubuntu1/debian/changelog --- 14.0.0~pre2/debian/changelog 2025-08-17 21:33:02.000000000 +0000 +++ 14.0.0~pre2ubuntu1/debian/changelog 2025-10-22 04:35:45.000000000 +0000 @@ -1,3 +1,10 @@ +desktop-base (14.0.0~pre2ubuntu1) resolute; urgency=medium + + * Merge from Debian Unstable. Remaining changes: + - debian/postinst, debian/prerm: Don't apply Debian branding for GRUB + + -- Rik Mills Wed, 22 Oct 2025 05:35:45 +0100 + desktop-base (14.0.0~pre2) unstable; urgency=medium [ Simon McVittie ] @@ -20,6 +27,13 @@ desktop-base (14.0.0~pre1) unstable; urg -- Aurélien COUDERC Mon, 11 Aug 2025 12:29:08 +0200 +desktop-base (13.0.3ubuntu1) questing; urgency=medium + + * Merge from Debian Unstable. Remaining changes: + - debian/postinst, debian/prerm: Don't apply Debian branding for GRUB + + -- Rik Mills Sat, 31 May 2025 10:36:43 +0100 + desktop-base (13.0.3) unstable; urgency=medium * Fix incongruous black background in logo-text.svg and @@ -36,6 +50,13 @@ desktop-base (13.0.3) unstable; urgency= -- Aurélien COUDERC Fri, 30 May 2025 14:30:31 +0200 +desktop-base (13.0.2ubuntu1) questing; urgency=medium + + * Merge from Debian Unstable. Remaining changes: + - debian/postinst, debian/prerm: Don't apply Debian branding for GRUB + + -- Rik Mills Thu, 22 May 2025 15:52:39 +0100 + desktop-base (13.0.2) unstable; urgency=medium * Use new version of logo-text.svg that renders in rsvg @@ -56,6 +77,13 @@ desktop-base (13.0.1) unstable; urgency= -- Jonathan Carter Tue, 06 May 2025 16:03:29 +0200 +desktop-base (13.0.0~pre1ubuntu1) plucky; urgency=medium + + * Merge from Debian Unstable. Remaining changes: + - debian/postinst, debian/prerm: Don't apply Debian branding for GRUB + + -- Simon Quigley Thu, 21 Nov 2024 16:31:47 -0600 + desktop-base (13.0.0~pre1) unstable; urgency=medium [ Simon McVittie ] diff -pruN 14.0.0~pre2/debian/control 14.0.0~pre2ubuntu1/debian/control --- 14.0.0~pre2/debian/control 2025-05-23 09:26:01.000000000 +0000 +++ 14.0.0~pre2ubuntu1/debian/control 2025-05-31 09:36:43.000000000 +0000 @@ -1,7 +1,8 @@ Source: desktop-base Section: x11 Priority: optional -Maintainer: Debian Desktop Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Desktop Team Uploaders: Yves-Alexis Perez , Aurélien COUDERC , Jonathan Carter diff -pruN 14.0.0~pre2/debian/postinst 14.0.0~pre2ubuntu1/debian/postinst --- 14.0.0~pre2/debian/postinst 2025-05-23 09:26:01.000000000 +0000 +++ 14.0.0~pre2ubuntu1/debian/postinst 2025-05-22 14:49:40.000000000 +0000 @@ -239,80 +239,26 @@ EOF # Favor widescreen / hi-res background for efi installations detected # by the presence of grub-efi* packages (not the grub-efi*-bin which don’t # necessary account for grub being the active bootloader). - if dpkg-query --list grub-efi* | grep -v "^... grub-efi[^[:space:]]*-bin" | grep -q "^[ih][HUFWti] " ; then - echo "grub-efi* packages found, using 16/9 as default grub background ratio" - grub_first_ratio="16x9" - grub_second_ratio="4x3" - else - echo "No grub-efi* package found, using 4/3 as default grub background ratio" - grub_first_ratio="4x3" - grub_second_ratio="16x9" - fi - active_grub_background=/usr/share/desktop-base/active-theme/grub/grub_background.sh - active_grub_first_ratio=/usr/share/desktop-base/active-theme/grub/grub-${grub_first_ratio}.png - if [ -e ${active_grub_first_ratio} ] && [ -e ${active_grub_background} ]; then - update-alternatives --install \ - /usr/share/images/desktop-base/desktop-grub.png \ - desktop-grub ${active_grub_first_ratio} 50 \ - --slave /usr/share/desktop-base/grub_background.sh \ - desktop-grub.sh ${active_grub_background} - fi - active_grub_second_ratio=/usr/share/desktop-base/active-theme/grub/grub-${grub_second_ratio}.png - if [ -e ${active_grub_second_ratio} ] && [ -e ${active_grub_background} ]; then - update-alternatives --install \ - /usr/share/images/desktop-base/desktop-grub.png \ - desktop-grub ${active_grub_second_ratio} 45 \ - --slave /usr/share/desktop-base/grub_background.sh \ - desktop-grub.sh ${active_grub_background} - fi - # Alternatives for theme packages - while read theme ratio priority; do - update-alternatives --install /usr/share/images/desktop-base/desktop-grub.png \ - desktop-grub \ - /usr/share/desktop-base/$theme-theme/grub/grub-$ratio.png $priority \ - --slave /usr/share/desktop-base/grub_background.sh \ - desktop-grub.sh \ - /usr/share/desktop-base/$theme-theme/grub/grub_background.sh - done << EOF -ceratopsian 4x3 40 -ceratopsian 16x9 40 -emerald 4x3 30 -emerald 16x9 30 -homeworld 4x3 30 -homeworld 16x9 30 -futureprototype 4x3 30 -futureprototype 16x9 30 -moonlight 4x3 30 -moonlight 16x9 30 -softwaves 4x3 30 -softwaves 16x9 30 -lines 4x3 30 -lines 16x9 30 -joy 4x3 30 -joy 16x9 30 -spacefun 4x3 30 -spacefun 16x9 30 -EOF # Apply GRUB background update into /boot # Try detecting active grub packages (so not -doc, -common, -bin) as a hint # that GRUB is being used as bootloader before calling update-grub. # Some people use the *-bin packages without using GRUB as bootloader # (see #851893 for more context). - if dpkg-query --list "grub-*" | grep -v "^... grub\(-common\|-emu\|[^[:space:]]*\(-bin\|-doc\)\)" | grep -q "^[ih][HUFWti] " \ - && which update-grub > /dev/null ; then +# if dpkg-query --list "grub-*" | grep -v "^... grub\(-common\|-emu\|[^[:space:]]*\(-bin\|-doc\)\)" | grep -q "^[ih][HUFWti] " \ +# && which update-grub > /dev/null ; then # Ensure the background image file has actually been written to disc # before updating. - sync +# sync # Report success whatever grub return status. This is needed at least # in live systems fon installation to succeed (see #850601). # Until we find a better solution like detecting we’re in a live image # and not calling update-grub at all. - update-grub || echo "Updating grub failed, report success anyway!" - fi +# update-grub || echo "Updating grub failed, report success anyway!" +# fi - if which update-initramfs > /dev/null; then - update-initramfs -u - fi +# if which update-initramfs > /dev/null; then +# update-initramfs -u +# fi fi diff -pruN 14.0.0~pre2/debian/prerm 14.0.0~pre2ubuntu1/debian/prerm --- 14.0.0~pre2/debian/prerm 2025-05-23 09:26:01.000000000 +0000 +++ 14.0.0~pre2ubuntu1/debian/prerm 2025-05-22 14:47:46.000000000 +0000 @@ -145,51 +145,6 @@ EOF desktop-login-background \ /usr/share/desktop-base/active-theme/login/background.svg - # Remove GRUB background alternatives - while read theme ratio; do - update-alternatives --remove \ - desktop-grub \ - /usr/share/desktop-base/$theme-theme/grub/grub-$ratio.png - done << EOF -ceratopsian 4x3 -ceratopsian 16x9 -emerald 4x3 -emerald 16x9 -homeworld 4x3 -homeworld 16x9 -futureprototype 4x3 -futureprototype 16x9 -moonlight 4x3 -moonlight 16x9 -softwaves 4x3 -softwaves 16x9 -lines 4x3 -lines 16x9 -joy 4x3 -joy 16x9 -spacefun 4x3 -spacefun 16x9 -EOF - ## *Lastly* remove *highest priority* alternative - num_grub_efi_installed=$(dpkg-query --list "grub-efi*" 2> /dev/null | grep "^i" | wc -l) - if [ $num_grub_efi_installed -gt 0 ] ; then - remove_first_ratio=4x3 - remove_last_ratio=16x9 - else - remove_first_ratio=16x9 - remove_last_ratio=4x3 - fi - update-alternatives --remove \ - desktop-grub.sh \ - /usr/share/desktop-base/active-theme/grub/grub_background.sh - update-alternatives --remove \ - desktop-grub \ - /usr/share/desktop-base/active-theme/grub/grub-$remove_first_ratio.png - update-alternatives --remove \ - desktop-grub \ - /usr/share/desktop-base/active-theme/grub/grub-$remove_last_ratio.png - - # Remove theme package alternatives while read theme; do update-alternatives --remove \