Skip to content

B
branding-etersoft-ximper
Commit 8357d997 authored by Alexandra Panyukova's avatar Alexandra Panyukova
Browse files
Options

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

Conflicts: branding.spec
parents 417cde9b 7d4dbb41
Show whitespace changes
Inline Side-by-side
Showing with 16 additions and 47 deletions
branding.spec
View file @ 8357d997
%define theme office-server %define theme school-server
%define Theme Office Server %define Theme School Server
%define codename none %define codename none
%define brand altlinux %define brand altlinux
%define Brand ALT Linux %define Brand ALT Linux
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
Name: branding-%brand-%theme Name: branding-%brand-%theme
Version: 5.0.0 Version: 5.0.0
Release: alt26 Release: alt4
BuildArch: noarch BuildArch: noarch
BuildRequires: cpio gfxboot >= 4 fonts-ttf-dejavu BuildRequires: cpio gfxboot >= 4 fonts-ttf-dejavu
...@@ -21,9 +21,9 @@ BuildRequires: libqt4-devel ...@@ -21,9 +21,9 @@ BuildRequires: libqt4-devel
BuildRequires: ImageMagick fontconfig bc libGConf-devel BuildRequires: ImageMagick fontconfig bc libGConf-devel
%define variants altlinux-office-desktop altlinux-desktop altlinux-lite altlinux-workbench school-master altlinux-gnome-desktop %define variants altlinux-office-desktop altlinux-office-server altlinux-desktop altlinux-lite altlinux-workbench school-master altlinux-gnome-desktop
Packager: Anton V. Boyarshinov <boyarsh at altlinux dot org> Packager: Vitaly Kuznetsov <vitty@altlinux.ru>
Source: branding.tar Source: branding.tar
...@@ -65,7 +65,6 @@ This package contains graphics for boot process ...@@ -65,7 +65,6 @@ This package contains graphics for boot process
Summary: Design for alterator for %Brand %Theme Summary: Design for alterator for %Brand %Theme
License: GPL License: GPL
Group: System/Configuration/Other Group: System/Configuration/Other
Packager: Anton V. Boyarshiniv <boyarsh@altlinux.org>
Provides: design-alterator-browser-%theme branding-alt-%theme-browser-qt branding-altlinux-%theme-browser-qt Provides: design-alterator-browser-%theme branding-alt-%theme-browser-qt branding-altlinux-%theme-browser-qt
Provides: alterator-icons design-alterator design-alterator-%theme Provides: alterator-icons design-alterator design-alterator-%theme
Obsoletes: branding-alt-%theme-browser-qt branding-altlinux-%theme-browser-qt Obsoletes: branding-alt-%theme-browser-qt branding-altlinux-%theme-browser-qt
...@@ -99,7 +98,6 @@ This package contains some graphics for ALT design. ...@@ -99,7 +98,6 @@ This package contains some graphics for ALT design.
Summary: %distribution %Theme release file Summary: %distribution %Theme release file
Copyright: GPL Copyright: GPL
Group: System/Configuration/Other Group: System/Configuration/Other
Packager: Anton V. Boyarshinov <boyarsh@altlinux.org>
Provides: %(for n in %provide_list; do echo -n "$n-release = %version-%release "; done) altlinux-release-%theme branding-alt-%theme-release Provides: %(for n in %provide_list; do echo -n "$n-release = %version-%release "; done) altlinux-release-%theme branding-alt-%theme-release
Obsoletes: %obsolete_list branding-alt-%theme-release Obsoletes: %obsolete_list branding-alt-%theme-release
Conflicts: %conflicts_list Conflicts: %conflicts_list
...@@ -114,7 +112,7 @@ Obsoletes: alt-license-%theme alt-notes-%theme ...@@ -114,7 +112,7 @@ Obsoletes: alt-license-%theme alt-notes-%theme
Summary: Distribution license and release notes Summary: Distribution license and release notes
License: Distributable License: Distributable
Group: Documentation 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 alt-notes-junior-sj alt-notes-junior-sm alt-notes-office-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 ) Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-notes ";done )
%description notes %description notes
...@@ -144,7 +142,7 @@ Conflicts: indexhtml-school_lite ...@@ -144,7 +142,7 @@ Conflicts: indexhtml-school_lite
Conflicts: indexhtml-school_master Conflicts: indexhtml-school_master
Conflicts: indexhtml-school_terminal Conflicts: indexhtml-school_terminal
Conflicts: indexhtml-small_business Conflicts: indexhtml-small_business
Conflicts: indexhtml-school-server Conflicts: indexhtml-office-server
Requires: xdg-utils Requires: xdg-utils
Requires(post): indexhtml-common Requires(post): indexhtml-common
...@@ -306,7 +304,7 @@ echo $lang > lang ...@@ -306,7 +304,7 @@ echo $lang > lang
%_desktopdir/* %_desktopdir/*
%changelog %changelog
* Tue Sep 08 2009 Stanislav Ievlev <inger@altlinux.org> 5.0.0-alt26 * Tue Sep 08 2009 Stanislav Ievlev <inger@altlinux.org> 5.0.0-alt4
- add style for accordion and #box - add style for accordion and #box
* Mon Aug 24 2009 Stanislav Ievlev <inger@altlinux.org> 5.0.0-alt25 * Mon Aug 24 2009 Stanislav Ievlev <inger@altlinux.org> 5.0.0-alt25
...@@ -469,10 +467,11 @@ echo $lang > lang ...@@ -469,10 +467,11 @@ echo $lang > lang
* Wed Jan 14 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0-alt3 * Wed Jan 14 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0-alt3
- release subpackage added - release subpackage added
* Fri Dec 26 2008 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0-alt2 * Thu Aug 27 2009 Vitaly Kuznetsov <vitty@altlinux.ru> 5.0.0-alt3
- colors integration - Fix graphics
- graphics package added
* Thu Dec 18 2008 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0-alt1 * Thu Aug 27 2009 Vitaly Kuznetsov <vitty@altlinux.ru> 5.0.0-alt2
- initial sceleton - Fix conflicts
* Thu Aug 27 2009 Vitaly Kuznetsov <vitty@altlinux.ru> 5.0.0-alt1
- Initial school server branding (from office server)
images/boot.jpg
View replaced file @ 417cde9b View file @ 8357d997
images/boot.jpg

85.8 KB | W: | H:

images/boot.jpg

60.3 KB | W: | H:

images/boot.jpg
images/boot.jpg
images/boot.jpg
images/boot.jpg
  • 2-up
  • Swipe
  • Onion skin
images/logo.png
View replaced file @ 417cde9b View file @ 8357d997
images/logo.png

10.2 KB | W: | H:

images/logo.png

8.22 KB | W: | H:

images/logo.png
images/logo.png
images/logo.png
images/logo.png
  • 2-up
  • Swipe
  • Onion skin
notes/release-notes.all.html.in
View file @ 8357d997
...@@ -4,22 +4,7 @@ ...@@ -4,22 +4,7 @@
</head> </head>
<body> <body>
<center><p> <center><p>
Thank you for choosing @BRAND_FNAME@ @VERSION@ Ark! Thank you for choosing ALT Linux School Server 5.0!
</p></center> </p></center>
<p>
You can learn more about features of this product at our official site:
<a href="http://www.altlinux.ru">www.altlinux.ru</a>.
</p>
<p>
You can start working right now. You can start working right now. Our
server operating system already contains all that you need to setup an
office IT infrastructure.
</p>
<p>
<em>Hint</em>: if you wish to communicate with other Ark users and
developers, ask a question on the product usage and administration,
exchange your experience - register and participate in discussions at
<a href="http://forum.altlinux.ru">forum.altlinux.ru</a>.
</p>
</body> </body>
</html> </html>
notes/release-notes.ru.html.in
View file @ 8357d997
...@@ -5,21 +5,6 @@ ...@@ -5,21 +5,6 @@
<TITLE></TITLE> <TITLE></TITLE>
</HEAD> </HEAD>
<BODY> <BODY>
<H2>Спасибо Вам за выбор Альт Линукс @VERSION@ Ковчег!</H2> <H2>Спасибо Вам за выбор Альт Линукс Школьный Сервер 5.0!</H2>
<p>
На нашем официальном сайте
<a href="http://www.altlinux.ru">www.altlinux.ru</a> вы можете
узнать больше о возможностях продукта.
</p>
<p>
Уже сейчас вы можете приступать к работе. Сервер содержит все, что
нужно для развертывания офисной ИТ-инфраструктуры.
</p>
<p>
<em>Совет</em>: Зарегистрируйтесь на нашем форуме по адресу
<a href="http://forum.altlinux.ru">forum.altlinux.ru</a>. Вы сможете
пообщаться с единомышленниками, спросить совета по использованию
продукта, поделиться опытом.
</p>
</BODY> </BODY>
</HTML> </HTML>
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