konevsa/branding-alt-virtualization-one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

5.0.0-alt3

Browse Source 
- Added brand icon an Russian description for package.
This commit is contained in:
Denis Koryavov 2009-08-19 13:43:15 +04:00
parent b1331a9b8d
commit eb47aec5f4
9 changed files with 282 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

153
branding-simply-linux/bootloader/gfxboot.cfg.in.tmp Normal file
View File

@ -0,0 +1,153 @@
; Sections are read in the order given in base::layout, with section 'base'
; implicitly added at the end. If a config value is given more than once,
; the first entry wins.
;
; If a screen resolution can't be set, 640x480 is used as fallback (and
; section '640x480' added to the layout list).
;
; If the penguin screen is active, section 'penguin' is automatically added
; to the layout list.
;
; Color values: 24 bit RGB (e.g. 0xff0000 = red).
;
[base]
; theme name
theme=slinux
; other sections to read
layout=800x600,install
; penguin theme likelihood (in percent, -1 = auto)
penguin=0
; activate speech output
talk=0
; sound volume (0..100)
volume=70
; menu background transparency (0..255)
menu.transparency=0x20
; default font
font.normal=16x16.fnt
; main menu font
font.large=16x16.fnt
; background image
background=back.jpg
; max. visible main menu items
mainmenu.entries=8
; minimal main menu selection bar width
mainmenu.bar.minwidth=300
; main menu selection bar transparency (0..255)
mainmenu.bar.transparency=0
; main menu colors
mainmenu.bar.color=0x798491
mainmenu.normal.fg=0x000000
mainmenu.selected.fg=0xffffff
; boot option colors
bootopt.label.fg=0x000000
bootopt.text.fg=0x000000
; progress bar color
progress.bar.color=0xc8c9cb
; menu colors
menu.normal.bg=0x798491
menu.normal.fg=0x000000
menu.selected.bg=0xdfdfe0
menu.selected.fg=0x000000
; window colors
window.bg=0xd8deed
window.fg=0x000000
window.title.bg=0x5c96cc
window.title.fg=0x000000
window.title.error.bg=0xc00000
; help system colors
help.link.fg=0x909195
help.link.selected.fg=0xffffff
help.link.selected.bg=0x909195
help.highlight.fg=0x909195
; panel colors
panel.fg=0x000000
panel.title.fg=0x5c6570
panel.normal.fg=0x5c6570
panel.f-key.fg=0x000000
; default keymap (e.g. de_DE, czech)
keymap=
[800x600]
; screen size
screen.size=800,600
; upper left corner
mainmenu.pos=253,170
; boot option input field position
bootopt.pos=263,480
[640x480]
; screen size
screen.size=640,480
; upper left corner
mainmenu.pos=130,122
; boot option input field position
bootopt.pos=263,380
[install]
; show welcome animation
welcome=0
; beep when menu is ready
beep=1
; main menu item shown only if iso is tagged for media check
mediacheck=mediachk
; main menu items where user can't add boot options
nobootoptions=harddisk,memtest
; main menu items that are not passed an 'install' parameter
noinstallopt=harddisk,firmware,memtest
; default install method (one of: cdrom, slp, ftp, http, nfs, smb, hd; default: cdrom)
install=
; default repo location
install.http.server=
install.http.path=
install.nfs.server=
install.nfs.path=
install.ftp.server=
install.ftp.path=
install.ftp.user=
install.ftp.password=
install.smb.server=
install.smb.share=
install.smb.path=
install.smb.domain=
install.smb.user=
install.smb.password=
install.hd.device=
install.hd.path=
; default driver update (one of: yes, no, file, url; default: no)
dud=
; if 'dud=file': file name on DVD
dud.file=
; if 'dud=url': URL
dud.url=
; if 'dud=url': menu item name (default = 'URL')
dud.url.name=
; serial line setup (up to four lines)
; format: port,baud,dev
; - port: 0-3: first four BIOS serial lines (COM1-COM4); >=4: I/O port (0x3f8)
; - baud: baud rate (e.g. 115200); 0 = autodetect (considers baud rates >= 9600)
; - dev: linux device name (e.g. ttyS0)
; - all lines are set up with 8 bits, no parity, 1 stop bit
; - if the bootloader also has a serial line setup, the port is
; automatically used
serial.line0=0,0,ttyS0
serial.line1=1,0,ttyS1
serial.line2=
serial.line3=
; show keymap menu as submenu in lang dialog
keymap.submenu=0
; show keymap in main menu
keymap.mainmenu=0
[boot]
; show welcome animation
welcome=0
; beep when menu is ready
beep=1
; show keymap menu as submenu in lang dialog
keymap.submenu=0
; show keymap in main menu
keymap.mainmenu=0

