Merge remote branch 'cas/school-lite' into school-lite

branding.spec

-%define theme master
+%define theme lite
 %define codename none
 %define brand school
 %define Brand ALT Linux 
@@ -18,18 +18,10 @@ BuildRequires: libqt4-devel
 
 BuildRequires: ImageMagick fontconfig bc libGConf-devel
 
-<<<<<<< HEAD
-%define Theme Desktop
+%define Theme Lite 
 %define status beta
 %define status_en beta
-%define variants altlinux-office-desktop altlinux-office-server altlinux-lite altlinux-workbench school-master altlinux-gnome-desktop
-=======
-%define Theme Master 
-%define status  beta
-%define status_en beta
-%define variants altlinux-office-desktop altlinux-office-server altlinux-lite altlinux-workbench altlinux-desktop altlinux-gnome-desktop
->>>>>>> cas/school-master
-
+%define variants altlinux-desktop altlinux-office-desktop altlinux-office-server altlinux-lite altlinux-workbench school-master altlinux-gnome-desktop
 
 Source: branding.tar
 
@@ -75,9 +67,9 @@ Packager: Anton V. Boyarshiniv <boyarsh@altlinux.org>
 Provides: design-alterator-browser-%theme  branding-alt-%theme-browser-qt branding-altlinux-%theme-browser-qt
 Provides: alterator-icons design-alterator design-alterator-%theme
 Obsoletes:  branding-alt-%theme-browser-qt  branding-altlinux-%theme-browser-qt 
-
-Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-browser-qt ";done )
 Obsoletes: design-alterator-server design-alterator-desktop design-altertor-browser-desktop  design-altertor-browser-server 
+Obsoletes: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-browser-qt ";done )
+Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-alterator ";done )
 PreReq(post,preun): alternatives >= 0.2 alterator
 
 %description alterator
@@ -127,28 +119,17 @@ Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "brandi
 %description notes
 Distribution license and release notes
 
-%package kde4-settings
+%package xfce-settings
 
-Summary: KDE4 settings for %Brand %version %Theme
+Summary: XFCE settings for %Brand %version %Theme
 License: Distributable
-Group: Graphical desktop/KDE
-Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-kde4-settings ";done )
-PreReq: %name-graphics
-
-%description kde4-settings
-KDE4 settings for %Brand %version %Theme
+Group: Graphical desktop/XFce
+Requires: PolicyKit-gnome
+Obsoletes: xfce-settings-lite xfce-settings-school-lite
+Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-xfce-settings ";done )
 
-%package kde3-settings
-
-Summary: KDE3 settings for %Brand %version %Theme
-License: Distributable
-Group: Graphical desktop/KDE
-Requires: ksplash-engine-moodin
-PreReq: %name-graphics
-Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-kde3-settings ";done )
-
-%description kde3-settings
-KDE3 settings for %Brand %version %Theme
+%description xfce-settings
+XFCE settings for %Brand %version %Theme
 
 %package slideshow
 
@@ -223,35 +204,6 @@ pushd notes
 %makeinstall
 popd
 
