Split kali-theme into multiple top-level directories

That way every "part" that needs to be provided is visible as a
top-level directory and we can document in which context each directory
is used.

Grub-Background/kali/Makefile

@@ -10,8 +10,8 @@ clean:
 	rm -f grub-4x3.png grub-16x9.png
 
 install:
-	install -d $(DESTDIR)/$(dir)
-	$(INSTALL) $(wildcard *.png *.sh) $(DESTDIR)/$(dir)
+	# Do nothing, installed by top-level makefile into desktop-base
+	# directory
 
 grub-4x3.png: grub-4x3.svg
 	rsvg-convert $< > $@

Makefile

@@ -1,69 +1,29 @@
-GRUB_THEMES=kali-theme/grub
-DEFAULT_BACKGROUND=desktop-background
-VENDOR_LOGOS=kali-logos
+SUBDIRS=Grub-Background/kali emblems kali-logos
 
-PIXMAPS=$(wildcard pixmaps/*.png)
-DESKTOPFILES=$(wildcard *.desktop)
+build:
+	$(foreach SUBDIR,$(SUBDIRS),make -C $(SUBDIR) build &&) true
+	# We populate desktop-base subdirectory with stuff to be installed into
+	# kali-desktop-base in the file structure expected by desktop-base
+	rm -rf desktop-base
+	mkdir -p desktop-base/kali-theme/grub
+	cp Grub-Background/kali/*.png Grub-Background/kali/*.sh desktop-base/kali-theme/grub/
+	cp -a LockScreen/kali desktop-base/kali-theme/lockscreen
+	cp -a Wallpapers/kali desktop-base/kali-theme/wallpaper
+	cp -a LoginScreen/kali desktop-base/kali-theme/login
+	ln -s /usr/share/plymouth/themes/kali desktop-base/kali-theme/plymouth
 
-.PHONY: all clean install install-local
-all: build-grub build-emblems build-logos
-clean: clean-grub clean-emblems clean-logos
+clean:
+	$(foreach SUBDIR,$(SUBDIRS),make -C $(SUBDIR) clean &&) true
+	rm -rf desktop-base/*
 
-.PHONY: build-grub clean-grub install-grub
-build-grub clean-grub install-grub:
-	@target=`echo $@ | sed s/-grub//`; \
-	for grub_theme in $(GRUB_THEMES) ; do \
-		if [ -f $$grub_theme/Makefile ] ; then \
-			$(MAKE) $$target -C $$grub_theme || exit 1; \
-		fi \
-	done
-
-.PHONY: build-emblems clean-emblems install-emblems
-build-emblems clean-emblems install-emblems:
-	@target=`echo $@ | sed s/-emblems//`; \
-	$(MAKE) $$target -C emblems-debian || exit 1;
-
-.PHONY: build-logos clean-logos install-logos
-build-logos clean-logos install-logos:
-	@target=`echo $@ | sed s/-logos//`; \
-	for vendor_logos in $(VENDOR_LOGOS); do \
-		$(MAKE) $$target -C $$vendor_logos || exit 1; \
-	done
-
-
-install: install-grub install-emblems install-logos install-local
-
-install-local:
-	mkdir -p $(DESTDIR)/usr/share/gnome-background-properties
-
-	# Kali theme
-	### Plymouth theme
-	install -d $(DESTDIR)/usr/share/plymouth/themes/kali
-	$(INSTALL) $(wildcard kali-theme/plymouth/*) $(DESTDIR)/usr/share/plymouth/themes/kali
-	install -d $(DESTDIR)/usr/share/desktop-base/kali-theme
-	cd $(DESTDIR)/usr/share/desktop-base/kali-theme && ln -s /usr/share/plymouth/themes/kali plymouth
-	$(INSTALL) kali-theme/plymouthd.defaults $(DESTDIR)/usr/share/desktop-base/kali-theme
-	### Login background
-	install -d $(DESTDIR)/usr/share/desktop-base/kali-theme/login
-	$(INSTALL) $(wildcard kali-theme/login/*) $(DESTDIR)/usr/share/desktop-base/kali-theme/login
-
-	### Wallpapers
-	install -d $(DESTDIR)/usr/share/desktop-base/kali-theme/wallpaper/contents/images
-	$(INSTALL) kali-theme/wallpaper/metadata.desktop $(DESTDIR)/usr/share/desktop-base/kali-theme/wallpaper
-	$(INSTALL) kali-theme/wallpaper/gnome-background.xml $(DESTDIR)/usr/share/desktop-base/kali-theme/wallpaper
-	$(INSTALL) $(wildcard kali-theme/wallpaper/contents/images/*) $(DESTDIR)/usr/share/desktop-base/kali-theme/wallpaper/contents/images/
-	$(INSTALL) kali-theme/gnome-wp-list.xml $(DESTDIR)/usr/share/gnome-background-properties/debian-kali.xml
-	# Wallpaper symlink for KDE
+install:
+	# We use debhelper to install most files, but some subdirectories
+	# install files by themselves
+	$(foreach SUBDIR,$(SUBDIRS),make -C $(SUBDIR) install &&) true
+	# And we need a few supplementary symlinks for good integration
+	# KDE looks into /usr/share/wallpapers
 	install -d $(DESTDIR)/usr/share/wallpapers
 	cd $(DESTDIR)/usr/share/wallpapers && ln -s /usr/share/desktop-base/kali-theme/wallpaper Kali
-
-	### Lockscreen
-	install -d $(DESTDIR)/usr/share/desktop-base/kali-theme/lockscreen/contents/images
-	$(INSTALL) kali-theme/lockscreen/metadata.desktop $(DESTDIR)/usr/share/desktop-base/kali-theme/lockscreen
-	$(INSTALL) kali-theme/lockscreen/gnome-background.xml $(DESTDIR)/usr/share/desktop-base/kali-theme/lockscreen
-	$(INSTALL) $(wildcard kali-theme/lockscreen/contents/images/*) $(DESTDIR)/usr/share/desktop-base/kali-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/kali-theme/lockscreen KaliLockScreen
 
 include Makefile.inc

README.md

@@ -1 +1,41 @@
-# kali-themes
+# kali-themes
+
+This package joins together files that were split across gnome-theme-kali,
+kali-defaults and desktop-base.
+
+The file structure has been revamped to make it easier to see everything
+that needs to be provided.
+
+## desktop-base integration
+
+To create a new theme that integrates well into desktop-base, you need to
+provide appropriate files in the following directories:
+
+* Wallpapers: background images in different resolutions with GNOME and
+  KDE meta-information.
+* Gnome-Backgrounds: an XML file defining available wallpapers.
+* Grub-Background: grub background image and other associated settings
+  used by the default grub menu.
+* LockScreen: wallpapers used by the screenlocker
+* LoginScreen: wallpaper used on the login screen (GDM at least)
+* Plymouth-Theme: theme used by plymouth (boot splash screen)
+
+The following directories are also used by desktop-base but they don't
+need any change for a new theme as the Kali logo and emblems are unlikely
+to need any modification:
+* emblems
+* kali-logos
+
+## Other integrations
+
+* Color-Schemes: color schemes for various applications and widgets
+* Window-Theme: Desktop/GTK themes
+* Icon-Theme: various icon sets
+* Grub-Theme: theme for Grub
+
+## TODO
+
+* The "Backgrounds" directory needs to be replaced with proper
+  "Wallpapers".
+* We should see whether the "Grub-Theme" directory can be folded
+  into "Grub-Background" in some way.

debian/kali-themes-common.install

@@ -3,10 +3,11 @@ Color-Schemes/* usr/share/
 Icon-Theme/* usr/share/icons/
 Window-Theme/* usr/share/themes/
 Grub-Theme/* boot/grub/themes/
-Plymouth-Theme/* usr/share/plymouth/themes
-usr/share/desktop-base/
-usr/share/icons/
-usr/share/plymouth/
-usr/share/gnome-background-properties/
-usr/share/wallpapers/
+Plymouth-Theme/* usr/share/plymouth/themes/
+Gnome-Backgrounds/* usr/share/gnome-background-properties/
+desktop-base/* usr/share/desktop-base/
 xfce/xsettings.xml usr/share/kali-themes-common/
+# Those are created by "make install"
+usr/share/desktop-base/kali-logos/
+usr/share/icons/
+usr/share/wallpapers/

kali-theme/plymouthd.defaults

@@ -1,4 +0,0 @@
-# Defaults provided by desktop-base for the kali theme
-[Daemon]
-Theme=kali
-ShowDelay=0