2
branding-simply-linux/color_dec Executable file
View File

@ -0,0 +1,2 @@
#!/bin/bash
echo $(echo "ibase=16; ${1:0:2}" | bc)','$(echo "ibase=16; ${1:2:2}" | bc)','$(echo "ibase=16; ${1:4:2}" | bc)

22
branding-simply-linux/configure.ac
View File

@ -1,24 +1,34 @@
AC_INIT( [branding], [0.1], [http://bugzilla.altlinux.ru] )
PROGRESS_COLOR="0x23b8dc"
TITLE_COLOR="0x23b8dc"
INACTIVE_COLOR="0xd3d7cf"
PROGRESS_COLOR=23B8DC
TITLE_COLOR=5C96CC
LIGHT_COLOR_HEX=DFDFE0
MIDDLE_COLOR_HEX=C8C9CB
DARK_COLOR_HEX=909195
LIGHT_LABELS_HEX=FFFFFF
DARK_LABELS_HEX=000000
MIDDLE_LABELS_HEX=4d4d4f
AC_SUBST(THEME)
AC_SUBST(NAME)
AC_SUBST(STATUS)
AC_SUBST(VERSION)
AC_SUBST(PROGRESS_COLOR)
AC_SUBST(LIGHT_COLOR_HEX)
AC_SUBST(MIDDLE_COLOR_HEX)
AC_SUBST(DARK_COLOR_HEX)
AC_SUBST(LIGHT_LABELS_HEX)
AC_SUBST(DARK_LABELS_HEX)
AC_SUBST(MIDDLE_LABELS_HEX)
AC_SUBST(TITLE_COLOR)
AC_SUBST(INACTIVE_COLOR)
AC_CONFIG_FILES([
Makefile
bootloader/config
bootsplash/config/bootsplash-640x480.cfg
bootsplash/config/bootsplash-800x600.cfg
bootsplash/config/bootsplash-1024x768.cfg
bootsplash/config/bootsplash-1280x800.cfg
alterator/design/design.ini
bootloader/gfxboot.cfg
notes/release-notes.ru.html

33
branding-simply-linux/configure.ac.tmp Normal file
View File

@ -0,0 +1,33 @@
AC_INIT( [branding], [0.1], [http://bugzilla.altlinux.ru] )
PROGRESS_COLOR=23b8dc
TITLE_COLOR=23b8dc
INACTIVE_COLOR=d3d7cf
AC_SUBST(THEME)
AC_SUBST(NAME)
AC_SUBST(STATUS)
AC_SUBST(VERSION)
AC_SUBST(PROGRESS_COLOR)
AC_SUBST(TITLE_COLOR)
AC_SUBST(INACTIVE_COLOR)
AC_CONFIG_FILES([
Makefile
bootloader/config
bootsplash/config/bootsplash-640x480.cfg
bootsplash/config/bootsplash-800x600.cfg
bootsplash/config/bootsplash-1024x768.cfg
alterator/design/design.ini
bootloader/gfxboot.cfg
notes/release-notes.ru.html
notes/release-notes.all.html
notes/license.ru.html
notes/license.all.html
indexhtml.desktop
indexhtml/index-ru.html
indexhtml/index-en.html
])
AC_OUTPUT

BIN
branding-simply-linux/graphics/icons/altlinux.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 770 B

BIN
branding-simply-linux/indexhtml/img/altlinux-logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.4 KiB

3
branding-simply-linux/indexhtml/index-en.html.in
View File

@ -10,13 +10,12 @@
<body>
<div id=lang>
<a href="index-ru.html">Русский</a> |
<a href="index-ru.html">Русский</a>
</div>
<div id="content">
<table border="0" cellspacing="10"><tr>
<td><img src="img/altlinux-logo.png" width="95" height="84" style="margin-right: 15px;"></td>
<td width="99%" valign="bottom"><h1 class="shadow" title="@NAME@ @VERSION@ @STATUS@"><nobr>@NAME@ @VERSION@ @STATUS@</nobr></h1></td>
</tr></table>

21
branding-simply-linux/indexhtml/index-ru.html.in
View File

@ -10,27 +10,26 @@
<body>
<div id=lang>
<a href="index-en.html">English</a> |
<a href="index-en.html">English</a>
</div>
<div id="content">
<table border="0" cellspacing="10"><tr>
<td><img src="img/altlinux-logo.png" width="95" height="84" style="margin-right: 15px;"></td>
<td width="99%" valign="bottom"><h1 class="shadow" title="@NAME@ @VERSION@ @STATUS@"><nobr>@NAME@ @VERSION@ @STATUS@</nobr></h1></td>
<td width="99%" valign="bottom"><h1 class="shadow" title="Simply GNU/Linux @VERSION@ @STATUS@"><nobr>Simply GNU/Linux @VERSION@ @STATUS@</nobr></h1></td>
</tr></table>
<div id="main">
<div id="pane">
<div class="footer">Поиск по сайтам ALT Linux</div>
<div class="footer">Поиск по ресурсам сообщества</div>
<!-- Google CSE Search Box Begins -->
<form action="http://www.google.com/cse" id="searchbox_014412136813254060649:m2__wfh9ajy">
<!--table border="1" width="100%">
<tbody><tr><td-->
<input type="hidden" name="cx" value="014412136813254060649:m2__wfh9ajy" />
<input type="text" name="q" size="23" />
<input type="submit" name="sa" value="Поиск" id="button" />
<input type="submit" name="sa" value="Искать" id="button" />
<!--/td></tr></tbody></table-->
</form>
<script type="text/javascript" src="http://www.google.com/coop/cse/brand?form=searchbox_014412136813254060649%3Am2__wfh9ajy"></script>
@ -44,8 +43,10 @@
<p align="justify" style="padding: 15px;">Этот дистрибутив не появился бы без активного участия ALT Linux Team &mdash; сообщества разработчиков свободного программного обеспечения.</p>
<ul>
<li><a href="http://www.altlinux.org/">Wiki сообщества</a></li>
<li><a href="http://backports.altlinux.org/">Backports</a></li>
<li><a href="http://bugs.altlinux.org/">Сообщить об ошибке</a></li>
<li><a href="http://forum.altlinux.org/">Форум сообщества</a></li>
<li><a href="http://www.altlinux.ru/online_help/users_mailing_lists.html">Списки рассылки</a></li>
<!-- <li><a href="http://backports.altlinux.org/">Backports</a></li> -->
</ul>
</div>
</div>
@ -65,9 +66,9 @@
<ul>
<li><a href="http://myaltlinux.blogspot.com">Блог автора дистрибутива</a></li>
<li><a href="http://faq.altlinux.ru/">Ответы на часто задаваемые вопросы</a></li>
<li><a href="http://search.altlinux.ru/">Поиск информации по ALT Linux</a></li>
<li><a href="http://www.altlinux.ru/online_help/users_mailing_lists.html">Списки рассылки</a></li>
<li><a href="http://forum.altlinux.org/">Форум пользователей ALT Linux</a></li>
<!-- <li><a href="http://search.altlinux.ru/">Поиск информации по ALT Linux</a></li> -->
<li><a href="http://bugs.altlinux.org/">Сообщить об ошибке</a></li>
</ul>
</div>
</div>

86
branding.spec
View File

@ -1,12 +1,12 @@
%define theme slinux
%define Name Simply linux
%define codename Dilly
%define status beta
%define Name Simply GNU/Linux
%define codename Billy
%define status RC1
%define variants altlinux-office-desktop altlinux-office-server altlinux-desktop
Name: branding-simply-linux
Version: 5.0.0
Release: alt1
Release: alt3
BuildArch: noarch
BuildRequires: cpio gfxboot >= 4 fonts-ttf-dejavu
@ -27,7 +27,10 @@ Summary: System/Base
License: GPL
%description
Distro-specific packages with design and texts
Distro-specific packages with design and texts for Simply GNU/Linux distribution.
%description -l ru_RU.UTF-8
Пакеты, для дистрибутива "Просто Линукс" (Simply GNU/Linux)
%package bootloader
Group: System/Configuration/Boot and Init
@ -41,7 +44,12 @@ Obsoletes: design-bootloader-system-%theme design-bootloader-livecd-%theme desig
Conflicts: %(for n in %variants ; do [ "$n" = %theme ] || echo -n "branding-$n-bootloader ";done )
%description bootloader
Here you find the graphical boot logo. Suitable for both lilo and syslinux.
Here you find the graphical boot logo for Simply GNU/Linux distribution.
Suitable for both lilo and syslinux.
%description bootloader -l ru_RU.UTF-8
В данном пакете находится тема для экрана выбора вариантов загрузки (lilo и syslinux)
для дистрибутива "Просто Линукс" (Simply GNU/Linux).
%package bootsplash
Summary: Theme for splash animations during bootup
@ -52,12 +60,17 @@ Requires: bootsplash >= 3.3
Obsoletes: branding-alt-%theme-bootsplash
Conflicts: %(for n in %variants ; do [ "$n" = %theme ] || echo -n "branding-$n-bootsplash ";done )
%description bootsplash
This package contains graphics for boot process
(needs console splash screen enabled)
This package contains graphics for boot process for Simply GNU/Linux
(needs console splash screen enabled).
%description bootsplash -l ru_RU.UTF-8
В данном пакете находится тема для экрана загрузки для дистрибутива
"Просто Линукс" (Simply GNU/Linux).
%package alterator
Summary: Design for alterator for Simply linux
Summary: Design for alterator for Simply GNU/Linux
License: GPL
Group: System/Configuration/Other
Packager: Denis Koryavov <dkoryavov@altlinux.org>
@ -70,7 +83,11 @@ Obsoletes: design-alterator-server design-alterator-desktop design-altertor-brow
PreReq(post,preun): alternatives >= 0.2 alterator
%description alterator
Design for QT and web alterator for Simply linux
Design for QT and web alterator for Simply GNU/Linux.
%description alterator -l ru_RU.UTF-8
В данном пакете находится тема для "Центра управления системой" (Alterator)
и модулей библиотеки QT для дистрибутива "Просто Линукс" (Simply GNU/Linux).
%package graphics
Summary: design for ALT
@ -83,7 +100,11 @@ PreReq(post,preun): alternatives >= 0.2
Conflicts: %(for n in %variants ; do [ "$n" = %theme ] || echo -n "branding-$n-graphics ";done )
%description graphics
This package contains some graphics for Simply linux design.
This package contains some graphics for Simply GNU/Linux design.
%description graphics -l ru_RU.UTF-8
В данном пакете находится необходимые графические элементы для дистрибутива
"Просто Линукс" (Simply GNU/Linux).
%define provide_list altlinux fedora redhat system altlinux
@ -101,7 +122,11 @@ Conflicts: %conflicts_list
Conflicts: %(for n in %variants ; do [ "$n" = %theme ] || echo -n "branding-$n-release ";done )
%description release
%Name %version release file.
Simply GNU/Linux %version release file.
%description release -l ru_RU.UTF-8
В данном пакете находится описание версии %version дистрибутива
"Просто Линукс" (Simply GNU/Linux).
%package notes
Provides: alt-license-theme = %version alt-notes-%theme
@ -115,19 +140,26 @@ Conflicts: %(for n in %variants ; do [ "$n" = %theme ] || echo -n "branding-$n-n
%description notes
Distribution license and release notes
%package slideshow
%description notes -l ru_RU.UTF-8
В данном пакете находится лицензия и дополнительные сведения для версии %version
дистрибутива "Просто Линукс" (Simply GNU/Linux).
Summary: Slideshow for Simply linux %version installer
%package slideshow
Summary: Slideshow for Simply GNU/Linux %version installer.
License: Distributable
Group: System/Configuration/Other
Conflicts: %(for n in %variants ; do [ "$n" = %theme ] || echo -n "branding-$n-slideshow ";done )
%description slideshow
Slideshow for Simply linux %version installer
Slideshow for Simply GNU/Linux %version installer.
%description slideshow -l ru_RU.UTF-8
В данном пакете находятся изображения для организации "слайдшоу" в инсталляторе
дистрибутива "Просто Линукс" (Simply GNU/Linux).
%package indexhtml
Summary: %name -- Simply Linux html welcome page
Summary: Simply GNU/Linux html welcome page
License: distributable
Group: System/Base
Provides: indexhtml indexhtml-%theme = %version indexhtml-Desktop = 1:5.0
@ -145,7 +177,12 @@ Requires: xdg-utils
Requires(post): indexhtml-common
%description indexhtml
Simply Linux index.html welcome page.
Simply GNU/Linux index.html welcome page.
%description indexhtml -l ru_RU.UTF-8
В данном пакете содержится стартовая страница для дистрибутива
"Просто Линукс" (Simply GNU/Linux).
%prep
%setup -q
@ -208,6 +245,8 @@ __EOF__
#graphics
mkdir -p %buildroot/%_datadir/design/{%theme,backgrounds}
mkdir -p %buildroot/%_iconsdir
install graphics/icons/altlinux.png %buildroot/%_iconsdir/altlinux.png
cp -ar graphics/* %buildroot/%_datadir/design/%theme
pushd %buildroot/%_datadir/design/%theme
@ -216,6 +255,7 @@ pushd %buildroot/%_datadir/design/%theme
popd
popd
install -d %buildroot//etc/alternatives/packages.d
cat >%buildroot/etc/alternatives/packages.d/%name-graphics <<__EOF__
%_datadir/artworks %_datadir/design/%theme 10
@ -252,7 +292,7 @@ install -m644 indexhtml.desktop %buildroot%_desktopdir/
#bootloader
%pre bootloader
[ -s /boot/splash/%theme ] && rm -fr /boot/splash/%theme ||:
[ -s /boot/splash/%theme ] && rm -rf /boot/splash/%theme ||:
%post bootloader
%__ln_s -nf %theme/message /boot/splash/message
@ -263,7 +303,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,6 +333,7 @@ echo $lang > lang
%files graphics
%config /etc/alternatives/packages.d/%name-graphics
%_datadir/design
%_iconsdir/altlinux.png
%files bootsplash
%_sysconfdir/bootsplash/themes/%theme/
@ -316,6 +356,12 @@ echo $lang > lang
%_desktopdir/*
%changelog
* Wed Aug 19 2009 Denis Koryavov <dkoryavov@altlinux.org> 5.0.0-alt3
- Added brand icon an Russian description for package.
* Thu Aug 13 2009 Denis Koryavov <dkoryavov@altlinux.org> 5.0.0-alt2
- Update for bootsplash.
* Sat Jun 13 2009 Denis Koryavov <dkoryavov@altlinux.org> 5.0.0-alt1
- Fork from branding-altlinux-lite