From ebb0832385c3fa7da64bb95872b72bc068322609 Mon Sep 17 00:00:00 2001 From: Jonathan Carter Date: Tue, 6 May 2025 16:21:03 +0200 Subject: [PATCH] Prepare for upload --- Makefile | 35 +++++++++++++- debian-logos/logo-text-version.svg | 75 ++++++++++++++++-------------- debian/changelog | 14 ++++++ debian/control | 2 +- debian/copyright | 6 ++- debian/postinst | 22 ++++++--- debian/prerm | 8 ++++ 7 files changed, 115 insertions(+), 47 deletions(-) diff --git a/Makefile b/Makefile index 4214b36..b23f328 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ -GRUB_THEMES=emerald-theme/grub\ +GRUB_THEMES=ceratopsian-theme/grub\ + emerald-theme/grub\ homeworld-theme/grub\ futureprototype-theme/grub\ moonlight-theme/grub\ @@ -289,7 +290,6 @@ install-local: install -d $(DESTDIR)/usr/share/desktop-base/emerald-theme cd $(DESTDIR)/usr/share/desktop-base/emerald-theme && ln -s /usr/share/plymouth/themes/emerald plymouth - ### Wallpapers install -d $(DESTDIR)/usr/share/desktop-base/emerald-theme/wallpaper/contents/images $(INSTALL_DATA) emerald-theme/wallpaper/metadata.json $(DESTDIR)/usr/share/desktop-base/emerald-theme/wallpaper @@ -314,6 +314,37 @@ install-local: install -d $(DESTDIR)/usr/share/wallpapers cd $(DESTDIR)/usr/share/wallpapers && ln -s /usr/share/desktop-base/emerald-theme/wallpaper emerald_wallpaper + # ceratopsian theme (Trixie’s default) + ### Plymouth theme + install -d $(DESTDIR)/usr/share/plymouth/themes/ceratopsian + $(INSTALL_DATA) $(wildcard ceratopsian-theme/plymouth/*) $(DESTDIR)/usr/share/plymouth/themes/ceratopsian + install -d $(DESTDIR)/usr/share/desktop-base/ceratopsian-theme + cd $(DESTDIR)/usr/share/desktop-base/ceratopsian-theme && ln -s /usr/share/plymouth/themes/ceratopsian plymouth + + ### Wallpapers + install -d $(DESTDIR)/usr/share/desktop-base/ceratopsian-theme/wallpaper/contents/images + $(INSTALL_DATA) ceratopsian-theme/wallpaper/metadata.json $(DESTDIR)/usr/share/desktop-base/ceratopsian-theme/wallpaper + $(INSTALL_DATA) ceratopsian-theme/wallpaper/gnome-background.xml $(DESTDIR)/usr/share/desktop-base/ceratopsian-theme/wallpaper + $(INSTALL_DATA) $(wildcard ceratopsian-theme/wallpaper/contents/images/*) $(DESTDIR)/usr/share/desktop-base/ceratopsian-theme/wallpaper/contents/images/ + $(INSTALL_DATA) ceratopsian-theme/gnome-wp-list.xml $(DESTDIR)/usr/share/gnome-background-properties/debian-ceratopsian.xml + # Wallpaper symlink for KDE + install -d $(DESTDIR)/usr/share/wallpapers + cd $(DESTDIR)/usr/share/wallpapers && ln -s /usr/share/desktop-base/ceratopsian-theme/wallpaper ceratopsian + + ### Login background + install -d $(DESTDIR)/usr/share/desktop-base/ceratopsian-theme/login + $(INSTALL_DATA) $(wildcard ceratopsian-theme/login/*) $(DESTDIR)/usr/share/desktop-base/ceratopsian-theme/login + + ### Lockscreen is using the same image as wallpaper + install -d $(DESTDIR)/usr/share/desktop-base/ceratopsian-theme/lockscreen/contents/images + $(INSTALL_DATA) ceratopsian-theme/wallpaper/metadata.json $(DESTDIR)/usr/share/desktop-base/ceratopsian-theme/lockscreen + $(INSTALL_DATA) ceratopsian-theme/wallpaper/gnome-background.xml $(DESTDIR)/usr/share/desktop-base/ceratopsian-theme/lockscreen + $(INSTALL_DATA) $(wildcard ceratopsian-theme/wallpaper/contents/images/*) $(DESTDIR)/usr/share/desktop-base/ceratopsian-theme/lockscreen/contents/images/ + + # Lock screen symlink for KDE + install -d $(DESTDIR)/usr/share/wallpapers + cd $(DESTDIR)/usr/share/wallpapers && ln -s /usr/share/desktop-base/ceratopsian-theme/wallpaper ceratopsian_wallpaper + # End ceratopsian theme # Moonlight theme ### Plymouth theme diff --git a/debian-logos/logo-text-version.svg b/debian-logos/logo-text-version.svg index 77b6630..714fb84 100644 --- a/debian-logos/logo-text-version.svg +++ b/debian-logos/logo-text-version.svg @@ -2,12 +2,12 @@ + inkscape:current-layer="g290" /> + id="g290" + style="fill:#1a1a1a"> + style="opacity:0.71;fill:#1a1a1a"> + style="fill:#1a1a1a" /> + style="fill:#1a1a1a" /> + style="fill:#1a1a1a" /> + style="fill:#1a1a1a" /> + style="fill:#1a1a1a" /> + style="fill:#1a1a1a" /> + style="fill:#1a1a1a" /> + style="fill:#1a1a1a" /> + style="fill:#1a1a1a" /> + style="fill:#1a1a1a" /> + style="fill:#1a1a1a" /> + style="fill:#1a1a1a" /> + id="g288" + style="fill:#1a1a1a"> + style="opacity:0.71;fill:#1a1a1a"> + style="fill:#1a1a1a" /> + style="fill:#1a1a1a" /> + style="fill:#1a1a1a" /> + style="fill:#1a1a1a" /> + style="fill:#1a1a1a" /> + style="fill:#1a1a1a" /> + style="fill:#1a1a1a" /> + id="g286" + style="fill:#1a1a1a"> + style="fill:#1a1a1a" /> + style="fill:#1a1a1a" /> diff --git a/debian/changelog b/debian/changelog index a57602b..ea3f07c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +desktop-base (13.0.1) unstable; urgency=medium + + * Initial integration of ceratopsian-theme + - Update copyright years + - Start work in ceratopsian-theme directory + - Update plymouth background + - Update GNOME metadata + - Update alternatives in postinst + - Update Makefile with new entries + * Update standards version to 4.7.2 + * Remove version from logo + + -- Jonathan Carter Tue, 06 May 2025 16:03:29 +0200 + desktop-base (13.0.0~pre1) unstable; urgency=medium [ Simon McVittie ] diff --git a/debian/control b/debian/control index e0d53e0..6bbc757 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Build-Depends: debhelper-compat (= 13), # For the number in debian-logo-text fonts-quicksand, Rules-Requires-Root: no -Standards-Version: 4.7.0 +Standards-Version: 4.7.2 Homepage: https://www.debian.org/devel/debian-desktop/ Vcs-Browser: https://salsa.debian.org/debian-desktop-team/desktop-base Vcs-Git: https://salsa.debian.org/debian-desktop-team/desktop-base.git diff --git a/debian/copyright b/debian/copyright index eaebfcd..b97b871 100644 --- a/debian/copyright +++ b/debian/copyright @@ -13,7 +13,7 @@ Copyright: 2002, Colin Walters 2012, Eshat Cakar 2012, Paul Tagliamonte 2014-2019, Aurélien COUDERC - 2012-2022, Jonathan Carter + 2012-2025, Jonathan Carter License: GPL-2+ Files: pixmaps/debian-security.png @@ -85,6 +85,10 @@ Copyright: 1999, Software in the Public Interest, Inc. 2018 Juliette Taka License: GPL-3+ or CC-BY-SA-3.0 +Files: ceratopsian-theme/* +Copyright: 2024 Elise Couper +License: GPL-2.0+ + License: CC-BY-SA-3.0 THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY diff --git a/debian/postinst b/debian/postinst index 03ab2d9..3e36b25 100644 --- a/debian/postinst +++ b/debian/postinst @@ -66,7 +66,8 @@ if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-remov desktop-theme \ /usr/share/desktop-base/$theme-theme $priority done << EOF -emerald 50 +ceratopsian 50 +emerald 40 homeworld 40 futureprototype 40 moonlight 40 @@ -91,7 +92,8 @@ EOF desktop-background \ /usr/share/desktop-base/$theme-theme/wallpaper/contents/images/$filename $priority done << EOF -emerald 1920x1080.svg 65 +ceratopsian 1920x1080.svg 65 +emerald 1920x1080.svg 50 homeworld 1920x1080.svg 50 futureprototype 1920x1080.svg 50 moonlight 1920x1080.svg 50 @@ -141,6 +143,7 @@ EOF desktop-background.xml \ /usr/share/desktop-base/$theme-theme/wallpaper/gnome-background.xml $priority done << EOF +ceratopsian 40 emerald 40 homeworld 30 futureprototype 30 @@ -168,7 +171,8 @@ EOF desktop-lockscreen.xml \ /usr/share/desktop-base/$theme-theme/lockscreen/gnome-background.xml $priority done << EOF -emerald 40 +ceratopsian 40 +emerald 30 homeworld 30 futureprototype 30 moonlight 30 @@ -193,7 +197,8 @@ EOF desktop-plasma5-wallpaper \ /usr/share/desktop-base/$theme-theme/wallpaper $priority done << EOF -emerald 40 +ceratopsian 40 +emerald 30 homeworld 30 futureprototype 30 moonlight 30 @@ -217,7 +222,8 @@ EOF desktop-login-background \ /usr/share/desktop-base/$theme-theme/login/$background $priority done << EOF -emerald background.svg 40 +ceratopsian background.svg 40 +emerald background.svg 30 homeworld background.svg 30 futureprototype background.svg 30 moonlight background.svg 30 @@ -268,8 +274,10 @@ EOF desktop-grub.sh \ /usr/share/desktop-base/$theme-theme/grub/grub_background.sh done << EOF -emerald 4x3 40 -emerald 16x9 40 +ceratopsian 4x3 40 +ceratopsian 16x9 40 +emerald 4x3 30 +emerald 16x9 30 homeworld 4x3 30 homeworld 16x9 30 futureprototype 4x3 30 diff --git a/debian/prerm b/debian/prerm index 6017fef..d266080 100644 --- a/debian/prerm +++ b/debian/prerm @@ -16,6 +16,7 @@ if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then desktop-background \ /usr/share/desktop-base/$theme-theme/wallpaper/contents/images/$filename done << EOF +ceratopsian 1920x1080.svg emerald 1920x1080.svg homeworld 1920x1080.svg futureprototype 1920x1080.svg @@ -59,6 +60,7 @@ EOF desktop-background.xml \ /usr/share/desktop-base/$theme-theme/wallpaper/gnome-background.xml done << EOF +ceratopsian emerald homeworld futureprototype @@ -81,6 +83,7 @@ EOF desktop-lockscreen.xml \ /usr/share/desktop-base/$theme-theme/lockscreen/gnome-background.xml done << EOF +ceratopsian emerald homeworld futureprototype @@ -102,6 +105,7 @@ EOF desktop-plasma5-wallpaper \ /usr/share/desktop-base/$theme-theme/wallpaper done << EOF +ceratopsian emerald homeworld futureprototype @@ -125,6 +129,7 @@ EOF desktop-login-background \ /usr/share/desktop-base/$theme-theme/login/$background done << EOF +ceratopsian background.svg emerald background.svg homeworld background.svg futureprototype background.svg @@ -146,6 +151,8 @@ EOF desktop-grub \ /usr/share/desktop-base/$theme-theme/grub/grub-$ratio.png done << EOF +ceratopsian 4x3 +ceratopsian 16x9 emerald 4x3 emerald 16x9 homeworld 4x3 @@ -189,6 +196,7 @@ EOF desktop-theme \ /usr/share/desktop-base/$theme-theme done << EOF +ceratopsian emerald futureprototype moonlight