Dark mode support for extra subpackage

Attribution-Extras

@@ -5,3 +5,10 @@ Author:  Fedora Design Team
 Contact: fedoradesign AT fedoraproject DOT org
 Licence: CC-BY-SA 4.0
 
+**** Light Blue ****
+====================
+File:    /usr/share/backgrounds/f36/extras/light-blue.png
+Author:  Fedora Design Team
+Contact: fedoradesign AT fedoraproject DOT org
+Licence: CC-BY_SA 4.0
+

Makefile

@@ -1,5 +1,5 @@
 SUBDIRS = default extras
-VERSION = 36.0.0
+VERSION = 36.0.2
 NAME =  f36-backgrounds-$(VERSION)
 
 all:

default/gnome-backgrounds-f36.xml

@@ -7,7 +7,7 @@
 	<filename-dark>/usr/share/backgrounds/f36/default/f36-02-night.png</filename-dark>
         <options>zoom</options>
         <shade_type>solid</shade_type>
-        <pcolor>#3c6eb4</pcolor>
+        <pcolor>#51a2da</pcolor>
         <scolor>#294172</scolor>
     </wallpaper>
 

extras/Makefile

@@ -8,42 +8,43 @@ INSTALL=/usr/bin/install -p -m644 -D
 LN_S=/bin/ln -s
 
 THEMES_JPG=
-THEMES_PNG=dark-blue
+THEMES_PNG=dark-blue\
+	light-blue
 
 all:
 
 install:
-	$(MKDIR) $(f36_DIR)/extras
+	$(MKDIR) $(F36_DIR)/extras
 	$(MKDIR) $(GNOME_BG_DIR)
 	$(MKDIR) $(MATE_BG_DIR)
 	$(MKDIR) $(XFCE_BG_DIR)
-	$(INSTALL) f36-extras.xml 				$(f36_DIR)/extras/f36-extras.xml
+	$(INSTALL) f36-extras.xml 				$(F36_DIR)/extras/f36-extras.xml
 	$(INSTALL) gnome-backgrounds-f36-extras.xml 	$(GNOME_BG_DIR)/f36-extras.xml
 	$(INSTALL) mate-backgrounds-f36-extras.xml 	$(MATE_BG_DIR)/f36-extras.xml
 	for theme in $(THEMES_JPG) ; do \
-	  $(INSTALL) $${theme}.jpg $(f36_DIR)/extras/$${theme}.jpg ;\
-	  $(MKDIR) $(KDE_BG_DIR)/f36_$${theme}/contents/images ;\
-	  $(INSTALL) $${theme}.desktop $(KDE_BG_DIR)/f36_$${theme}/metadata.desktop ; \
+	  $(INSTALL) $${theme}.jpg $(F36_DIR)/extras/$${theme}.jpg ;\
+	  $(MKDIR) $(KDE_BG_DIR)/F36_$${theme}/contents/images ;\
+	  $(INSTALL) $${theme}.desktop $(KDE_BG_DIR)/F36_$${theme}/metadata.desktop ; \
 	  for res in 1280x1024 \
 		     640x480 800x600 1024x768 1152x864 1200x900 1280x960 1440x1080 1600x1200 1600x1280 1920x1440 2048x1536 \
 		     800x480 1024x600 1152x720 1280x720 1280x768 1280x800 1366x768 1440x900 1680x1050 1920x1080 1920x1200 \
-		     2160x1440 2304x1440 2560x1440 2560x1600 2960x1440 3000x2000 3300x1800  3540x1440 3840x2160; do \
+		     2160x1440 2304x1440 2560x1440 2560x1600 2960x1440 3000x2000 3200x1800  3440x1440 3840x2160; do \
 	    $(LN_S) ../../../../backgrounds/f36/extras/$${theme}.jpg \
-	            $(KDE_BG_DIR)/f36_$${theme}/contents/images/$${res}.jpg ; \
+	            $(KDE_BG_DIR)/F36_$${theme}/contents/images/$${res}.jpg ; \
 	  done; \
-	  $(LN_S) ../../../backgrounds/f36/extras/$${theme}.jpg \
+	  $(LN_S) ../../backgrounds/f36/extras/$${theme}.jpg \
 			$(XFCE_BG_DIR)/f36-$${theme}.jpg ;\
 	done;
 	for theme in $(THEMES_PNG) ; do \
