school 6 images

branding.spec

-%define theme junior 
+%define theme junior
 %define Name School Junior
 %define codename none
 %define status %nil
 %define variants altlinux-office-desktop altlinux-office-server altlinux-desktop
-%define brand school 
+%define brand school
 
 Name: branding-%brand-%theme
 Version: 6.0.0

components.mk

@@ -28,7 +28,7 @@ boot:
 		convert images/boot.jpg -quality 97 -resize "$$size!" -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "$(STATUS)"' boot-$$size.jpg ;\
 	done
 	cp -al boot-800x600.jpg design-bootloader-source/data-boot/back.jpg
-	convert images/boot.jpg -resize "800x600!" -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "$(STATUS)"' design-bootloader-source/data-install/back.jpg
+	convert images/boot.png -resize "800x600!" -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "$(STATUS)"' design-bootloader-source/data-install/back.jpg
 #bootsplash
 	mkdir -p $(datadir)/plymouth/themes/$(THEME)
 	cp -al boot-800x600.jpg $(datadir)/plymouth/themes/$(THEME)/grub.jpg
@@ -36,7 +36,6 @@ boot:
 	cp -a components/bootsplash/* $(datadir)/plymouth/themes/$(THEME)
 	mv $(datadir)/plymouth/themes/$(THEME)/theme.plymouth $(datadir)/plymouth/themes/$(THEME)/$(THEME).plymouth
 #bootloader
-	subst 's/label:ALT/label:Simply/g' design-bootloader-source/src/dia_install.inc
 	DEFAULT_LANG='--lang-to-subst--' PATH=$(PATH):/usr/sbin make -C design-bootloader-source
 	install -d -m 755  $(sysconfdir)/../boot/splash/$(THEME)
 	install -d -m 755 $(datadir)/gfxboot/$(THEME)

components/ahttpd/images/steps/lilo.png

-grub.png
\ No newline at end of file