Merge remote-tracking branch 'boyarsh/centaurus' into kdesktop

Conflicts:
	branding.spec

branding.spec

@@ -2,7 +2,6 @@
 %define codename Centaurea Sadleriana
 %define brand altlinux
 %define Brand ALT Linux
-%define variants altlinux-desktop altlinux-office-desktop altlinux-office-server altlinux-lite altlinux-workbench school-master altlinux-gnome-desktop
 
 Name: branding-%brand-kdesktop
 Version: 6.0.0
@@ -14,8 +13,9 @@ BuildArch: noarch
 %define design_graphics_abi_major 12
 %define design_graphics_abi_minor 0
 %define design_graphics_abi_bugfix 0
-%define status БЕТА
-%define status_en BETA
+Name: branding-%brand-%theme
+Version: 6.0.0
+Release: alt13
 
 BuildRequires: cpio fonts-ttf-dejavu fonts-ttf-droid
 BuildRequires: design-bootloader-source >= 5.0-alt2
@@ -29,6 +29,10 @@ BuildRequires: libqt4-devel
 
 BuildRequires: ImageMagick fontconfig bc libGConf-devel
 
+%define status %nil
+%define status_en %nil
+%define variants altlinux-desktop altlinux-office-desktop altlinux-office-server altlinux-lite altlinux-workbench school-master altlinux-gnome-desktop
+
 Source: branding.tar
 
 Group: Graphics
@@ -406,6 +410,13 @@ subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf
 %_desktopdir/indexhtml.desktop
 
 %changelog
+* Mon May 23 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt8
+- dependence on altlinux-menus dropped
+
+* Sat May 07 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt7
+- beta status deleted
+- rebuild with design-bootloader-source 5.9-alt4
+
 * Thu Apr 28 2011 Sergey V Turchin <zerg@altlinux.org> 6.0.0-alt13
 - fix default background color