[Merge] ~vorlon/casper:cleanup into casper:main
Steve Langasek
mp+452496 at code.launchpad.net
Tue Oct 10 04:53:56 UTC 2023
Diff comments:
> diff --git a/debian/changelog b/debian/changelog
> index c131f39..1bdc544 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,8 +1,45 @@
> casper (1.485) UNRELEASED; urgency=medium
>
> +<<<<<<< debian/changelog
yes; I'm not going to bother chasing trunk with periodic rebases, they can just be handled as necessary during the final merge.
> * Text-only fixes.
>
> -- Steve Langasek <steve.langasek at ubuntu.com> Sat, 30 Sep 2023 22:24:30 -0700
> +=======
> + * Drop various initramfs scripts that are no longer needed:
> + - 07remove_oem_config: oem-config is only seeded in 'ship*' seeds, so
> + not installed in any live systems; therefore it never needs to be
> + removed.
> + - 16disable_gpt_auto_mount: gpt generator no longer shipped in systemd.
> + - 26serialtty: upstart-specific.
> + - 32disable_hibernation: now disabled in policykit-desktop-privileges in
> + desktop-common.
> + - 36disable_trackerd: trackerd no longer exists.
> + - 48kubuntu_disable_restart_notifications:
> + /usr/share/kubuntu-default-settings/kde4-profile/ no longer exists,
> + if this is still needed it needs to be implemented differently.
> + - 49kubuntu_mobile_session: kubuntu-mobile-default-settings is obsolete.
> + - 50ubiquity-bluetooth-agent: bluetooth-applet no longer exists.
> + - 51unity8_wizard: unity8 no longer exists (ubuntu-unity is unity 7).
> + * 12fstab: /etc/rcS.d/S*checkroot.sh is obsolete, no need to remove.
> + * 15autologin: remove obsolete fix-up specific to kubuntu-active.
> + * 15autologin: remove obsolete fix-up for
> + /usr/share/xsessions/QLubuntu.desktop.
> + * 18hostname: don't invoke hostname here, it will be set from the rootfs
> + at boot anyway.
> + * 25adduser: drop code for Ubuntu MID, which was obsolete before Lucid
> + released in 2010.
> + * 25configure_init: drop code specific to sysvinit, upstart, and
> + ureadahead.
> + * 31disable_update_notifier: drop handling of obsolete adept_notifier.
> + * 34disable_kde_services: don't try to remove obsolete desktop files.
> + * 35fix_language_selector: drop references to obsolete fontconfig-voodoo.
> + * 35fix_language_selector:
> + /usr/share/applications/language-selector.desktop no longer exists, but
> + /usr/share/budgie-desktop/applications/language-selector.desktop does,
> + so apply our fix there
> +
> + -- Steve Langasek <steve.langasek at ubuntu.com> Sat, 30 Sep 2023 16:52:05 -0700
> +>>>>>>> debian/changelog
>
> casper (1.484) mantic; urgency=medium
>
> diff --git a/scripts/casper-bottom/35fix_language_selector b/scripts/casper-bottom/35fix_language_selector
> index 96ea67c..cbad6a9 100755
> --- a/scripts/casper-bottom/35fix_language_selector
> +++ b/scripts/casper-bottom/35fix_language_selector
> @@ -20,15 +20,12 @@ esac
>
> log_begin_msg "$DESCRIPTION"
>
> -if [ -e /rofs/usr/share/applications/language-selector.desktop ]; then
> +if [ -e /rofs/usr/share/budgie-desktop/applications/language-selector.desktop ]
> +then
> sed '/^Exec/ s|/usr/bin/gnome-language-selector|& -n|' \
> - /rofs/usr/share/applications/language-selector.desktop \
> - > /root/usr/share/applications/language-selector.desktop
> + /rofs/usr/share/budgie-desktop/applications/language-selector.desktop \
> + > /root/usr/share/budgie-desktop/applications/language-selector.desktop
It does work. Note carefully the file paths, the source and destination are not the same.
>
> fi
>
> -if [ -x /root/usr/bin/fontconfig-voodoo ]; then
> - chroot /root fontconfig-voodoo --auto --quiet || true
> -fi
> -
> log_end_msg
--
https://code.launchpad.net/~vorlon/casper/+git/casper/+merge/452496
Your team Unity7 Maintainers Team is requested to review the proposed merge of ~vorlon/casper:cleanup into casper:main.
More information about the Ubuntu-reviews
mailing list