Skip to content

B
branding-etersoft-ximper
Commit 10268fc4 authored by Andrey Cherepanov's avatar Andrey Cherepanov
Browse files
Options

7.0.5-alt0.M70P.2

- Update copyright years, fix VK group URL and update company address - Fix button gluing in web interface - Fix package name with Droid fonts - Generate image for selection bar in GRUB menu from specified color
parents 87981133 362b0b2e
Show whitespace changes
Inline Side-by-side
Showing with 39 additions and 31 deletions
branding.spec
View file @ 10268fc4
...@@ -16,10 +16,10 @@ ...@@ -16,10 +16,10 @@
Name: branding-%brand-%theme Name: branding-%brand-%theme
Version: 7.0.5 Version: 7.0.5
Release: alt0.M70P.1 Release: alt0.M70P.2
BuildArch: noarch BuildArch: noarch
BuildRequires: cpio gfxboot >= 4 fonts-ttf-dejavu fonts-ttf-droid BuildRequires: cpio gfxboot >= 4 fonts-ttf-dejavu fonts-ttf-google-droid-sans
BuildRequires: design-bootloader-source >= 5.0-alt2 BuildRequires: design-bootloader-source >= 5.0-alt2
BuildRequires(pre): libqt4-core BuildRequires(pre): libqt4-core
...@@ -512,6 +512,12 @@ subst 's/#theme-name=/theme-name=Clearlooks-Phenix/' /etc/lightdm/lightdm-gtk-gr ...@@ -512,6 +512,12 @@ subst 's/#theme-name=/theme-name=Clearlooks-Phenix/' /etc/lightdm/lightdm-gtk-gr
%config %_localstatedir/ldm/.pam_environment %config %_localstatedir/ldm/.pam_environment
%changelog %changelog
* Mon Apr 13 2015 Andrey Cherepanov <cas@altlinux.org> 7.0.5-alt0.M70P.2
- Update copyright years, fix VK group URL and update company address
- Fix button gluing in web interface
- Fix package name with Droid fonts
- Generate image for selection bar in GRUB menu from specified color
* Wed Jun 11 2014 Andrey Cherepanov <cas@altlinux.org> 7.0.5-alt0.M70P.1 * Wed Jun 11 2014 Andrey Cherepanov <cas@altlinux.org> 7.0.5-alt0.M70P.1
- Backport to p7 branch - Backport to p7 branch
......
components.mk
View file @ 10268fc4
...@@ -53,6 +53,7 @@ boot: boot-images ...@@ -53,6 +53,7 @@ boot: boot-images
install -m 644 design-bootloader-source/message $(sysconfdir)/../boot/splash/$(THEME) install -m 644 design-bootloader-source/message $(sysconfdir)/../boot/splash/$(THEME)
install -m 644 design-bootloader-source/bootlogo $(datadir)/gfxboot/$(THEME) install -m 644 design-bootloader-source/bootlogo $(datadir)/gfxboot/$(THEME)
#grub2 #grub2
convert -size 16x16 -define png:color-type=2 -depth 8 xc:'#0c2c6c' components/grub2/selected_blob_c.png
install -d -m 755 $(sysconfdir)/../boot/grub/themes/$(THEME) install -d -m 755 $(sysconfdir)/../boot/grub/themes/$(THEME)
cp -a components/grub2/* $(sysconfdir)/../boot/grub/themes/$(THEME)/ cp -a components/grub2/* $(sysconfdir)/../boot/grub/themes/$(THEME)/
install -m 644 images/grub.png $(sysconfdir)/../boot/grub/themes/$(THEME)/boot.png install -m 644 images/grub.png $(sysconfdir)/../boot/grub/themes/$(THEME)/boot.png
......
components/ahttpd/styles/alterator.css.in
View file @ 10268fc4
...@@ -113,6 +113,7 @@ small { ...@@ -113,6 +113,7 @@ small {
color: #FFFFFF; color: #FFFFFF;
background-color: #455a85; background-color: #455a85;
border: 1px solid #1b2575; border: 1px solid #1b2575;
margin: 2px;
} }
#main .btn:hover, .box .btn:hover { #main .btn:hover, .box .btn:hover {
......
components/indexhtml/index-en.html.in
View file @ 10268fc4
...@@ -80,9 +80,9 @@ ...@@ -80,9 +80,9 @@
<tr><td colspan="3" id="social-pane"> <tr><td colspan="3" id="social-pane">
<div id="social">We will be glade to meet you on the following social networks:</div> <div id="social">We will be glade to meet you on the following social networks:</div>
<div id="social-icons"> <div id="social-icons">
<a href="http://twitter.com/#!/altlinuxru" class="image"><img src="images/twitter.png" alt="Twitter" class="banner"></a> <a href="https://twitter.com/#!/altlinuxru" class="image"><img src="images/twitter.png" alt="Twitter" class="banner"></a>
<a href="https://www.facebook.com/group.php?gid=136328550579" class="image"><img src="images/facebook.png" alt="Facebook" class="banner"></a> <a href="https://www.facebook.com/group.php?gid=136328550579" class="image"><img src="images/facebook.png" alt="Facebook" class="banner"></a>
<a href="http://vkontakte.ru/club667081" class="image"><img src="images/vkontakte.png" alt="VKontakte" class="banner"></a> <a href="https://vk.com/altlinux" class="image"><img src="images/vkontakte.png" alt="VKontakte" class="banner"></a>
</div></td></tr> </div></td></tr>
</table> </table>
...@@ -91,10 +91,13 @@ ...@@ -91,10 +91,13 @@
<div id="footer"> <div id="footer">
<table border="0" width="100%"> <table border="0" width="100%">
<tr> <tr>
<td id="left_footer">&copy; 2013 ALT Linux. All rights reserved.</td> <td id="left_footer">&copy; 2015 ALT Linux. All rights reserved.</td>
<td id="right_footer"> <td id="right_footer">
Tel/fax: +7 (495) 662-3883<br> Tel/fax: +7 (495) 662-3883<br>
119334, Russian Federation, Moscow, 5-th Donskoy proezd, 15, build 6. 15/11 5-th Donskoy proezd<br>
Moscow<br>
Russian Federation<br>
119334
</td> </td>
</tr></table> </tr></table>
</div> </div>
......
components/indexhtml/index-ru.html.in
View file @ 10268fc4
...@@ -80,9 +80,9 @@ ...@@ -80,9 +80,9 @@
<tr><td colspan="3" id="social-pane"> <tr><td colspan="3" id="social-pane">
<div id="social">Мы рады встретиться с вами в социальных сетях:</div> <div id="social">Мы рады встретиться с вами в социальных сетях:</div>
<div id="social-icons"> <div id="social-icons">
<a href="http://twitter.com/#!/altlinuxru" class="image"><img src="images/twitter.png" alt="Twitter" class="banner"></a> <a href="https://twitter.com/#!/altlinuxru" class="image"><img src="images/twitter.png" alt="Twitter" class="banner"></a>
<a href="https://www.facebook.com/group.php?gid=136328550579" class="image"><img src="images/facebook.png" alt="Facebook" class="banner"></a> <a href="https://www.facebook.com/group.php?gid=136328550579" class="image"><img src="images/facebook.png" alt="Facebook" class="banner"></a>
<a href="http://vkontakte.ru/club667081" class="image"><img src="images/vkontakte.png" alt="ВКонтакте" class="banner"></a> <a href="https://vk.com/altlinux" class="image"><img src="images/vkontakte.png" alt="ВКонтакте" class="banner"></a>
</div></td></tr> </div></td></tr>
</table> </table>
...@@ -91,10 +91,11 @@ ...@@ -91,10 +91,11 @@
<div id="footer"> <div id="footer">
<table border="0" width="100%"> <table border="0" width="100%">
<tr> <tr>
<td id="left_footer">&copy; ALT Linux, 2013. Все права защищены.</td> <td id="left_footer">&copy; ALT Linux, 2015. Все права защищены.</td>
<td id="right_footer"> <td id="right_footer">
Телефон/факс: +7 (495) 662-3883<br> Телефон/факс: +7 (495) 662-3883<br>
Москва, 5-й Донской проезд, д. 15, стр. 6 5-й Донской проезд, д. 15, стр. 11<br>
Москва, Россия, 119334
</td> </td>
</tr></table> </tr></table>
</div> </div>
......
menu/applications/celestia.desktop deleted 100644 → 0
View file @ 87981133
[Desktop Entry]
Name=Space simulator Celestia
Name[ru]=Симуляция космоса Celestia
GenericName=Space simulation Celestia
GenericName[ru]=Симуляция космоса Celestia
Encoding=UTF-8
Comment=A real-time visual space simulation
Exec=celestia %f
TryExec=celestia %f
Terminal=false
Icon=celestia
Type=Application
Categories=Game;
menu/applications/dropbox.desktop
View file @ 10268fc4
...@@ -4,8 +4,8 @@ Name[ru]=Синхронизация файлов Dropbox ...@@ -4,8 +4,8 @@ Name[ru]=Синхронизация файлов Dropbox
GenericName=Dropbox File Synchronizer GenericName=Dropbox File Synchronizer
GenericName[ru]=Синхронизация файлов Dropbox GenericName[ru]=Синхронизация файлов Dropbox
Comment=Sync your files across computers and to the web Comment=Sync your files across computers and to the web
Exec=dropbox-wrapper Exec=dropbox start -i
TryExec=dropbox-wrapper TryExec=dropbox start -i
Terminal=false Terminal=false
Type=Application Type=Application
Icon=dropbox Icon=dropbox
......
notes/license.all.html.in
View file @ 10268fc4
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<p>Applications included within the Distribution are distributed in hope that these will be useful but without any warranty; without even the implied warranty of fitness for any particular purpose. ALT Linux Ltd is not liable for any damages, direct or indirect, arising out of the use of these Applications.</p> <p>Applications included within the Distribution are distributed in hope that these will be useful but without any warranty; without even the implied warranty of fitness for any particular purpose. ALT Linux Ltd is not liable for any damages, direct or indirect, arising out of the use of these Applications.</p>
<p> <p>
<em>ALT Linux Ltd, Moscow, 5th Donskoy proezd, 15/6<br> <em>ALT Linux Ltd, Moscow, 5th Donskoy proezd, 15/11<br>
http://www.altlinux.com http://www.altlinux.com
</em> </em>
</p> </p>
......
notes/license.ru.html.in
View file @ 10268fc4
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<p>ООО «Альт Линукс» гарантирует замену носителей ДИСТРИБУТИВА при наличии производственного брака носителя.</p> <p>ООО «Альт Линукс» гарантирует замену носителей ДИСТРИБУТИВА при наличии производственного брака носителя.</p>
<p>ПРОГРАММЫ, включенные в состав ДИСТРИБУТИВА, распространяются в надежде, что они будут полезны, но без гарантии их пригодности для какой-либо конкретной цели. ООО «Альт Линукс» не несет ответственности за возможный ущерб, прямой или косвенный, понесенный в результате использования этих ПРОГРАММ.</p> <p>ПРОГРАММЫ, включенные в состав ДИСТРИБУТИВА, распространяются в надежде, что они будут полезны, но без гарантии их пригодности для какой-либо конкретной цели. ООО «Альт Линукс» не несет ответственности за возможный ущерб, прямой или косвенный, понесенный в результате использования этих ПРОГРАММ.</p>
<p> <p>
<em>ООО «Альт Линукс». Москва, 5-й Донской проезд, д.15, стр.6.<br> <em>ООО «Альт Линукс». Москва, 5-й Донской проезд, д.15, стр.11.<br>
ИНН 7704222179<br> ИНН 7704222179<br>
http://www.altlinux.ru</em> http://www.altlinux.ru</em>
</p> </p>
......
xfce-settings/etcskel/.config/xfce4/panel/xfce4-orageclock-plugin-17.rc 0 → 100644
View file @ 10268fc4
show_frame=false
fg_set=false
bg_set=false
timezone=
width_set=false
height_set=false
data0=%H:%M
font0=
tooltip=%A, %d %b, %Y
hib_timing=true
xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
View file @ 10268fc4
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<value type="int" value="10"/> <value type="int" value="10"/>
<value type="int" value="11"/> <value type="int" value="11"/>
<value type="int" value="12"/> <value type="int" value="12"/>
<value type="int" value="13"/> <value type="int" value="17"/>
<value type="int" value="16"/> <value type="int" value="16"/>
<value type="int" value="14"/> <value type="int" value="14"/>
</property> </property>
...@@ -77,9 +77,6 @@ ...@@ -77,9 +77,6 @@
<property name="plugin-12" type="string" value="separator"> <property name="plugin-12" type="string" value="separator">
<property name="style" type="uint" value="1"/> <property name="style" type="uint" value="1"/>
</property> </property>
<property name="plugin-13" type="string" value="clock">
<property name="show-frame" type="bool" value="false"/>
</property>
<property name="plugin-14" type="string" value="actions"> <property name="plugin-14" type="string" value="actions">
<property name="appearance" type="uint" value="0"/> <property name="appearance" type="uint" value="0"/>
<property name="items" type="array"> <property name="items" type="array">
...@@ -101,5 +98,6 @@ ...@@ -101,5 +98,6 @@
<property name="expand" type="bool" value="true"/> <property name="expand" type="bool" value="true"/>
</property> </property>
<property name="plugin-16" type="string" value="places"/> <property name="plugin-16" type="string" value="places"/>
<property name="plugin-17" type="string" value="xfce4-orageclock-plugin"/>
</property> </property>
</channel> </channel>
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