-	  $(INSTALL) $${theme}.png $(f36_DIR)/extras/$${theme}.png ;\
-	  $(MKDIR) $(KDE_BG_DIR)/f36_$${theme}/contents/images ;\
-	  $(INSTALL) $${theme}.desktop $(KDE_BG_DIR)/f36_$${theme}/metadata.desktop ; \
+	  $(INSTALL) $${theme}.png $(F36_DIR)/extras/$${theme}.png ;\
+	  $(MKDIR) $(KDE_BG_DIR)/F36_$${theme}/contents/images ;\
+	  $(INSTALL) $${theme}.desktop $(KDE_BG_DIR)/F36_$${theme}/metadata.desktop ; \
 	  for res in 1280x1024 \
 		     640x480 800x600 1024x768 1152x864 1200x900 1280x960 1440x1080 1600x1200 1600x1280 1920x1440 2048x1536 \
 		     800x480 1024x600 1152x720 1280x720 1280x768 1280x800 1366x768 1440x900 1680x1050 1920x1080 1920x1200 \
-		     2160x1440 2304x1440 2560x1440 2560x1600 2960x1440 3000x2000 3300x1800  3540x1440 3840x2160; do \
+		     2160x1440 2304x1440 2560x1440 2560x1600 2960x1440 3000x2000 3200x1800  3440x1440 3840x2160; do \
 	    $(LN_S) ../../../../backgrounds/f36/extras/$${theme}.png \
-	            $(KDE_BG_DIR)/f36_$${theme}/contents/images/$${res}.png ; \
+	            $(KDE_BG_DIR)/F36_$${theme}/contents/images/$${res}.png ; \
 	  done; \
 	  $(LN_S) ../../backgrounds/f36/extras/$${theme}.png \
 			$(XFCE_BG_DIR)/f36-$${theme}.png ;\

extras/dark-blue.desktop

@@ -1,11 +1,11 @@
 [Desktop Entry]
-Name=Dark Blue (F35 Supplemental)
+Name=Dark Blue (F36 Supplemental)
 
-X-KDE-PluginInfo-Name=Dark Blue (F35 Supplemental)
+X-KDE-PluginInfo-Name=Dark Blue (F36 Supplemental)
 X-KDE-PluginInfo-Author=Fedora Design Team
 X-KDE-PluginInfo-Email[email protected]
-X-KDE-PluginInfo-Name=F35
-X-KDE-PluginInfo-Version=35.0
+X-KDE-PluginInfo-Name=F36
+X-KDE-PluginInfo-Version=36.0
 X-KDE-PluginInfo-Website=https://fedoraproject.org/wiki/Design
 X-KDE-PluginInfo-Category=
 X-KDE-PluginInfo-Depends=
@@ -17,7 +17,7 @@ X-Plasma-API=5.0
 FallbackTheme=default
 
 [Wallpaper]
-defaultWallpaperTheme=F35
+defaultWallpaperTheme=F36
 defaultFileSuffix=.png
 defaultWidth=1920
 defaultHeight=1200

extras/generate-files.rb

@@ -1,9 +1,9 @@
 # dnf install rubygem-i18n html2text wget
 require "i18n"
 
-WNAME = 'f34'
-WNAME_FULL = 'F34'
-WVERSION = '34.0'
+WNAME = 'f36'
+WNAME_FULL = 'F36'
+WVERSION = '36.0'
 
 # load authors' info from prepared file
 authors = {}
@@ -105,6 +105,7 @@
     </wallpaper>
 
 EOF
+
 f_gnome_xml.puts wallpaper
 f_mate_xml.puts wallpaper
 
@@ -247,7 +248,7 @@ def prepare_image(orig, new)
 	    $(LN_S) ../../../../backgrounds/#{WNAME}/extras/$${theme}.jpg \\
 	            $(KDE_BG_DIR)/#{WNAME_FULL}_$${theme}/contents/images/$${res}.jpg ; \\
 	  done; \\
-	  $(LN_S) ../backgrounds/#{WNAME}/extras/$${theme}.jpg \\
+	  $(LN_S) ../../backgrounds/#{WNAME}/extras/$${theme}.jpg \\
 			$(XFCE_BG_DIR)/#{WNAME}-$${theme}.jpg ;\\
 	done;
 	for theme in $(THEMES_PNG) ; do \\
@@ -261,7 +262,7 @@ def prepare_image(orig, new)
 	    $(LN_S) ../../../../backgrounds/#{WNAME}/extras/$${theme}.png \\
 	            $(KDE_BG_DIR)/#{WNAME_FULL}_$${theme}/contents/images/$${res}.png ; \\
 	  done; \\
-	  $(LN_S) ../backgrounds/#{WNAME}/extras/$${theme}.png \\
+	  $(LN_S) ../../backgrounds/#{WNAME}/extras/$${theme}.png \\
 			$(XFCE_BG_DIR)/#{WNAME}-$${theme}.png ;\\
 	done;
 

extras/themes.list

@@ -1 +1,2 @@
 Dark Blue by Fedora Design Team, CC-BY-SA 4.0, png
+Light Blue by Fedora Design Team, CC-BY_SA 4.0, png