Merge remote branch 'boyarsh/school-junior' into school-junior

branding.spec

@@ -17,10 +17,10 @@ BuildRequires: libqt4-devel
 
 BuildRequires: ImageMagick fontconfig bc libGConf-devel
 
-%define Theme Junior
+%define Theme Junior 
 %define status beta
 %define status_en beta
-%define variants altlinux-desktop altlinux-office-desktop altlinux-office-server altlinux-lite altlinux-workbench school-master altlinux-gnome-desktop
+%define variants altlinux-office-desktop altlinux-office-server altlinux-lite altlinux-workbench altlinux-desktop altlinux-gnome-desktop
 
 Packager: Alexandra Panyukova <mex3@altlinux.ru>
 
@@ -114,7 +114,7 @@ Obsoletes: alt-license-%theme alt-notes-%theme
 Summary: Distribution license and release notes
 License: Distributable
 Group: Documentation
-Conflicts: alt-notes-children alt-notes-hpc alt-notes-junior alt-notes-junior-sj alt-notes-junior-sm alt-notes-school-server alt-notes-server-lite alt-notes-skif alt-notes-terminal 
+Conflicts: alt-notes-children alt-notes-hpc alt-notes-junior-sj alt-notes-junior-sm alt-notes-school-server alt-notes-server-lite alt-notes-skif alt-notes-terminal 
 Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-notes ";done )
 
 %description notes
@@ -241,7 +241,6 @@ echo $lang > lang
 [ "$lang" = "C" ] || echo lang | cpio -o --append -F message
 
 
-
 %preun bootloader
 [ $1 = 0 ] || exit 0
 [ "`readlink /boot/splash/message`" != "%theme/message" ] ||
@@ -294,7 +293,6 @@ echo $lang > lang
 %_indexhtmldir/*
 %_desktopdir/*
 
-
 %changelog
 * Tue Oct 20 2009 Alexandra Panyukova <mex3@altlinux.org> 5.0.0-alt28
 - new wallpapers
@@ -327,9 +325,10 @@ echo $lang > lang
 
 * Mon Aug 17 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0.0-alt20
 - new images and colors
+- license and release-notes changed
 
 * Fri Aug 14 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0.0-alt19
-- menu customizaton (first try)
+- junior version
 
 * Thu Jun 25 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0.0-alt18
 - merge with master