Commit Graph

25 Commits

Author SHA1 Message Date
Elena Mishina
661cedada1 Merge branch 'master' into centaurus 2016-03-04 16:45:37 +03:00
Elena Mishina
3fcfcb9e06 edited Makefile 2016-03-04 16:45:02 +03:00
Elena Mishina
56a4a64b94 Merge branch 'master' into centaurus 2016-03-02 14:21:50 +03:00
Elena Mishina
f23a414c41 added brand_dir 2016-03-02 14:17:56 +03:00
Artem Zolochevskiy
06aa499c65 7.0.5-alt1
- update to 7.0.5
2016-02-02 05:17:02 +02:00
Artem Zolochevskiy
29fb16c199 update Makefile to include branding 2016-01-24 14:43:59 +02:00
Artem Zolochevskiy
944dffd319 fix formatting 2016-01-04 15:55:20 +02:00
Alexandr Boltris
aef761f767 Merge branch 'master' into kdesktop
Take all from master branch.

Conflicts:
	Makefile
	admin-basics/index.txt
	asciidoc.conf
	desktop-kde/images/kde-desktop-with-widgets.png
	desktop-kde/images/kde-desktop.png
	desktop-kde/images/kde-helpcenter.png
	desktop-kde/images/kde-menu.png
	desktop-kde/images/kde-panel.png
	desktop-kde/images/kde-settings.png
	desktop-kde/images/kde-widgets-rotate.png
	desktop-kde/images/kde-widgets-select.png
	desktop-kde/images/kde-widgets-unlock.png
	desktop-software/file-manager/dolphin/images/dolphin-address.png
	desktop-software/file-manager/dolphin/images/dolphin-places.png
	desktop-software/file-manager/dolphin/images/dolphin.png
	desktop-software/file-manager/index.txt
	desktop-software/graphics/index.txt
	desktop-software/index.txt
	desktop-software/internet/im/index.txt
	desktop-software/internet/im/telepathy/images/telepathy-settings.png
	desktop-software/internet/im/telepathy/images/telepathy.png
	desktop-software/internet/mail/index.txt
	desktop-software/internet/mail/kmail/images/kmail-message.png
	desktop-software/internet/mail/kmail/images/kmail.png
	desktop-software/internet/mail/kmail/index.txt
	desktop-software/internet/web/index.txt
	desktop-software/internet/web/konqueror/images/konqueror.png
	desktop-software/multimedia/index.txt
	desktop-software/multimedia/kde/index.txt
	desktop-software/office/index.txt
	desktop-software/others/index.txt
	desktop-software/others/k3b/images/k3b.png
	docs.spec
	index.txt
	install-guide/alternative-install.txt
	install-guide/images/boot.png
	install-guide/images/installer-preinstall.png
	install-guide/images/pkg-groups.png
	install-guide/images/sysconfig.png
	install-guide/images/vm.png
	install-guide/vm.txt
	packages/apt-get.txt
	ru-RU/images/boot-live.png
	ru-RU/images/desktop-xfce.png
	ru-RU/images/hello.png
	ru-RU/images/live-system.png
	ru-RU/images/nm-applet-help.png
	ru-RU/images/pidgin-settings.png
	ru-RU/images/pidgin.png
	ru-RU/images/pkg-0.png
	ru-RU/images/prepare-hdd.png
	ru-RU/images/set-language.png
	ru-RU/images/small_cd-writer.png
	ru-RU/images/thunar.png
	ru-RU/images/thunderbird-message.png
	ru-RU/images/thunderbird.png
	ru-RU/images/xfce-setting-manager.png
	system-management/acc/gui.txt
	system-management/network/images/knetworkmanager-settings.png
	system-management/network/networkmanager.txt
	system-start/system-login-dm.txt
	whatis-distro/index.txt
2014-07-15 08:59:43 +03:00
Alexandr Boltris
ef76c00f84 fix install command in Makefile / add index.html 2014-05-12 14:09:31 +03:00
Alexandr Boltris
d86622a5a9 fix project name 2014-05-12 14:07:53 +03:00
Alexandr Boltris
4d2081954d change format: asciidoc -> docbook 2014-05-07 13:48:09 +03:00
Artem Zolochevskiy
b154048d85 Merge branch 'master' into centaurus 2011-06-07 16:17:30 +03:00
Artem Zolochevskiy
5bc6fda9eb Merge branch 'master' into kdesktop 2011-06-07 16:15:45 +03:00
Artem Zolochevskiy
855d4676ab make Makefile more portable
avoid using gnu install -D option
2011-06-07 16:09:30 +03:00
Artem Zolochevskiy
8e332b5244 Merge branch 'master' into kdesktop
Conflicts:
	asciidoc.conf
	index.txt
	rescue/index.txt
	system-management/gui.txt
	system-management/index.txt
	whatis-linux/index.txt
2011-05-30 21:28:07 +03:00
Artem Zolochevskiy
853e3dfe64 initial centaurus adaptation
altlinux-5.9.9-20100909-centaurus-x86_64-ru-install-dvd5.iso
2010-09-28 19:09:37 +03:00
Artem Zolochevskiy
c555926a3a Makefile: add RESOURCE_FILES variable 2010-09-28 18:07:32 +03:00
Artem Zolochevskiy
7ac50d8627 Merge branch 'master' into kdesktop 2009-12-27 20:01:01 +02:00
Artem Zolochevskiy
f6860e5db1 Makefile: fix pdf creation (proper fonts replacement) 2009-12-27 20:00:15 +02:00
Artem Zolochevskiy
e80babeef3 Makefile: change project name 2009-11-26 13:40:16 +02:00
Artem Zolochevskiy
d7ae341550 add Makefile 2009-10-23 12:24:06 +03:00
Artem Zolochevskiy
24894d64d0 ALT Linux 5.0 Ark Desktop adaptation 2009-10-22 12:20:26 +03:00
Artem Zolochevskiy
0f830c6bf1 switch to asciidoc 2009-10-22 12:02:17 +03:00
Artem Zolochevskiy
c508451bd4 5.0-alt2
- completely rewritten (thanks Andrey Cherepanov)
- add %_defaultdocdir/documentation dir (used in indexhtml packages)
- add conflicts to other 'docs' packages
2009-10-22 09:15:39 +03:00
Artem Zolochevskiy
0a86858cf7 5.0-alt1
- initial build for Sisyphus
2009-06-27 21:17:43 +03:00