Commit f28bdfea authored by Anton V. Boyarshinov's avatar Anton V. Boyarshinov

Merge branch 'alt-desktop' into altlinux-office-server

Conflicts: images/logo.gif
parents a81c5fbe fab56a4e
......@@ -19,6 +19,6 @@ all:
cp -al images/console.jpg bootsplash/images/bootsplash-800x600.jpg
convert -resize '640x480!' bootsplash/images/bootsplash-800x600.jpg bootsplash/images/bootsplash-640x480.jpg
# logo for web alterator
cp images/logo.gif alterator/images/
cp images/logo.png alterator/images/
#color scheme
mv kde3-settings/apps/kdisplay/color-schemes/scheme.kcsrc "kde3-settings/apps/kdisplay/color-schemes/@BRAND_FNAME@ @NAME@.kcsrc"
......@@ -9,7 +9,7 @@
Name: branding-%brand-%theme
Version: 5.0.0
Release: alt4
Release: alt5
BuildArch: noarch
BuildRequires: cpio gfxboot >= 4 fonts-ttf-dejavu
......@@ -289,6 +289,9 @@ echo $lang > lang
%_desktopdir/*
%changelog
* Wed Apr 01 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0.0-alt5
- logo in www design fixed
* Tue Mar 31 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0.0-alt4
- www design fixed
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment