From 2ce24c53bfd076238f04d5349e988b9d693c7124 Mon Sep 17 00:00:00 2001 From: oxmc7769 Date: Fri, 3 Apr 2026 15:36:29 -0700 Subject: [PATCH] Split into per-variant packages; use upstream version 48.3.2 --- debian/changelog | 8 ++-- debian/control | 104 ++++++++++++++++++++++++++++++++++++++++++++--- debian/rules | 16 +++++--- 3 files changed, 113 insertions(+), 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6e9857d..f675797 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ -marble-shell-theme (26.1) vesperos; urgency=medium +marble-shell-theme (48.3.2) vesperos; urgency=medium - * VesperOS repackage of the Marble GNOME Shell theme. - * Installs all colour variants (red, yellow, green, blue, purple, gray) - in both light and dark mode to /usr/share/themes/. + * VesperOS repackage of Marble GNOME Shell theme 48.3.2. + * Split into per-variant packages (marble-shell-theme--). + * Added marble-shell-theme meta-package that installs all variants. -- VesperOS Desktop Team Fri, 03 Apr 2026 00:00:00 +0000 diff --git a/debian/control b/debian/control index 094a8ad..b8f9c51 100644 --- a/debian/control +++ b/debian/control @@ -8,11 +8,103 @@ Rules-Requires-Root: no Package: marble-shell-theme Architecture: all +Depends: ${misc:Depends}, + marble-shell-theme-blue-dark, + marble-shell-theme-blue-light, + marble-shell-theme-gray-dark, + marble-shell-theme-gray-light, + marble-shell-theme-green-dark, + marble-shell-theme-green-light, + marble-shell-theme-purple-dark, + marble-shell-theme-purple-light, + marble-shell-theme-red-dark, + marble-shell-theme-red-light, + marble-shell-theme-yellow-dark, + marble-shell-theme-yellow-light +Description: Marble GNOME Shell theme (all variants) + Meta-package that installs all Marble GNOME Shell theme colour variants + in both light and dark modes. + +Package: marble-shell-theme-blue-dark +Architecture: all Depends: ${misc:Depends}, gnome-shell (>= 46) Recommends: gnome-shell-extension-user-themes -Description: Marble GNOME Shell theme for VesperOS - A modern, material-inspired GNOME Shell theme with multiple colour accents - and both light and dark modes. - . - Installs all standard colour variants (red, yellow, green, blue, purple, - gray) in both light and dark mode to /usr/share/themes/. +Description: Marble GNOME Shell theme - Blue Dark + The Marble GNOME Shell theme, blue colour accent, dark mode. + +Package: marble-shell-theme-blue-light +Architecture: all +Depends: ${misc:Depends}, gnome-shell (>= 46) +Recommends: gnome-shell-extension-user-themes +Description: Marble GNOME Shell theme - Blue Light + The Marble GNOME Shell theme, blue colour accent, light mode. + +Package: marble-shell-theme-gray-dark +Architecture: all +Depends: ${misc:Depends}, gnome-shell (>= 46) +Recommends: gnome-shell-extension-user-themes +Description: Marble GNOME Shell theme - Gray Dark + The Marble GNOME Shell theme, gray colour accent, dark mode. + +Package: marble-shell-theme-gray-light +Architecture: all +Depends: ${misc:Depends}, gnome-shell (>= 46) +Recommends: gnome-shell-extension-user-themes +Description: Marble GNOME Shell theme - Gray Light + The Marble GNOME Shell theme, gray colour accent, light mode. + +Package: marble-shell-theme-green-dark +Architecture: all +Depends: ${misc:Depends}, gnome-shell (>= 46) +Recommends: gnome-shell-extension-user-themes +Description: Marble GNOME Shell theme - Green Dark + The Marble GNOME Shell theme, green colour accent, dark mode. + +Package: marble-shell-theme-green-light +Architecture: all +Depends: ${misc:Depends}, gnome-shell (>= 46) +Recommends: gnome-shell-extension-user-themes +Description: Marble GNOME Shell theme - Green Light + The Marble GNOME Shell theme, green colour accent, light mode. + +Package: marble-shell-theme-purple-dark +Architecture: all +Depends: ${misc:Depends}, gnome-shell (>= 46) +Recommends: gnome-shell-extension-user-themes +Description: Marble GNOME Shell theme - Purple Dark + The Marble GNOME Shell theme, purple colour accent, dark mode. + +Package: marble-shell-theme-purple-light +Architecture: all +Depends: ${misc:Depends}, gnome-shell (>= 46) +Recommends: gnome-shell-extension-user-themes +Description: Marble GNOME Shell theme - Purple Light + The Marble GNOME Shell theme, purple colour accent, light mode. + +Package: marble-shell-theme-red-dark +Architecture: all +Depends: ${misc:Depends}, gnome-shell (>= 46) +Recommends: gnome-shell-extension-user-themes +Description: Marble GNOME Shell theme - Red Dark + The Marble GNOME Shell theme, red colour accent, dark mode. + +Package: marble-shell-theme-red-light +Architecture: all +Depends: ${misc:Depends}, gnome-shell (>= 46) +Recommends: gnome-shell-extension-user-themes +Description: Marble GNOME Shell theme - Red Light + The Marble GNOME Shell theme, red colour accent, light mode. + +Package: marble-shell-theme-yellow-dark +Architecture: all +Depends: ${misc:Depends}, gnome-shell (>= 46) +Recommends: gnome-shell-extension-user-themes +Description: Marble GNOME Shell theme - Yellow Dark + The Marble GNOME Shell theme, yellow colour accent, dark mode. + +Package: marble-shell-theme-yellow-light +Architecture: all +Depends: ${misc:Depends}, gnome-shell (>= 46) +Recommends: gnome-shell-extension-user-themes +Description: Marble GNOME Shell theme - Yellow Light + The Marble GNOME Shell theme, yellow colour accent, light mode. diff --git a/debian/rules b/debian/rules index a8705ed..ad0e45d 100755 --- a/debian/rules +++ b/debian/rules @@ -1,8 +1,6 @@ #!/usr/bin/make -f -PKG_DIR = $(CURDIR)/debian/marble-shell-theme -THEMES_DIR = $(PKG_DIR)/usr/share/themes -STAGING = $(CURDIR)/debian/staging +STAGING = $(CURDIR)/debian/staging %: dh $@ @@ -14,8 +12,16 @@ override_dh_auto_build: cd $(CURDIR) && HOME=$(STAGING) PATH=$(STAGING)/bin:$(PATH) python3 install.py --all override_dh_install: - mkdir -p $(THEMES_DIR) - cp -r $(STAGING)/.themes/Marble-* $(THEMES_DIR)/ + for variant in blue-dark blue-light gray-dark gray-light green-dark green-light \ + purple-dark purple-light red-dark red-light yellow-dark yellow-light; do \ + pkgdir=$(CURDIR)/debian/marble-shell-theme-$$variant; \ + themedir=$$pkgdir/usr/share/themes; \ + mkdir -p $$themedir; \ + color=$$(echo $$variant | sed 's/-dark//;s/-light//'); \ + mode=$$(echo $$variant | grep -o 'dark\|light'); \ + srcname=Marble-$$color-$$mode; \ + cp -r $(STAGING)/.themes/$$srcname $$themedir/; \ + done override_dh_auto_clean: rm -rf $(STAGING)