-#kde4-settings
-pushd kde4-settings
-mkdir -p %buildroot%_sysconfdir/skel/.kde4
-cp -a kde4/* %buildroot%_sysconfdir/skel/.kde4/
-mkdir -p %buildroot%_sysconfdir/kde4/xdg/menus/applications-merged/
-install -m 644 menu/*menu %buildroot%_sysconfdir/kde4/xdg/menus/applications-merged/
-mkdir -p %buildroot/usr/share/desktop-directories/
-install -m 644 menu/*directory %buildroot/usr/share/desktop-directories/
-popd
-
-#kde3-settings
-pushd kde3-settings
-mkdir -p %buildroot%_sysconfdir/skel/.kde
-cp -a kde/* %buildroot%_sysconfdir/skel/.kde/
-mkdir -p %buildroot%_sysconfdir/skel/.kde/share
-mkdir -p %buildroot%_sysconfdir/skel/.kde/share/config
-mkdir -p %buildroot%_sysconfdir/skel/.kde/share/apps
-cp -a config/* %buildroot%_sysconfdir/skel/.kde/share/config/
-cp -a apps/* %buildroot%_sysconfdir/skel/.kde/share/apps/
-popd
-
-#kde3-splash
-pushd kde3-styles-splash
-mkdir -p "%buildroot/%_datadir/apps/ksplash/Themes/ALTLinux%Theme"
-install -m 644 *.jpg "%buildroot/%_datadir/apps/ksplash/Themes/ALTLinux%Theme/"
-install -m 644 *.png "%buildroot/%_datadir/apps/ksplash/Themes/ALTLinux%Theme/"
-install -m 644 *.rc "%buildroot/%_datadir/apps/ksplash/Themes/ALTLinux%Theme/"
-popd
-
 #slideshow
 mkdir -p %buildroot/usr/share/install2/slideshow
 install slideshow/*  %buildroot/usr/share/install2/slideshow/
@@ -267,6 +219,37 @@ touch %buildroot%_indexhtmldir/index.html
 install -m644 indexhtml.desktop %buildroot%_desktopdir/
 popd
 
+#xfce-settings
+pushd xfce-settings
+mkdir -p %buildroot/etc/skel/.config/xfce4/desktop
+mkdir -p %buildroot/etc/skel/.config/xfce4/mcs_settings
+mkdir -p %buildroot/etc/skel/.config/xfce4/panel
+mkdir -p %buildroot/etc/skel/.config/xfce4-session
+mkdir -p %buildroot/etc/skel/.config/autostart
+mkdir -p %buildroot/etc/skel/.local/share/applications
+mkdir -p %buildroot/etc/skel/Templates
+install -m 644 etcskel/Templates/* %buildroot/etc/skel/Templates/
+install -m 644 etcskel/.config/xfce4/helpers.rc %buildroot/etc/skel/.config/xfce4/
+install -m 644 etcskel/.config/xfce4/desktop/* %buildroot/etc/skel/.config/xfce4/desktop
+install -m 644 etcskel/.config/xfce4/mcs_settings/* %buildroot/etc/skel/.config/xfce4/mcs_settings
+install -m 644 etcskel/.config/xfce4/panel/* %buildroot/etc/skel/.config/xfce4/panel
+install -m 644 etcskel/.config/xfce4-session/* %buildroot/etc/skel/.config/xfce4-session/
+install -m 644 etcskel/.config/autostart/*  %buildroot/etc/skel/.config/autostart
+install -m 644 etcskel/.local/share/applications/*  %buildroot/etc/skel/.local/share/applications
+install -m 644 etcskel/.wm-select %buildroot/etc/skel/
+install -m 644 etcskel/.Xdefaults %buildroot/etc/skel/
+
+mkdir -p  %buildroot/usr/share/xfce4/backdrops
+install -m 644 ../graphics/backgrounds/default.png %buildroot/usr/share/xfce4/backdrops
+install -m 644 ../graphics/backgrounds/xdm.png %buildroot/usr/share/xfce4/backdrops
+mkdir -p  '%buildroot/usr/share/themes/ALTLinux-%Theme/gtk-2.0'
+install -m 644 themes/ALTLinux/gtk-2.0/* '%buildroot/usr/share/themes/ALTLinux-%Theme/gtk-2.0/'
+install -m 644 themes/ALTLinux/*.png '%buildroot/usr/share/themes/ALTLinux-%Theme/'
+
+mkdir -p %buildroot/%_bindir
+install -m 755 bin/* %buildroot/%_bindir
+popd
+
 #bootloader
 %pre bootloader
 [ -s /boot/splash/%theme ] && rm -fr  /boot/splash/%theme ||:
@@ -322,15 +305,6 @@ echo $lang > lang
 %files notes
 %_datadir/alt-notes/*
 
-%files kde4-settings
-%_sysconfdir/skel/.kde4
-%_sysconfdir/kde4/xdg/menus/applications-merged/*
-/usr/share/desktop-directories/*
-
-%files kde3-settings
-%_sysconfdir/skel/.kde
-%_datadir/apps/ksplash/Themes/*
-
 %files slideshow
 /usr/share/install2/slideshow
 

kde4-settings/kde4/share/config/plasma-appletsrc

-[AppletGlobals][plasma_applet_pager]
-rows=2
-
-[Containments][1]
-activity=
-backgroundmode=0
-desktop=-1
-formfactor=0
-immutability=1
-location=0
-plugin=folderview
-screen=0
-selected=
-wallpapercolor=224,223,222
-wallpaperplugin=image
-wallpaperpluginmode=SingleImage
-wallpaperposition=2
-zvalue=0
-
-[Containments][1][Wallpaper][image]
-slideTimer=600
-slidepaths=/usr/share/wallpapers/
-userswallpapers=/usr/share/design/current/backgrounds/default.png
-wallpaper=/usr/share/design/current/backgrounds/default.png
-wallpapercolor=56,111,150
-wallpaperposition=0
-
-[Containments][3]
-activity=
-desktop=-1
-formfactor=2
-immutability=1
-location=4
-plugin=panel
-screen=0
-zvalue=150
-
-[Containments][3][Applets][10]
-geometry=1800,3,32,32
-immutability=1
-plugin=trash
-zvalue=0
-
-
-
-[Containments][3][Applets][15][Configuration]
-iconUrls=file:///usr/share/applications/oowriter.desktop,file:///usr/share/applications/firefox.desktop,file:///usr/share/kde4/applications/kde4/dolphin.desktop
-
-
-[Containments][3][Applets][4]
-geometry=0,3,32,32
-immutability=1
-plugin=simplelauncher
-zvalue=0
-
-[Containments][3][Applets][4][Configuration]
-SwitchTabsOnHover=false
-
-[Containments][3][Applets][4][Shortcuts]
-global=Alt+F1
-
-[Containments][3][Applets][5]
-immutability=1
-geometry=1666,3,60,32
-plugin=notifier
-zvalue=0
-
-[Containments][3][Applets][6]
-geometry=36,3,100,32
-immutability=1
-plugin=pager
-zvalue=0
-
-[Containments][3][Applets][15]
-geometry=100,3,60,32
-immutability=1
-plugin=quicklaunch
-zvalue=0
-
-[Containments][3][Applets][6][Configuration]
-displayedText=0
-showWindowIcons=false
-
-[Containments][3][Applets][7]
-immutability=1
-plugin=tasks
-zvalue=0
-
-[Containments][3][Applets][8]
-geometry=1620,3,112,32
-immutability=1
-plugin=systemtray
-zvalue=0
-
-[Containments][3][Applets][8][Configuration]
-hidden=
-
-[Containments][3][Applets][8][Configuration][PopupApplet]
-DialogHeight=72
-DialogWidth=200
-
-[Containments][3][Applets][9]
-geometry=1738,3,64,32
-immutability=1
-plugin=digital-clock
-zvalue=0
-
-[Containments][3][Applets][9][Configuration]
-currentTimezone=Local
-plainClockColor=255,255,255
-plainClockFont=Sans,22,-1,5,50,0,0,0,0,0
-showDate=true
-showDay=false
-showSeconds=false
-showTimezone=false
-showYear=false
-timeZones=
-useCustomColor=false
-
-[Containments][3][Applets][9][Configuration][PopupApplet]
-DialogHeight=251
-DialogWidth=248
-
-
-[General]
-immutability=2

notes/release-notes.all.html.in

@@ -4,7 +4,7 @@
 </head>
 <body>
     <center><p>
-        Thank you for choosing ALT Linux 5.0 School Master!
+        Thank you for choosing ALT Linux 5.0 School Lite!
     </p></center>
     <p>
     You can learn more about features of this product at our official site:

notes/release-notes.ru.html.in

@@ -5,7 +5,7 @@
 	<TITLE></TITLE>
 </HEAD>
 <BODY>
-    <H2>Спасибо Вам за выбор Альт Линукс 5.0 Школьный Мастер!</H2>
+    <H2>Спасибо Вам за выбор Альт Линукс 5.0 Школьный Лёгкий!</H2>
     <p>
     На нашем официальном сайте
     <a href="http://www.altlinux.ru">www.altlinux.ru</a> вы можете

xfce-settings/etcskel/.config/xfce4/panel/launcher-11888137035.rc

@@ -3,12 +3,12 @@ Name=Текстовый процессор
 Exec=xfce4-wordprocessor
 Terminal=false
 StartupNotify=false
-Icon=/usr/share/icons/default/32x32/mimetypes/x-office-document.png
+Icon=/usr/share/icons/Tango/32x32/mimetypes/x-office-document.png
 
 [Entry 1]
 Name=Электронные таблицы
 Exec=xfce4-spreadsheet
 Terminal=false
 StartupNotify=false
-Icon=/usr/share/icons/default/32x32/mimetypes/x-office-spreadsheet.png
+Icon=/usr/share/icons/Tango/32x32/mimetypes/x-office-spreadsheet.png