From 3ff0e8749dff099d13d99c5bac9db3720472b9f5 Mon Sep 17 00:00:00 2001 From: oxmc7769 Date: Wed, 11 Mar 2026 06:35:35 -0700 Subject: [PATCH] Fix a few branding things --- Makefile | 9 +---- debian/README.Debian | 46 +++++++++++------------ debian/README.Release | 2 +- debian/control | 14 +++---- debian/copyright | 4 +- debian/postinst | 11 +++++- debian/postrm | 4 ++ defaults/kde/etc/xdg/kickoffrc | 2 +- emblems-vesperos/Makefile | 2 +- vesperos-theme/plymouth/vesperos.plymouth | 8 ++-- 10 files changed, 53 insertions(+), 49 deletions(-) diff --git a/Makefile b/Makefile index 3c56c2f..2849d3f 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,7 @@ install-local: exit 1; \ fi - # VesperOS logo in circle as default user face icon + # VesperOS logo as default user face icon install -d $(DESTDIR)/etc/skel $(INSTALL_DATA) defaults/common/etc/skel/.face $(DESTDIR)/etc/skel cd $(DESTDIR)/etc/skel && ln -s .face .face.icon @@ -60,12 +60,6 @@ install-local: mkdir -p $(DESTDIR)/usr/share/pixmaps $(INSTALL_DATA) $(PIXMAPS) $(DESTDIR)/usr/share/pixmaps/ - - # Create a 'system-theme' symlink in plymouth themes folder, pointing at the - # plymouth theme for the currently active 'desktop-theme' alternative. - mkdir -p $(DESTDIR)/usr/share/plymouth/themes - ln -s ../../desktop-base/active-theme/plymouth $(DESTDIR)/usr/share/plymouth/themes/system-theme - # Set Plasma 5 customizations install -d $(DESTDIR)/etc/xdg/autostart $(INSTALL_DATA) defaults/kde/etc/xdg/kcm-about-distrorc $(DESTDIR)/etc/xdg @@ -90,7 +84,6 @@ install-local: # GNOME background descriptors mkdir -p $(DESTDIR)/usr/share/gnome-background-properties - # VesperOS theme (single default theme) ### Plymouth theme install -d $(DESTDIR)/usr/share/plymouth/themes/vesperos diff --git a/debian/README.Debian b/debian/README.Debian index 31298e1..a09ed3b 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -3,9 +3,9 @@ README for desktop-base 1. What’s provided 1.1. Themes packs - 1.2. ChillCraftOS logos - 1.2.1. ChillCraftOS logos icons - 1.2.2. ChillCraftOS logos images + 1.2. VesperOS logos + 1.2.1. VesperOS logos icons + 1.2.2. VesperOS logos images 1.3. Desktop files 1.4. Default configurations overrides 1.5. Plymouth boot splashes @@ -23,7 +23,7 @@ README for desktop-base 1.1. Theme packs -The Homeworld theme pack is currently provided as the default theme for ChillCraftOS. +The Homeworld theme pack is currently provided as the default theme for VesperOS. This theme contains customization for GRUB, Plymouth, login managers like SDDM and LightDM, wallpapers and lock screen for desktop environments like @@ -31,19 +31,19 @@ GNOME, KDE’s Plasma 5, Xfce, Mate… See below for how to switch between themes and a detailed description of the theme packs structure. -1.2. ChillCraftOS logos +1.2. VesperOS logos Three version of the logo are shipped as icons: -- emblem-system : the ChillCraftOS logo in it's original red-purple color -- emblem-system-symbolic: the ChillCraftOS logo in a black+transparent format that +- emblem-system : the VesperOS logo in it's original red-purple color +- emblem-system-symbolic: the VesperOS logo in a black+transparent format that desktop like GNOME can use and adapt the color depending on the context. -- emblem-system-white : the ChillCraftOS logo in white +- emblem-system-white : the VesperOS logo in white We also ship 3 versions of the logo as images: - logo : logo alone -- logo-text : logo + "ChillCraftOS" name -- logo-text-version: logo + "ChillCraftOS" name + ChillCraftOS version number +- logo-text : logo + "VesperOS" name +- logo-text-version: logo + "VesperOS" name + VesperOS version number All these images and logos are provided both in several bitmap resolutions (PNG) and also in vector form (SVG). @@ -73,7 +73,7 @@ The alternative has the following structure: emblem-vendor-symbolic.svg -> /etc/alternatives/emblem-vendor-symbolic-scalable emblem-vendor-white.svg -> /etc/alternatives/emblem-vendor-white-scalable -1.2.1. ChillCraftOS logos icons +1.2.1. VesperOS logos icons Several sizes of logo icons are shipped: 64, 128, 256 and scalable (svg) @@ -91,12 +91,12 @@ They can be found in: /usr/share/icons/hicolor/scalable/emblems/${emblem}.icon These will be removed after buster. -1.2.2. ChillCraftOS logos images +1.2.2. VesperOS logos images -The ChillCraftOS logo images are shipped in: +The VesperOS logo images are shipped in: /usr/share/desktop-base/os-logos/ -A ChillCraftOS security logo is also shipped in: +A VesperOS security logo is also shipped in: /usr/share/pixmaps/vesperos-security.png 1.3. Desktop files @@ -108,7 +108,7 @@ A ChillCraftOS security logo is also shipped in: 1.4. Default configurations overrides desktop-base ships different files to override default theme configurations -of various parts of the system and prefer the active ChillCraftOS theme. +of various parts of the system and prefer the active VesperOS theme. See below « How to switch themes » for directions on how to configure these overridden defaults. @@ -116,7 +116,7 @@ overridden defaults. /usr/share/desktop-base/grub_background.sh This alternative is used by /etc/grub.d/05_debian_theme provided by -grub-common to correctly update the GRUB background with the ChillCraftOS theme when +grub-common to correctly update the GRUB background with the VesperOS theme when running « update-grub ». - GNOME desktop wallpaper and lock screen: @@ -227,9 +227,9 @@ It defaults to the wallpaper and lock screen for the active theme selected via the desktop-theme alternative. - desktop-plasma5-wallpaper, alternative for: - /usr/share/wallpapers/ChillCraftOSTheme + /usr/share/wallpapers/VesperOSTheme - This alternative folder is used by Plasma 5 in ChillCraftOS to select the + This alternative folder is used by Plasma 5 in VesperOS to select the wallpaper for all users who didn’t otherwise select a wallpaper themselves. It defaults to the wallpaper of the active theme selected via the desktop-theme alternative. @@ -238,9 +238,9 @@ alternative. 3. Theme pack structure A certain theme pack structure is expected in order to provide drop-in -replacements for the default ChillCraftOS theme that can be switched globally with +replacements for the default VesperOS theme that can be switched globally with the desktop-theme alternative. This paragraph describes the structure to mimic -if you want to provide additional theme packs for ChillCraftOS. +if you want to provide additional theme packs for VesperOS. A theme pack should contain the following elements: @@ -329,8 +329,8 @@ A theme pack should contain the following elements: 4.1. Artists -We need professional looking ChillCraftOS artwork in the Desktop. If you want to -help improve themes in ChillCraftOS or provide additional theme proposals, you +We need professional looking VesperOS artwork in the Desktop. If you want to +help improve themes in VesperOS or provide additional theme proposals, you can contribute through our repository or contact us at contact@oxmc.me. If you’ve suggestions for a better artwork, create or edit the images and open @@ -359,7 +359,7 @@ Debian themes over the desktop environments available in the archive. 4.3. Notes and references -If you're interested in working on ChillCraftOS theming, you may be interested in +If you're interested in working on VesperOS theming, you may be interested in these references: - Repository: diff --git a/debian/README.Release b/debian/README.Release index 32b5553..7f71e05 100644 --- a/debian/README.Release +++ b/debian/README.Release @@ -3,7 +3,7 @@ repository is to create a branch on git.oxmc.me/Chillcraft/desktop-base, create and ask for the pull request to be reviewed on contact@oxmc.me. -For ChillCraftOS developers and maintainers doing the tag and publication work for +For VesperOS developers and maintainers doing the tag and publication work for the package, the preferred workflow is the following. - During development cycle: diff --git a/debian/control b/debian/control index afda802..0d720d7 100644 --- a/debian/control +++ b/debian/control @@ -1,8 +1,8 @@ Source: desktop-base Section: x11 Priority: optional -Maintainer: ChillCraftOS Desktop Team -Uploaders: ChillCraftOS Team +Maintainer: VesperOS Desktop Team +Uploaders: VesperOS Team Build-Depends: debhelper-compat (= 13), inkscape, librsvg2-bin, @@ -11,7 +11,7 @@ Build-Depends: debhelper-compat (= 13), fonts-quicksand, Rules-Requires-Root: no Standards-Version: 4.7.2 -Homepage: https://www.chillcraft.me/vesperos/ +Homepage: https://vesperos.chillcraft.me/ Vcs-Browser: https://git.oxmc.me/Chillcraft/desktop-base Vcs-Git: https://git.oxmc.me/Chillcraft/desktop-base.git @@ -22,10 +22,10 @@ Depends: librsvg2-common, fonts-quicksand, Recommends: plymouth-label Suggests: gnome | kde-standard | xfce4 | wmaker -Description: common files for the ChillCraftOS Desktop +Description: common files for the VesperOS Desktop This package contains various miscellaneous files which are used by - ChillCraftOS Desktop installations. Currently, it provides some - ChillCraftOS-related artwork and themes, .desktop files containing links to - ChillCraftOS related material (suitable for placement on a user's desktop), + VesperOS Desktop installations. Currently, it provides some + VesperOS-related artwork and themes, .desktop files containing links to + VesperOS related material (suitable for placement on a user's desktop), and other common files between the available desktop environments such as GNOME and KDE. diff --git a/debian/copyright b/debian/copyright index 24e04a5..d76880e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,5 +1,5 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Contact: ChillCraftOS Desktop Team +Upstream-Contact: VesperOS Desktop Team Source: https://git.oxmc.me/Chillcraft/desktop-base Files: * @@ -14,7 +14,7 @@ Copyright: 2002, Colin Walters 2012, Paul Tagliamonte 2014-2019, Aurélien COUDERC 2012-2025, Jonathan Carter - 2025, ChillCraftOS Team + 2025, VesperOS Team License: GPL-2+ Files: pixmaps/vesperos-security.png diff --git a/debian/postinst b/debian/postinst index 213bc4f..0f27ce2 100644 --- a/debian/postinst +++ b/debian/postinst @@ -129,13 +129,13 @@ EOF active_plasma_wallpaper=/usr/share/desktop-base/active-theme/wallpaper if [ -e ${active_plasma_wallpaper} ]; then update-alternatives --install \ - /usr/share/wallpapers/ChillCraftOSTheme \ + /usr/share/wallpapers/VesperOSTheme \ desktop-plasma5-wallpaper ${active_plasma_wallpaper} 50 fi # Alternatives for theme packages while read theme priority; do update-alternatives --install \ - /usr/share/wallpapers/ChillCraftOSTheme \ + /usr/share/wallpapers/VesperOSTheme \ desktop-plasma5-wallpaper \ /usr/share/desktop-base/$theme-theme/wallpaper $priority done << EOF @@ -219,6 +219,13 @@ EOF update-grub || echo "Updating grub failed, report success anyway!" fi + # Plymouth theme + update-alternatives --install \ + /usr/share/plymouth/themes/default.plymouth \ + default.plymouth \ + /usr/share/plymouth/themes/vesperos/vesperos.plymouth \ + 100 + if which update-initramfs > /dev/null; then update-initramfs -u fi diff --git a/debian/postrm b/debian/postrm index baec82d..7dc4e6c 100644 --- a/debian/postrm +++ b/debian/postrm @@ -5,6 +5,10 @@ set -e #DEBHELPER# if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then + update-alternatives --remove \ + default.plymouth \ + /usr/share/plymouth/themes/vesperos/vesperos.plymouth || true + if which update-grub2 > /dev/null ; then update-grub2 || true fi diff --git a/defaults/kde/etc/xdg/kickoffrc b/defaults/kde/etc/xdg/kickoffrc index ea3ad7f..3394944 100644 --- a/defaults/kde/etc/xdg/kickoffrc +++ b/defaults/kde/etc/xdg/kickoffrc @@ -1,2 +1,2 @@ [Branding] -Homepage=https://www.chillcraft.me/vesperos/ +Homepage=https://vesperos.chillcraft.me/ diff --git a/emblems-vesperos/Makefile b/emblems-vesperos/Makefile index 3477809..53fc4b1 100644 --- a/emblems-vesperos/Makefile +++ b/emblems-vesperos/Makefile @@ -40,7 +40,7 @@ install: install -d $${RES_DIR} ; \ done install -d $(DESTDIR)/$(TARGET_VENDOR)/scalable/emblems - ln -sf ../../desktop-base/scalable/emblems/emblem-vesperos.svg \ + ln -sf /usr/share/icons/desktop-base/scalable/emblems/emblem-vesperos.svg \ $(DESTDIR)/$(TARGET_VENDOR)/scalable/emblems/emblem-vendor.svg # Install PNG icons for each resolution for RES in $(RESOLUTIONS) ; do \ diff --git a/vesperos-theme/plymouth/vesperos.plymouth b/vesperos-theme/plymouth/vesperos.plymouth index 09e956e..b1eb311 100644 --- a/vesperos-theme/plymouth/vesperos.plymouth +++ b/vesperos-theme/plymouth/vesperos.plymouth @@ -1,8 +1,8 @@ [Plymouth Theme] -Name=RecoveryOS -Description=RecoveryOS boot splash +Name=VesperOS +Description=VesperOS boot splash ModuleName=script [script] -ImageDir=/usr/share/plymouth/themes/recoveryos -ScriptFile=/usr/share/plymouth/themes/recoveryos/recoveryos.script +ImageDir=/usr/share/plymouth/themes/vesperos +ScriptFile=/usr/share/plymouth/themes/vesperos/vesperos.script