From 0f4431f5eb5785a55e0df0b7034b82b8eabf65c6 Mon Sep 17 00:00:00 2001 From: Andrey Cherepanov Date: Mon, 29 Apr 2019 12:29:14 +0300 Subject: [PATCH] Move components from subdirectory to top level --- Makefile.in | 50 +++++++++--------- .../ahttpd => ahttpd}/images/asc-desc.gif | Bin {components/ahttpd => ahttpd}/images/asc.gif | Bin .../ahttpd => ahttpd}/images/attention.gif | Bin {components/ahttpd => ahttpd}/images/bg.jpg | Bin .../ahttpd => ahttpd}/images/bottom.gif | Bin .../images/button-active.png | Bin .../images/button-dark-left.png | Bin .../images/button-dark-right.png | Bin .../ahttpd => ahttpd}/images/button-help.png | Bin .../images/button-light-left.png | Bin .../images/button-light-right.png | Bin .../images/button-passive.png | Bin .../images/checkbox-checked.png | Bin .../images/checkbox-empty.png | Bin .../ahttpd => ahttpd}/images/clock-face.png | Bin .../images/close-dialog-button.svg | 0 .../ahttpd => ahttpd}/images/dateedit.png | Bin {components/ahttpd => ahttpd}/images/desc.gif | Bin .../ahttpd => ahttpd}/images/empty.png | Bin .../images/first-page-button.svg | 0 .../images/gradient-menu.png | Bin .../ahttpd => ahttpd}/images/gradient-top.png | Bin .../ahttpd => ahttpd}/images/gradient.png | Bin .../images/groups/accounting.png | Bin .../images/groups/datetime.png | Bin .../images/groups/firewall.png | Bin .../ahttpd => ahttpd}/images/groups/mail.png | Bin .../images/groups/network.png | Bin .../ahttpd => ahttpd}/images/groups/other.png | Bin .../images/groups/pkg-groups.png | Bin .../ahttpd => ahttpd}/images/groups/pkg.png | Bin .../images/groups/servers.png | Bin .../images/groups/statistics.png | Bin .../images/groups/system.png | Bin .../images/groups/timezone.png | Bin .../ahttpd => ahttpd}/images/groups/users.png | Bin .../ahttpd => ahttpd}/images/groups/webui.png | Bin .../ahttpd => ahttpd}/images/groups/xorg.png | Bin .../images/header-gradient.png | Bin .../ahttpd => ahttpd}/images/header.png | Bin {components/ahttpd => ahttpd}/images/help.png | Bin .../ahttpd => ahttpd}/images/hgrabber.gif | Bin .../ahttpd => ahttpd}/images/information.gif | Bin .../images/last-page-button.svg | 0 .../ahttpd => ahttpd}/images/menu-header.png | Bin .../images/menu-selected.png | Bin .../images/next-page-button.svg | 0 {components/ahttpd => ahttpd}/images/off.png | Bin {components/ahttpd => ahttpd}/images/on.png | Bin .../images/prev-page-button.svg | 0 .../ahttpd => ahttpd}/images/product.png | Bin .../ahttpd => ahttpd}/images/reqfield.gif | Bin .../ahttpd => ahttpd}/images/right.gif | Bin .../ahttpd => ahttpd}/images/section.png | Bin .../ahttpd => ahttpd}/images/steps/auth.png | 0 .../images/steps/bacula-restore-finish.png | 0 .../images/steps/bacula-restore-search.png | 0 .../images/steps/bacula-restore-select.png | 0 .../images/steps/datetime.png | 0 .../ahttpd => ahttpd}/images/steps/empty.png | Bin .../ahttpd => ahttpd}/images/steps/finish.png | 0 .../images/steps/greeting.png | 0 .../ahttpd => ahttpd}/images/steps/grub.png | 0 .../images/steps/install.png | 0 .../images/steps/install2-basesystem.png | 0 .../images/steps/install2-preinstall.png | 0 .../ahttpd => ahttpd}/images/steps/lilo.png | 0 .../images/steps/net-eth.png | 0 .../images/steps/notes-license.png | 0 .../images/steps/notes-release-notes.png | 0 .../images/steps/packages.png | 0 .../images/steps/pkg-groups.png | 0 .../images/steps/preinstall.png | 0 .../ahttpd => ahttpd}/images/steps/root.png | 0 .../images/steps/sysconfig-base.png | 0 .../images/steps/sysconfig-kbd.png | 0 .../images/steps/sysconfig-language.png | 0 .../images/steps/timezone.png | 0 .../ahttpd => ahttpd}/images/steps/user.png | 0 .../ahttpd => ahttpd}/images/steps/users.png | 0 .../ahttpd => ahttpd}/images/steps/vm.png | 0 .../ahttpd => ahttpd}/images/steps/x11.png | 0 .../ahttpd => ahttpd}/images/table-header.png | Bin .../ahttpd => ahttpd}/images/up-down.png | Bin .../ahttpd => ahttpd}/styles/alterator.css.in | 0 .../bootloader => bootloader}/bootlogo | Bin .../bootloader => bootloader}/config.in | 0 .../bootloader => bootloader}/gfxboot.cfg.in | 0 {components/bootsplash => bootsplash}/box.png | Bin .../bootsplash => bootsplash}/bullet.png | Bin .../bootsplash => bootsplash}/entry.png | Bin .../bootsplash => bootsplash}/lock.png | Bin .../progress_bar.png | Bin .../progress_box.png | Bin .../segment_cornerL.png | Bin .../segment_cornerR.png | Bin .../segment_middle.png | Bin .../segment_status.png | Bin .../theme.plymouth.in | 0 .../bootsplash => bootsplash}/theme.script | 0 branding.spec | 13 ++--- .../browser-qt => browser-qt}/Makefile | 0 .../design/backward.png | Bin .../browser-qt => browser-qt}/design/bg.png | Bin .../design/design-live.qss.in | 0 .../design/design.ini.in | 0 .../design/design.qss.in | 0 .../design/forward.png | Bin .../design/logo_48.png | Bin .../design/progress-cleanlooks.png | Bin .../browser-qt => browser-qt}/theme.qrc | 0 configure.ac | 20 +++---- .../grub2 => grub2}/f/dejavu_sans_10.pf2 | Bin .../grub2 => grub2}/f/dejavu_sans_12.pf2 | Bin .../grub2 => grub2}/f/dejavu_sans_bold_14.pf2 | Bin .../grub2 => grub2}/f/droid_sans_12.pf2 | Bin .../grub2 => grub2}/f/droid_sans_bold_14.pf2 | Bin .../grub2 => grub2}/f/misc_fixed_13.pf2 | Bin .../grub2 => grub2}/f/vera_sans_10.pf2 | Bin .../grub2 => grub2}/f/vera_sans_12.pf2 | Bin .../grub2 => grub2}/f/vera_sans_bold_14.pf2 | Bin .../grub2 => grub2}/scrollbar_border_c.png | Bin .../grub2 => grub2}/scrollbar_border_n.png | Bin .../grub2 => grub2}/scrollbar_border_s.png | Bin .../grub2 => grub2}/scrollbar_slider_c.png | Bin .../grub2 => grub2}/scrollbar_slider_n.png | Bin .../grub2 => grub2}/scrollbar_slider_s.png | Bin .../grub2 => grub2}/selected_blob_c.png | Bin {components/grub2 => grub2}/theme.txt | 0 {components/grub2 => grub2}/tick.png | Bin {components/grub2 => grub2}/zero.png | Bin .../indexhtml => indexhtml}/images/bullet.png | Bin .../images/community.png | Bin .../images/company-logo.png | Bin .../images/documentation.png | Bin .../images/dotted-background.png | Bin .../images/facebook.png | Bin .../indexhtml => indexhtml}/images/lines.png | Bin .../images/magnifier.png | Bin .../images/product.png | Bin .../indexhtml => indexhtml}/images/search.png | Bin .../images/section.png | Bin .../images/telegram.png | Bin .../images/vkontakte.png | Bin .../indexhtml => indexhtml}/index-en.html.in | 0 .../indexhtml => indexhtml}/index-ru.html.in | 0 {components/indexhtml => indexhtml}/index.css | 0 .../indexhtml.desktop.in | 0 {components/systemd => systemd}/os-release.in | 0 150 files changed, 42 insertions(+), 41 deletions(-) rename {components/ahttpd => ahttpd}/images/asc-desc.gif (100%) rename {components/ahttpd => ahttpd}/images/asc.gif (100%) rename {components/ahttpd => ahttpd}/images/attention.gif (100%) rename {components/ahttpd => ahttpd}/images/bg.jpg (100%) rename {components/ahttpd => ahttpd}/images/bottom.gif (100%) rename {components/ahttpd => ahttpd}/images/button-active.png (100%) rename {components/ahttpd => ahttpd}/images/button-dark-left.png (100%) rename {components/ahttpd => ahttpd}/images/button-dark-right.png (100%) rename {components/ahttpd => ahttpd}/images/button-help.png (100%) rename {components/ahttpd => ahttpd}/images/button-light-left.png (100%) rename {components/ahttpd => ahttpd}/images/button-light-right.png (100%) rename {components/ahttpd => ahttpd}/images/button-passive.png (100%) rename {components/ahttpd => ahttpd}/images/checkbox-checked.png (100%) rename {components/ahttpd => ahttpd}/images/checkbox-empty.png (100%) rename {components/ahttpd => ahttpd}/images/clock-face.png (100%) rename {components/ahttpd => ahttpd}/images/close-dialog-button.svg (100%) rename {components/ahttpd => ahttpd}/images/dateedit.png (100%) rename {components/ahttpd => ahttpd}/images/desc.gif (100%) rename {components/ahttpd => ahttpd}/images/empty.png (100%) rename {components/ahttpd => ahttpd}/images/first-page-button.svg (100%) rename {components/ahttpd => ahttpd}/images/gradient-menu.png (100%) rename {components/ahttpd => ahttpd}/images/gradient-top.png (100%) rename {components/ahttpd => ahttpd}/images/gradient.png (100%) rename {components/ahttpd => ahttpd}/images/groups/accounting.png (100%) rename {components/ahttpd => ahttpd}/images/groups/datetime.png (100%) rename {components/ahttpd => ahttpd}/images/groups/firewall.png (100%) rename {components/ahttpd => ahttpd}/images/groups/mail.png (100%) rename {components/ahttpd => ahttpd}/images/groups/network.png (100%) rename {components/ahttpd => ahttpd}/images/groups/other.png (100%) rename {components/ahttpd => ahttpd}/images/groups/pkg-groups.png (100%) rename {components/ahttpd => ahttpd}/images/groups/pkg.png (100%) rename {components/ahttpd => ahttpd}/images/groups/servers.png (100%) rename {components/ahttpd => ahttpd}/images/groups/statistics.png (100%) rename {components/ahttpd => ahttpd}/images/groups/system.png (100%) rename {components/ahttpd => ahttpd}/images/groups/timezone.png (100%) rename {components/ahttpd => ahttpd}/images/groups/users.png (100%) rename {components/ahttpd => ahttpd}/images/groups/webui.png (100%) rename {components/ahttpd => ahttpd}/images/groups/xorg.png (100%) rename {components/ahttpd => ahttpd}/images/header-gradient.png (100%) rename {components/ahttpd => ahttpd}/images/header.png (100%) rename {components/ahttpd => ahttpd}/images/help.png (100%) rename {components/ahttpd => ahttpd}/images/hgrabber.gif (100%) rename {components/ahttpd => ahttpd}/images/information.gif (100%) rename {components/ahttpd => ahttpd}/images/last-page-button.svg (100%) rename {components/ahttpd => ahttpd}/images/menu-header.png (100%) rename {components/ahttpd => ahttpd}/images/menu-selected.png (100%) rename {components/ahttpd => ahttpd}/images/next-page-button.svg (100%) rename {components/ahttpd => ahttpd}/images/off.png (100%) rename {components/ahttpd => ahttpd}/images/on.png (100%) rename {components/ahttpd => ahttpd}/images/prev-page-button.svg (100%) rename {components/ahttpd => ahttpd}/images/product.png (100%) rename {components/ahttpd => ahttpd}/images/reqfield.gif (100%) rename {components/ahttpd => ahttpd}/images/right.gif (100%) rename {components/ahttpd => ahttpd}/images/section.png (100%) rename {components/ahttpd => ahttpd}/images/steps/auth.png (100%) rename {components/ahttpd => ahttpd}/images/steps/bacula-restore-finish.png (100%) rename {components/ahttpd => ahttpd}/images/steps/bacula-restore-search.png (100%) rename {components/ahttpd => ahttpd}/images/steps/bacula-restore-select.png (100%) rename {components/ahttpd => ahttpd}/images/steps/datetime.png (100%) rename {components/ahttpd => ahttpd}/images/steps/empty.png (100%) rename {components/ahttpd => ahttpd}/images/steps/finish.png (100%) rename {components/ahttpd => ahttpd}/images/steps/greeting.png (100%) rename {components/ahttpd => ahttpd}/images/steps/grub.png (100%) rename {components/ahttpd => ahttpd}/images/steps/install.png (100%) rename {components/ahttpd => ahttpd}/images/steps/install2-basesystem.png (100%) rename {components/ahttpd => ahttpd}/images/steps/install2-preinstall.png (100%) rename {components/ahttpd => ahttpd}/images/steps/lilo.png (100%) rename {components/ahttpd => ahttpd}/images/steps/net-eth.png (100%) rename {components/ahttpd => ahttpd}/images/steps/notes-license.png (100%) rename {components/ahttpd => ahttpd}/images/steps/notes-release-notes.png (100%) rename {components/ahttpd => ahttpd}/images/steps/packages.png (100%) rename {components/ahttpd => ahttpd}/images/steps/pkg-groups.png (100%) rename {components/ahttpd => ahttpd}/images/steps/preinstall.png (100%) rename {components/ahttpd => ahttpd}/images/steps/root.png (100%) rename {components/ahttpd => ahttpd}/images/steps/sysconfig-base.png (100%) rename {components/ahttpd => ahttpd}/images/steps/sysconfig-kbd.png (100%) rename {components/ahttpd => ahttpd}/images/steps/sysconfig-language.png (100%) rename {components/ahttpd => ahttpd}/images/steps/timezone.png (100%) rename {components/ahttpd => ahttpd}/images/steps/user.png (100%) rename {components/ahttpd => ahttpd}/images/steps/users.png (100%) rename {components/ahttpd => ahttpd}/images/steps/vm.png (100%) rename {components/ahttpd => ahttpd}/images/steps/x11.png (100%) rename {components/ahttpd => ahttpd}/images/table-header.png (100%) rename {components/ahttpd => ahttpd}/images/up-down.png (100%) rename {components/ahttpd => ahttpd}/styles/alterator.css.in (100%) rename {components/bootloader => bootloader}/bootlogo (100%) rename {components/bootloader => bootloader}/config.in (100%) rename {components/bootloader => bootloader}/gfxboot.cfg.in (100%) rename {components/bootsplash => bootsplash}/box.png (100%) rename {components/bootsplash => bootsplash}/bullet.png (100%) rename {components/bootsplash => bootsplash}/entry.png (100%) rename {components/bootsplash => bootsplash}/lock.png (100%) rename {components/bootsplash => bootsplash}/progress_bar.png (100%) rename {components/bootsplash => bootsplash}/progress_box.png (100%) rename {components/bootsplash => bootsplash}/segment_cornerL.png (100%) rename {components/bootsplash => bootsplash}/segment_cornerR.png (100%) rename {components/bootsplash => bootsplash}/segment_middle.png (100%) rename {components/bootsplash => bootsplash}/segment_status.png (100%) rename {components/bootsplash => bootsplash}/theme.plymouth.in (100%) rename {components/bootsplash => bootsplash}/theme.script (100%) rename {components/browser-qt => browser-qt}/Makefile (100%) rename {components/browser-qt => browser-qt}/design/backward.png (100%) rename {components/browser-qt => browser-qt}/design/bg.png (100%) rename {components/browser-qt => browser-qt}/design/design-live.qss.in (100%) rename {components/browser-qt => browser-qt}/design/design.ini.in (100%) rename {components/browser-qt => browser-qt}/design/design.qss.in (100%) rename {components/browser-qt => browser-qt}/design/forward.png (100%) rename {components/browser-qt => browser-qt}/design/logo_48.png (100%) rename {components/browser-qt => browser-qt}/design/progress-cleanlooks.png (100%) rename {components/browser-qt => browser-qt}/theme.qrc (100%) rename {components/grub2 => grub2}/f/dejavu_sans_10.pf2 (100%) rename {components/grub2 => grub2}/f/dejavu_sans_12.pf2 (100%) rename {components/grub2 => grub2}/f/dejavu_sans_bold_14.pf2 (100%) rename {components/grub2 => grub2}/f/droid_sans_12.pf2 (100%) rename {components/grub2 => grub2}/f/droid_sans_bold_14.pf2 (100%) rename {components/grub2 => grub2}/f/misc_fixed_13.pf2 (100%) rename {components/grub2 => grub2}/f/vera_sans_10.pf2 (100%) rename {components/grub2 => grub2}/f/vera_sans_12.pf2 (100%) rename {components/grub2 => grub2}/f/vera_sans_bold_14.pf2 (100%) rename {components/grub2 => grub2}/scrollbar_border_c.png (100%) rename {components/grub2 => grub2}/scrollbar_border_n.png (100%) rename {components/grub2 => grub2}/scrollbar_border_s.png (100%) rename {components/grub2 => grub2}/scrollbar_slider_c.png (100%) rename {components/grub2 => grub2}/scrollbar_slider_n.png (100%) rename {components/grub2 => grub2}/scrollbar_slider_s.png (100%) rename {components/grub2 => grub2}/selected_blob_c.png (100%) rename {components/grub2 => grub2}/theme.txt (100%) rename {components/grub2 => grub2}/tick.png (100%) rename {components/grub2 => grub2}/zero.png (100%) rename {components/indexhtml => indexhtml}/images/bullet.png (100%) rename {components/indexhtml => indexhtml}/images/community.png (100%) rename {components/indexhtml => indexhtml}/images/company-logo.png (100%) rename {components/indexhtml => indexhtml}/images/documentation.png (100%) rename {components/indexhtml => indexhtml}/images/dotted-background.png (100%) rename {components/indexhtml => indexhtml}/images/facebook.png (100%) rename {components/indexhtml => indexhtml}/images/lines.png (100%) rename {components/indexhtml => indexhtml}/images/magnifier.png (100%) rename {components/indexhtml => indexhtml}/images/product.png (100%) rename {components/indexhtml => indexhtml}/images/search.png (100%) rename {components/indexhtml => indexhtml}/images/section.png (100%) rename {components/indexhtml => indexhtml}/images/telegram.png (100%) rename {components/indexhtml => indexhtml}/images/vkontakte.png (100%) rename {components/indexhtml => indexhtml}/index-en.html.in (100%) rename {components/indexhtml => indexhtml}/index-ru.html.in (100%) rename {components/indexhtml => indexhtml}/index.css (100%) rename {components/indexhtml => indexhtml}/indexhtml.desktop.in (100%) rename {components/systemd => systemd}/os-release.in (100%) diff --git a/Makefile.in b/Makefile.in index 55dc91c..7a84ea8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -21,40 +21,40 @@ graphics: # use predefined image 800x600 with logo cp -al images/boot.png images/grub.png # product logo for ahttpd - cp -al images/product-logo.png components/ahttpd/images/product-logo.png + cp -al images/product-logo.png ahttpd/images/product-logo.png # product logo for indexhtml - cp -al images/product-logo.png components/indexhtml/images/product-logo.png + cp -al images/product-logo.png indexhtml/images/product-logo.png # browser-qt -components/browser-qt/design/bg.png: images/installer.png +browser-qt/design/bg.png: images/installer.png convert $< -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "$(STATUS)"' $@ -browser-qt:components/browser-qt/design/bg.png +browser-qt:browser-qt/design/bg.png install -d $(datadir)/alterator-browser-qt/design - rcc-qt4 -binary components/browser-qt/theme.qrc -o $(datadir)/alterator-browser-qt/design/$(THEME).rcc - #cp -f components/browser-qt/design/design-live.qss components/browser-qt/design/design.qss - rcc-qt4 -binary components/browser-qt/theme.qrc -o $(datadir)/alterator-browser-qt/design/$(THEME)-live.rcc + rcc-qt4 -binary browser-qt/theme.qrc -o $(datadir)/alterator-browser-qt/design/$(THEME).rcc + #cp -f browser-qt/design/design-live.qss browser-qt/design/design.qss + rcc-qt4 -binary browser-qt/theme.qrc -o $(datadir)/alterator-browser-qt/design/$(THEME)-live.rcc install -d $(sysconfdir)/alternatives/packages.d printf '/etc/alterator/design-browser-qt\t/usr/share/alterator-browser-qt/design/$(THEME).rcc\t50\n'>$(sysconfdir)/alternatives/packages.d/$(THEME).rcc # ahttpd ahttpd: - for i in components/ahttpd/images/*.svg; do \ + for i in ahttpd/images/*.svg; do \ image=$${i%.svg}; \ convert -background none $$image.svg $$image.png ; \ done install -d $(datadir)/alterator/design/styles - cp -a components/ahttpd/images $(datadir)/alterator/design - cp -a components/ahttpd/styles/*.css $(datadir)/alterator/design/styles + cp -a ahttpd/images $(datadir)/alterator/design + cp -a ahttpd/styles/*.css $(datadir)/alterator/design/styles # bootloader and bootsplash boot-images: cp -a /usr/src/design-bootloader-source ./ - cp -a components/bootloader/config design-bootloader-source/ - cp -a components/bootloader/gfxboot.cfg design-bootloader-source/data-install/ - cp -a components/bootloader/gfxboot.cfg design-bootloader-source/data-boot/ + cp -a bootloader/config design-bootloader-source/ + cp -a bootloader/gfxboot.cfg design-bootloader-source/data-install/ + cp -a bootloader/gfxboot.cfg design-bootloader-source/data-boot/ #for size in 1024x768 800x600 640x480; do \ # convert images/boot.jpg -quality 97 -resize "$$size!" -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "$(STATUS)"' boot-$$size.jpg ;\ #done @@ -72,7 +72,7 @@ boot-splash: boot-images cp -al images/grub.jpg $(datadir)/plymouth/themes/$(THEME)/grub.jpg # Put logo to background*x*.png cp -al images/with-logo/background*x*.png $(datadir)/plymouth/themes/$(THEME)/ - cp -a components/bootsplash/* $(datadir)/plymouth/themes/$(THEME) + cp -a bootsplash/* $(datadir)/plymouth/themes/$(THEME) mv $(datadir)/plymouth/themes/$(THEME)/theme.plymouth $(datadir)/plymouth/themes/$(THEME)/$(THEME).plymouth rm -f $(datadir)/plymouth/themes/$(THEME)/*.in #bootloader @@ -82,30 +82,30 @@ boot: boot-images install -d -m 755 $(datadir)/gfxboot/$(THEME) install -m 644 design-bootloader-source/message $(sysconfdir)/../boot/splash/$(THEME) install -m 644 design-bootloader-source/bootlogo $(datadir)/gfxboot/$(THEME) - #install -m644 components/bootloader/bootlogo $(datadir)/gfxboot/$(THEME) + #install -m644 bootloader/bootlogo $(datadir)/gfxboot/$(THEME) #grub2 - convert -size 16x16 -define png:color-type=2 -depth 8 xc:'#268BD2' components/grub2/selected_blob_c.png + convert -size 16x16 -define png:color-type=2 -depth 8 xc:'#268BD2' grub2/selected_blob_c.png install -d -m 755 $(sysconfdir)/../boot/grub/themes/$(THEME) - cp -a components/grub2/* $(sysconfdir)/../boot/grub/themes/$(THEME)/ + cp -a grub2/* $(sysconfdir)/../boot/grub/themes/$(THEME)/ install -m 644 images/boot.png $(sysconfdir)/../boot/grub/themes/$(THEME)/boot.png install -m 644 images/boot.jpg $(sysconfdir)/../boot/grub/themes/$(THEME)/grub.jpg # index html page, start page for all local browsers -components/indexhtml/index.css: - sed 's|/design/|file:///usr/share/alterator/design/|g' components/ahttpd/styles/alterator.css > components/indexhtml/index.css +indexhtml/index.css: + sed 's|/design/|file:///usr/share/alterator/design/|g' ahttpd/styles/alterator.css > indexhtml/index.css INDEXHTML_DIR=$(datadir)/doc/indexhtml -indexhtml: components/indexhtml/index.css - for i in components/indexhtml/*.html components/indexhtml/*.css;do \ +indexhtml: indexhtml/index.css + for i in indexhtml/*.html indexhtml/*.css;do \ install -Dpm644 $$i $(INDEXHTML_DIR)/`basename $$i`; \ done install -Dpm644 /dev/null $(INDEXHTML_DIR)/index.html - cp -a components/indexhtml/images $(INDEXHTML_DIR) + cp -a indexhtml/images $(INDEXHTML_DIR) for i in alt-docs documentation;do \ ln -s /usr/share/doc/$$i $(INDEXHTML_DIR)/$$i; \ done - install -Dpm644 components/indexhtml/indexhtml.desktop $(datadir)/applications/indexhtml.desktop - install -Dpm755 components/indexhtml/indexhtml.desktop $(datadir)/kde4/apps/kio_desktop/DesktopLinks/indexhtml.desktop + install -Dpm644 indexhtml/indexhtml.desktop $(datadir)/applications/indexhtml.desktop + install -Dpm755 indexhtml/indexhtml.desktop $(datadir)/kde4/apps/kio_desktop/DesktopLinks/indexhtml.desktop all: graphics -install: all browser-qt ahttpd boot-images boot-splash @X86@ indexhtml +install: browser-qt ahttpd boot-images boot-splash @X86@ indexhtml diff --git a/components/ahttpd/images/asc-desc.gif b/ahttpd/images/asc-desc.gif similarity index 100% rename from components/ahttpd/images/asc-desc.gif rename to ahttpd/images/asc-desc.gif diff --git a/components/ahttpd/images/asc.gif b/ahttpd/images/asc.gif similarity index 100% rename from components/ahttpd/images/asc.gif rename to ahttpd/images/asc.gif diff --git a/components/ahttpd/images/attention.gif b/ahttpd/images/attention.gif similarity index 100% rename from components/ahttpd/images/attention.gif rename to ahttpd/images/attention.gif diff --git a/components/ahttpd/images/bg.jpg b/ahttpd/images/bg.jpg similarity index 100% rename from components/ahttpd/images/bg.jpg rename to ahttpd/images/bg.jpg diff --git a/components/ahttpd/images/bottom.gif b/ahttpd/images/bottom.gif similarity index 100% rename from components/ahttpd/images/bottom.gif rename to ahttpd/images/bottom.gif diff --git a/components/ahttpd/images/button-active.png b/ahttpd/images/button-active.png similarity index 100% rename from components/ahttpd/images/button-active.png rename to ahttpd/images/button-active.png diff --git a/components/ahttpd/images/button-dark-left.png b/ahttpd/images/button-dark-left.png similarity index 100% rename from components/ahttpd/images/button-dark-left.png rename to ahttpd/images/button-dark-left.png diff --git a/components/ahttpd/images/button-dark-right.png b/ahttpd/images/button-dark-right.png similarity index 100% rename from components/ahttpd/images/button-dark-right.png rename to ahttpd/images/button-dark-right.png diff --git a/components/ahttpd/images/button-help.png b/ahttpd/images/button-help.png similarity index 100% rename from components/ahttpd/images/button-help.png rename to ahttpd/images/button-help.png diff --git a/components/ahttpd/images/button-light-left.png b/ahttpd/images/button-light-left.png similarity index 100% rename from components/ahttpd/images/button-light-left.png rename to ahttpd/images/button-light-left.png diff --git a/components/ahttpd/images/button-light-right.png b/ahttpd/images/button-light-right.png similarity index 100% rename from components/ahttpd/images/button-light-right.png rename to ahttpd/images/button-light-right.png diff --git a/components/ahttpd/images/button-passive.png b/ahttpd/images/button-passive.png similarity index 100% rename from components/ahttpd/images/button-passive.png rename to ahttpd/images/button-passive.png diff --git a/components/ahttpd/images/checkbox-checked.png b/ahttpd/images/checkbox-checked.png similarity index 100% rename from components/ahttpd/images/checkbox-checked.png rename to ahttpd/images/checkbox-checked.png diff --git a/components/ahttpd/images/checkbox-empty.png b/ahttpd/images/checkbox-empty.png similarity index 100% rename from components/ahttpd/images/checkbox-empty.png rename to ahttpd/images/checkbox-empty.png diff --git a/components/ahttpd/images/clock-face.png b/ahttpd/images/clock-face.png similarity index 100% rename from components/ahttpd/images/clock-face.png rename to ahttpd/images/clock-face.png diff --git a/components/ahttpd/images/close-dialog-button.svg b/ahttpd/images/close-dialog-button.svg similarity index 100% rename from components/ahttpd/images/close-dialog-button.svg rename to ahttpd/images/close-dialog-button.svg diff --git a/components/ahttpd/images/dateedit.png b/ahttpd/images/dateedit.png similarity index 100% rename from components/ahttpd/images/dateedit.png rename to ahttpd/images/dateedit.png diff --git a/components/ahttpd/images/desc.gif b/ahttpd/images/desc.gif similarity index 100% rename from components/ahttpd/images/desc.gif rename to ahttpd/images/desc.gif diff --git a/components/ahttpd/images/empty.png b/ahttpd/images/empty.png similarity index 100% rename from components/ahttpd/images/empty.png rename to ahttpd/images/empty.png diff --git a/components/ahttpd/images/first-page-button.svg b/ahttpd/images/first-page-button.svg similarity index 100% rename from components/ahttpd/images/first-page-button.svg rename to ahttpd/images/first-page-button.svg diff --git a/components/ahttpd/images/gradient-menu.png b/ahttpd/images/gradient-menu.png similarity index 100% rename from components/ahttpd/images/gradient-menu.png rename to ahttpd/images/gradient-menu.png diff --git a/components/ahttpd/images/gradient-top.png b/ahttpd/images/gradient-top.png similarity index 100% rename from components/ahttpd/images/gradient-top.png rename to ahttpd/images/gradient-top.png diff --git a/components/ahttpd/images/gradient.png b/ahttpd/images/gradient.png similarity index 100% rename from components/ahttpd/images/gradient.png rename to ahttpd/images/gradient.png diff --git a/components/ahttpd/images/groups/accounting.png b/ahttpd/images/groups/accounting.png similarity index 100% rename from components/ahttpd/images/groups/accounting.png rename to ahttpd/images/groups/accounting.png diff --git a/components/ahttpd/images/groups/datetime.png b/ahttpd/images/groups/datetime.png similarity index 100% rename from components/ahttpd/images/groups/datetime.png rename to ahttpd/images/groups/datetime.png diff --git a/components/ahttpd/images/groups/firewall.png b/ahttpd/images/groups/firewall.png similarity index 100% rename from components/ahttpd/images/groups/firewall.png rename to ahttpd/images/groups/firewall.png diff --git a/components/ahttpd/images/groups/mail.png b/ahttpd/images/groups/mail.png similarity index 100% rename from components/ahttpd/images/groups/mail.png rename to ahttpd/images/groups/mail.png diff --git a/components/ahttpd/images/groups/network.png b/ahttpd/images/groups/network.png similarity index 100% rename from components/ahttpd/images/groups/network.png rename to ahttpd/images/groups/network.png diff --git a/components/ahttpd/images/groups/other.png b/ahttpd/images/groups/other.png similarity index 100% rename from components/ahttpd/images/groups/other.png rename to ahttpd/images/groups/other.png diff --git a/components/ahttpd/images/groups/pkg-groups.png b/ahttpd/images/groups/pkg-groups.png similarity index 100% rename from components/ahttpd/images/groups/pkg-groups.png rename to ahttpd/images/groups/pkg-groups.png diff --git a/components/ahttpd/images/groups/pkg.png b/ahttpd/images/groups/pkg.png similarity index 100% rename from components/ahttpd/images/groups/pkg.png rename to ahttpd/images/groups/pkg.png diff --git a/components/ahttpd/images/groups/servers.png b/ahttpd/images/groups/servers.png similarity index 100% rename from components/ahttpd/images/groups/servers.png rename to ahttpd/images/groups/servers.png diff --git a/components/ahttpd/images/groups/statistics.png b/ahttpd/images/groups/statistics.png similarity index 100% rename from components/ahttpd/images/groups/statistics.png rename to ahttpd/images/groups/statistics.png diff --git a/components/ahttpd/images/groups/system.png b/ahttpd/images/groups/system.png similarity index 100% rename from components/ahttpd/images/groups/system.png rename to ahttpd/images/groups/system.png diff --git a/components/ahttpd/images/groups/timezone.png b/ahttpd/images/groups/timezone.png similarity index 100% rename from components/ahttpd/images/groups/timezone.png rename to ahttpd/images/groups/timezone.png diff --git a/components/ahttpd/images/groups/users.png b/ahttpd/images/groups/users.png similarity index 100% rename from components/ahttpd/images/groups/users.png rename to ahttpd/images/groups/users.png diff --git a/components/ahttpd/images/groups/webui.png b/ahttpd/images/groups/webui.png similarity index 100% rename from components/ahttpd/images/groups/webui.png rename to ahttpd/images/groups/webui.png diff --git a/components/ahttpd/images/groups/xorg.png b/ahttpd/images/groups/xorg.png similarity index 100% rename from components/ahttpd/images/groups/xorg.png rename to ahttpd/images/groups/xorg.png diff --git a/components/ahttpd/images/header-gradient.png b/ahttpd/images/header-gradient.png similarity index 100% rename from components/ahttpd/images/header-gradient.png rename to ahttpd/images/header-gradient.png diff --git a/components/ahttpd/images/header.png b/ahttpd/images/header.png similarity index 100% rename from components/ahttpd/images/header.png rename to ahttpd/images/header.png diff --git a/components/ahttpd/images/help.png b/ahttpd/images/help.png similarity index 100% rename from components/ahttpd/images/help.png rename to ahttpd/images/help.png diff --git a/components/ahttpd/images/hgrabber.gif b/ahttpd/images/hgrabber.gif similarity index 100% rename from components/ahttpd/images/hgrabber.gif rename to ahttpd/images/hgrabber.gif diff --git a/components/ahttpd/images/information.gif b/ahttpd/images/information.gif similarity index 100% rename from components/ahttpd/images/information.gif rename to ahttpd/images/information.gif diff --git a/components/ahttpd/images/last-page-button.svg b/ahttpd/images/last-page-button.svg similarity index 100% rename from components/ahttpd/images/last-page-button.svg rename to ahttpd/images/last-page-button.svg diff --git a/components/ahttpd/images/menu-header.png b/ahttpd/images/menu-header.png similarity index 100% rename from components/ahttpd/images/menu-header.png rename to ahttpd/images/menu-header.png diff --git a/components/ahttpd/images/menu-selected.png b/ahttpd/images/menu-selected.png similarity index 100% rename from components/ahttpd/images/menu-selected.png rename to ahttpd/images/menu-selected.png diff --git a/components/ahttpd/images/next-page-button.svg b/ahttpd/images/next-page-button.svg similarity index 100% rename from components/ahttpd/images/next-page-button.svg rename to ahttpd/images/next-page-button.svg diff --git a/components/ahttpd/images/off.png b/ahttpd/images/off.png similarity index 100% rename from components/ahttpd/images/off.png rename to ahttpd/images/off.png diff --git a/components/ahttpd/images/on.png b/ahttpd/images/on.png similarity index 100% rename from components/ahttpd/images/on.png rename to ahttpd/images/on.png diff --git a/components/ahttpd/images/prev-page-button.svg b/ahttpd/images/prev-page-button.svg similarity index 100% rename from components/ahttpd/images/prev-page-button.svg rename to ahttpd/images/prev-page-button.svg diff --git a/components/ahttpd/images/product.png b/ahttpd/images/product.png similarity index 100% rename from components/ahttpd/images/product.png rename to ahttpd/images/product.png diff --git a/components/ahttpd/images/reqfield.gif b/ahttpd/images/reqfield.gif similarity index 100% rename from components/ahttpd/images/reqfield.gif rename to ahttpd/images/reqfield.gif diff --git a/components/ahttpd/images/right.gif b/ahttpd/images/right.gif similarity index 100% rename from components/ahttpd/images/right.gif rename to ahttpd/images/right.gif diff --git a/components/ahttpd/images/section.png b/ahttpd/images/section.png similarity index 100% rename from components/ahttpd/images/section.png rename to ahttpd/images/section.png diff --git a/components/ahttpd/images/steps/auth.png b/ahttpd/images/steps/auth.png similarity index 100% rename from components/ahttpd/images/steps/auth.png rename to ahttpd/images/steps/auth.png diff --git a/components/ahttpd/images/steps/bacula-restore-finish.png b/ahttpd/images/steps/bacula-restore-finish.png similarity index 100% rename from components/ahttpd/images/steps/bacula-restore-finish.png rename to ahttpd/images/steps/bacula-restore-finish.png diff --git a/components/ahttpd/images/steps/bacula-restore-search.png b/ahttpd/images/steps/bacula-restore-search.png similarity index 100% rename from components/ahttpd/images/steps/bacula-restore-search.png rename to ahttpd/images/steps/bacula-restore-search.png diff --git a/components/ahttpd/images/steps/bacula-restore-select.png b/ahttpd/images/steps/bacula-restore-select.png similarity index 100% rename from components/ahttpd/images/steps/bacula-restore-select.png rename to ahttpd/images/steps/bacula-restore-select.png diff --git a/components/ahttpd/images/steps/datetime.png b/ahttpd/images/steps/datetime.png similarity index 100% rename from components/ahttpd/images/steps/datetime.png rename to ahttpd/images/steps/datetime.png diff --git a/components/ahttpd/images/steps/empty.png b/ahttpd/images/steps/empty.png similarity index 100% rename from components/ahttpd/images/steps/empty.png rename to ahttpd/images/steps/empty.png diff --git a/components/ahttpd/images/steps/finish.png b/ahttpd/images/steps/finish.png similarity index 100% rename from components/ahttpd/images/steps/finish.png rename to ahttpd/images/steps/finish.png diff --git a/components/ahttpd/images/steps/greeting.png b/ahttpd/images/steps/greeting.png similarity index 100% rename from components/ahttpd/images/steps/greeting.png rename to ahttpd/images/steps/greeting.png diff --git a/components/ahttpd/images/steps/grub.png b/ahttpd/images/steps/grub.png similarity index 100% rename from components/ahttpd/images/steps/grub.png rename to ahttpd/images/steps/grub.png diff --git a/components/ahttpd/images/steps/install.png b/ahttpd/images/steps/install.png similarity index 100% rename from components/ahttpd/images/steps/install.png rename to ahttpd/images/steps/install.png diff --git a/components/ahttpd/images/steps/install2-basesystem.png b/ahttpd/images/steps/install2-basesystem.png similarity index 100% rename from components/ahttpd/images/steps/install2-basesystem.png rename to ahttpd/images/steps/install2-basesystem.png diff --git a/components/ahttpd/images/steps/install2-preinstall.png b/ahttpd/images/steps/install2-preinstall.png similarity index 100% rename from components/ahttpd/images/steps/install2-preinstall.png rename to ahttpd/images/steps/install2-preinstall.png diff --git a/components/ahttpd/images/steps/lilo.png b/ahttpd/images/steps/lilo.png similarity index 100% rename from components/ahttpd/images/steps/lilo.png rename to ahttpd/images/steps/lilo.png diff --git a/components/ahttpd/images/steps/net-eth.png b/ahttpd/images/steps/net-eth.png similarity index 100% rename from components/ahttpd/images/steps/net-eth.png rename to ahttpd/images/steps/net-eth.png diff --git a/components/ahttpd/images/steps/notes-license.png b/ahttpd/images/steps/notes-license.png similarity index 100% rename from components/ahttpd/images/steps/notes-license.png rename to ahttpd/images/steps/notes-license.png diff --git a/components/ahttpd/images/steps/notes-release-notes.png b/ahttpd/images/steps/notes-release-notes.png similarity index 100% rename from components/ahttpd/images/steps/notes-release-notes.png rename to ahttpd/images/steps/notes-release-notes.png diff --git a/components/ahttpd/images/steps/packages.png b/ahttpd/images/steps/packages.png similarity index 100% rename from components/ahttpd/images/steps/packages.png rename to ahttpd/images/steps/packages.png diff --git a/components/ahttpd/images/steps/pkg-groups.png b/ahttpd/images/steps/pkg-groups.png similarity index 100% rename from components/ahttpd/images/steps/pkg-groups.png rename to ahttpd/images/steps/pkg-groups.png diff --git a/components/ahttpd/images/steps/preinstall.png b/ahttpd/images/steps/preinstall.png similarity index 100% rename from components/ahttpd/images/steps/preinstall.png rename to ahttpd/images/steps/preinstall.png diff --git a/components/ahttpd/images/steps/root.png b/ahttpd/images/steps/root.png similarity index 100% rename from components/ahttpd/images/steps/root.png rename to ahttpd/images/steps/root.png diff --git a/components/ahttpd/images/steps/sysconfig-base.png b/ahttpd/images/steps/sysconfig-base.png similarity index 100% rename from components/ahttpd/images/steps/sysconfig-base.png rename to ahttpd/images/steps/sysconfig-base.png diff --git a/components/ahttpd/images/steps/sysconfig-kbd.png b/ahttpd/images/steps/sysconfig-kbd.png similarity index 100% rename from components/ahttpd/images/steps/sysconfig-kbd.png rename to ahttpd/images/steps/sysconfig-kbd.png diff --git a/components/ahttpd/images/steps/sysconfig-language.png b/ahttpd/images/steps/sysconfig-language.png similarity index 100% rename from components/ahttpd/images/steps/sysconfig-language.png rename to ahttpd/images/steps/sysconfig-language.png diff --git a/components/ahttpd/images/steps/timezone.png b/ahttpd/images/steps/timezone.png similarity index 100% rename from components/ahttpd/images/steps/timezone.png rename to ahttpd/images/steps/timezone.png diff --git a/components/ahttpd/images/steps/user.png b/ahttpd/images/steps/user.png similarity index 100% rename from components/ahttpd/images/steps/user.png rename to ahttpd/images/steps/user.png diff --git a/components/ahttpd/images/steps/users.png b/ahttpd/images/steps/users.png similarity index 100% rename from components/ahttpd/images/steps/users.png rename to ahttpd/images/steps/users.png diff --git a/components/ahttpd/images/steps/vm.png b/ahttpd/images/steps/vm.png similarity index 100% rename from components/ahttpd/images/steps/vm.png rename to ahttpd/images/steps/vm.png diff --git a/components/ahttpd/images/steps/x11.png b/ahttpd/images/steps/x11.png similarity index 100% rename from components/ahttpd/images/steps/x11.png rename to ahttpd/images/steps/x11.png diff --git a/components/ahttpd/images/table-header.png b/ahttpd/images/table-header.png similarity index 100% rename from components/ahttpd/images/table-header.png rename to ahttpd/images/table-header.png diff --git a/components/ahttpd/images/up-down.png b/ahttpd/images/up-down.png similarity index 100% rename from components/ahttpd/images/up-down.png rename to ahttpd/images/up-down.png diff --git a/components/ahttpd/styles/alterator.css.in b/ahttpd/styles/alterator.css.in similarity index 100% rename from components/ahttpd/styles/alterator.css.in rename to ahttpd/styles/alterator.css.in diff --git a/components/bootloader/bootlogo b/bootloader/bootlogo similarity index 100% rename from components/bootloader/bootlogo rename to bootloader/bootlogo diff --git a/components/bootloader/config.in b/bootloader/config.in similarity index 100% rename from components/bootloader/config.in rename to bootloader/config.in diff --git a/components/bootloader/gfxboot.cfg.in b/bootloader/gfxboot.cfg.in similarity index 100% rename from components/bootloader/gfxboot.cfg.in rename to bootloader/gfxboot.cfg.in diff --git a/components/bootsplash/box.png b/bootsplash/box.png similarity index 100% rename from components/bootsplash/box.png rename to bootsplash/box.png diff --git a/components/bootsplash/bullet.png b/bootsplash/bullet.png similarity index 100% rename from components/bootsplash/bullet.png rename to bootsplash/bullet.png diff --git a/components/bootsplash/entry.png b/bootsplash/entry.png similarity index 100% rename from components/bootsplash/entry.png rename to bootsplash/entry.png diff --git a/components/bootsplash/lock.png b/bootsplash/lock.png similarity index 100% rename from components/bootsplash/lock.png rename to bootsplash/lock.png diff --git a/components/bootsplash/progress_bar.png b/bootsplash/progress_bar.png similarity index 100% rename from components/bootsplash/progress_bar.png rename to bootsplash/progress_bar.png diff --git a/components/bootsplash/progress_box.png b/bootsplash/progress_box.png similarity index 100% rename from components/bootsplash/progress_box.png rename to bootsplash/progress_box.png diff --git a/components/bootsplash/segment_cornerL.png b/bootsplash/segment_cornerL.png similarity index 100% rename from components/bootsplash/segment_cornerL.png rename to bootsplash/segment_cornerL.png diff --git a/components/bootsplash/segment_cornerR.png b/bootsplash/segment_cornerR.png similarity index 100% rename from components/bootsplash/segment_cornerR.png rename to bootsplash/segment_cornerR.png diff --git a/components/bootsplash/segment_middle.png b/bootsplash/segment_middle.png similarity index 100% rename from components/bootsplash/segment_middle.png rename to bootsplash/segment_middle.png diff --git a/components/bootsplash/segment_status.png b/bootsplash/segment_status.png similarity index 100% rename from components/bootsplash/segment_status.png rename to bootsplash/segment_status.png diff --git a/components/bootsplash/theme.plymouth.in b/bootsplash/theme.plymouth.in similarity index 100% rename from components/bootsplash/theme.plymouth.in rename to bootsplash/theme.plymouth.in diff --git a/components/bootsplash/theme.script b/bootsplash/theme.script similarity index 100% rename from components/bootsplash/theme.script rename to bootsplash/theme.script diff --git a/branding.spec b/branding.spec index 4b0365e..6b54623 100644 --- a/branding.spec +++ b/branding.spec @@ -328,7 +328,7 @@ echo "%distro_name (%codename)" >%buildroot%_sysconfdir/altlinux-release for n in fedora redhat system; do ln -s altlinux-release %buildroot%_sysconfdir/$n-release done -install -pD -m644 components/systemd/os-release %buildroot%_sysconfdir/os-release +install -pD -m644 systemd/os-release %buildroot%_sysconfdir/os-release #notes pushd notes @@ -398,12 +398,13 @@ install slideshow/slideshow.conf %buildroot/etc/alterator/ #indexhtml %define _altdocsdir %_defaultdocdir/alt-docs %define _indexhtmldir %_defaultdocdir/indexhtml -install components/indexhtml/*.html %buildroot%_defaultdocdir/indexhtml/ +install -d %buildroot%_indexhtmldir +install indexhtml/*.html %buildroot%_defaultdocdir/indexhtml/ mkdir -p %buildroot%_defaultdocdir/indexhtml/images -install components/indexhtml/images/* %buildroot%_defaultdocdir/indexhtml/images/ -install -Dm755 components/indexhtml/indexhtml.desktop %buildroot%_datadir/kde4/apps/kio_desktop/DesktopLinks/indexhtml.desktop -install -Dm755 components/indexhtml/indexhtml.desktop %buildroot%_datadir/kf5/kio_desktop/DesktopLinks/indexhtml.desktop -install -Dm755 components/indexhtml/indexhtml.desktop %buildroot%_datadir/Desktop/indexhtml.desktop +install indexhtml/images/* %buildroot%_defaultdocdir/indexhtml/images/ +install -Dm755 indexhtml/indexhtml.desktop %buildroot%_datadir/kde4/apps/kio_desktop/DesktopLinks/indexhtml.desktop +install -Dm755 indexhtml/indexhtml.desktop %buildroot%_datadir/kf5/kio_desktop/DesktopLinks/indexhtml.desktop +install -Dm755 indexhtml/indexhtml.desktop %buildroot%_datadir/Desktop/indexhtml.desktop #menu mkdir -p %buildroot/usr/share/slinux-style/applications diff --git a/components/browser-qt/Makefile b/browser-qt/Makefile similarity index 100% rename from components/browser-qt/Makefile rename to browser-qt/Makefile diff --git a/components/browser-qt/design/backward.png b/browser-qt/design/backward.png similarity index 100% rename from components/browser-qt/design/backward.png rename to browser-qt/design/backward.png diff --git a/components/browser-qt/design/bg.png b/browser-qt/design/bg.png similarity index 100% rename from components/browser-qt/design/bg.png rename to browser-qt/design/bg.png diff --git a/components/browser-qt/design/design-live.qss.in b/browser-qt/design/design-live.qss.in similarity index 100% rename from components/browser-qt/design/design-live.qss.in rename to browser-qt/design/design-live.qss.in diff --git a/components/browser-qt/design/design.ini.in b/browser-qt/design/design.ini.in similarity index 100% rename from components/browser-qt/design/design.ini.in rename to browser-qt/design/design.ini.in diff --git a/components/browser-qt/design/design.qss.in b/browser-qt/design/design.qss.in similarity index 100% rename from components/browser-qt/design/design.qss.in rename to browser-qt/design/design.qss.in diff --git a/components/browser-qt/design/forward.png b/browser-qt/design/forward.png similarity index 100% rename from components/browser-qt/design/forward.png rename to browser-qt/design/forward.png diff --git a/components/browser-qt/design/logo_48.png b/browser-qt/design/logo_48.png similarity index 100% rename from components/browser-qt/design/logo_48.png rename to browser-qt/design/logo_48.png diff --git a/components/browser-qt/design/progress-cleanlooks.png b/browser-qt/design/progress-cleanlooks.png similarity index 100% rename from components/browser-qt/design/progress-cleanlooks.png rename to browser-qt/design/progress-cleanlooks.png diff --git a/components/browser-qt/theme.qrc b/browser-qt/theme.qrc similarity index 100% rename from components/browser-qt/theme.qrc rename to browser-qt/theme.qrc diff --git a/configure.ac b/configure.ac index 0a08f3f..55f09e5 100644 --- a/configure.ac +++ b/configure.ac @@ -41,20 +41,20 @@ AC_SUBST(X86) AC_CONFIG_FILES([ Makefile - components/bootloader/config - components/bootsplash/theme.plymouth - components/browser-qt/design/design.ini - components/browser-qt/design/design.qss - components/bootloader/gfxboot.cfg + bootloader/config + bootsplash/theme.plymouth + browser-qt/design/design.ini + browser-qt/design/design.qss + bootloader/gfxboot.cfg notes/release-notes.ru.html notes/release-notes.all.html notes/license.ru.html notes/license.all.html - components/indexhtml/indexhtml.desktop - components/indexhtml/index-ru.html - components/indexhtml/index-en.html - components/systemd/os-release - components/ahttpd/styles/alterator.css + indexhtml/indexhtml.desktop + indexhtml/index-ru.html + indexhtml/index-en.html + systemd/os-release + ahttpd/styles/alterator.css kde-settings/apps/kdisplay/color-schemes/scheme.kcsrc ]) AC_OUTPUT diff --git a/components/grub2/f/dejavu_sans_10.pf2 b/grub2/f/dejavu_sans_10.pf2 similarity index 100% rename from components/grub2/f/dejavu_sans_10.pf2 rename to grub2/f/dejavu_sans_10.pf2 diff --git a/components/grub2/f/dejavu_sans_12.pf2 b/grub2/f/dejavu_sans_12.pf2 similarity index 100% rename from components/grub2/f/dejavu_sans_12.pf2 rename to grub2/f/dejavu_sans_12.pf2 diff --git a/components/grub2/f/dejavu_sans_bold_14.pf2 b/grub2/f/dejavu_sans_bold_14.pf2 similarity index 100% rename from components/grub2/f/dejavu_sans_bold_14.pf2 rename to grub2/f/dejavu_sans_bold_14.pf2 diff --git a/components/grub2/f/droid_sans_12.pf2 b/grub2/f/droid_sans_12.pf2 similarity index 100% rename from components/grub2/f/droid_sans_12.pf2 rename to grub2/f/droid_sans_12.pf2 diff --git a/components/grub2/f/droid_sans_bold_14.pf2 b/grub2/f/droid_sans_bold_14.pf2 similarity index 100% rename from components/grub2/f/droid_sans_bold_14.pf2 rename to grub2/f/droid_sans_bold_14.pf2 diff --git a/components/grub2/f/misc_fixed_13.pf2 b/grub2/f/misc_fixed_13.pf2 similarity index 100% rename from components/grub2/f/misc_fixed_13.pf2 rename to grub2/f/misc_fixed_13.pf2 diff --git a/components/grub2/f/vera_sans_10.pf2 b/grub2/f/vera_sans_10.pf2 similarity index 100% rename from components/grub2/f/vera_sans_10.pf2 rename to grub2/f/vera_sans_10.pf2 diff --git a/components/grub2/f/vera_sans_12.pf2 b/grub2/f/vera_sans_12.pf2 similarity index 100% rename from components/grub2/f/vera_sans_12.pf2 rename to grub2/f/vera_sans_12.pf2 diff --git a/components/grub2/f/vera_sans_bold_14.pf2 b/grub2/f/vera_sans_bold_14.pf2 similarity index 100% rename from components/grub2/f/vera_sans_bold_14.pf2 rename to grub2/f/vera_sans_bold_14.pf2 diff --git a/components/grub2/scrollbar_border_c.png b/grub2/scrollbar_border_c.png similarity index 100% rename from components/grub2/scrollbar_border_c.png rename to grub2/scrollbar_border_c.png diff --git a/components/grub2/scrollbar_border_n.png b/grub2/scrollbar_border_n.png similarity index 100% rename from components/grub2/scrollbar_border_n.png rename to grub2/scrollbar_border_n.png diff --git a/components/grub2/scrollbar_border_s.png b/grub2/scrollbar_border_s.png similarity index 100% rename from components/grub2/scrollbar_border_s.png rename to grub2/scrollbar_border_s.png diff --git a/components/grub2/scrollbar_slider_c.png b/grub2/scrollbar_slider_c.png similarity index 100% rename from components/grub2/scrollbar_slider_c.png rename to grub2/scrollbar_slider_c.png diff --git a/components/grub2/scrollbar_slider_n.png b/grub2/scrollbar_slider_n.png similarity index 100% rename from components/grub2/scrollbar_slider_n.png rename to grub2/scrollbar_slider_n.png diff --git a/components/grub2/scrollbar_slider_s.png b/grub2/scrollbar_slider_s.png similarity index 100% rename from components/grub2/scrollbar_slider_s.png rename to grub2/scrollbar_slider_s.png diff --git a/components/grub2/selected_blob_c.png b/grub2/selected_blob_c.png similarity index 100% rename from components/grub2/selected_blob_c.png rename to grub2/selected_blob_c.png diff --git a/components/grub2/theme.txt b/grub2/theme.txt similarity index 100% rename from components/grub2/theme.txt rename to grub2/theme.txt diff --git a/components/grub2/tick.png b/grub2/tick.png similarity index 100% rename from components/grub2/tick.png rename to grub2/tick.png diff --git a/components/grub2/zero.png b/grub2/zero.png similarity index 100% rename from components/grub2/zero.png rename to grub2/zero.png diff --git a/components/indexhtml/images/bullet.png b/indexhtml/images/bullet.png similarity index 100% rename from components/indexhtml/images/bullet.png rename to indexhtml/images/bullet.png diff --git a/components/indexhtml/images/community.png b/indexhtml/images/community.png similarity index 100% rename from components/indexhtml/images/community.png rename to indexhtml/images/community.png diff --git a/components/indexhtml/images/company-logo.png b/indexhtml/images/company-logo.png similarity index 100% rename from components/indexhtml/images/company-logo.png rename to indexhtml/images/company-logo.png diff --git a/components/indexhtml/images/documentation.png b/indexhtml/images/documentation.png similarity index 100% rename from components/indexhtml/images/documentation.png rename to indexhtml/images/documentation.png diff --git a/components/indexhtml/images/dotted-background.png b/indexhtml/images/dotted-background.png similarity index 100% rename from components/indexhtml/images/dotted-background.png rename to indexhtml/images/dotted-background.png diff --git a/components/indexhtml/images/facebook.png b/indexhtml/images/facebook.png similarity index 100% rename from components/indexhtml/images/facebook.png rename to indexhtml/images/facebook.png diff --git a/components/indexhtml/images/lines.png b/indexhtml/images/lines.png similarity index 100% rename from components/indexhtml/images/lines.png rename to indexhtml/images/lines.png diff --git a/components/indexhtml/images/magnifier.png b/indexhtml/images/magnifier.png similarity index 100% rename from components/indexhtml/images/magnifier.png rename to indexhtml/images/magnifier.png diff --git a/components/indexhtml/images/product.png b/indexhtml/images/product.png similarity index 100% rename from components/indexhtml/images/product.png rename to indexhtml/images/product.png diff --git a/components/indexhtml/images/search.png b/indexhtml/images/search.png similarity index 100% rename from components/indexhtml/images/search.png rename to indexhtml/images/search.png diff --git a/components/indexhtml/images/section.png b/indexhtml/images/section.png similarity index 100% rename from components/indexhtml/images/section.png rename to indexhtml/images/section.png diff --git a/components/indexhtml/images/telegram.png b/indexhtml/images/telegram.png similarity index 100% rename from components/indexhtml/images/telegram.png rename to indexhtml/images/telegram.png diff --git a/components/indexhtml/images/vkontakte.png b/indexhtml/images/vkontakte.png similarity index 100% rename from components/indexhtml/images/vkontakte.png rename to indexhtml/images/vkontakte.png diff --git a/components/indexhtml/index-en.html.in b/indexhtml/index-en.html.in similarity index 100% rename from components/indexhtml/index-en.html.in rename to indexhtml/index-en.html.in diff --git a/components/indexhtml/index-ru.html.in b/indexhtml/index-ru.html.in similarity index 100% rename from components/indexhtml/index-ru.html.in rename to indexhtml/index-ru.html.in diff --git a/components/indexhtml/index.css b/indexhtml/index.css similarity index 100% rename from components/indexhtml/index.css rename to indexhtml/index.css diff --git a/components/indexhtml/indexhtml.desktop.in b/indexhtml/indexhtml.desktop.in similarity index 100% rename from components/indexhtml/indexhtml.desktop.in rename to indexhtml/indexhtml.desktop.in diff --git a/components/systemd/os-release.in b/systemd/os-release.in similarity index 100% rename from components/systemd/os-release.in rename to systemd/os-release.in