Drop menu subpackage

Makefile.in

@@ -7,7 +7,7 @@ PRODUCT_NAME=@PRODUCT_NAME@
 CODENAME=@CODENAME@
 ARCH=$(shell arch)
 
-.PHONY: graphics browser-qt ahttpd boot-images boot-splash boot indexhtml install browser-qt/design/bg.png hidden-menu-entries
+.PHONY: graphics browser-qt ahttpd boot-images boot-splash boot indexhtml install browser-qt/design/bg.png
 
 # graphics
 
@@ -128,15 +128,9 @@ indexhtml:
 	done
 	install -Dpm644 indexhtml/indexhtml.desktop $(datadir)/applications/indexhtml.desktop
 
-hidden-menu-entries:
-	for entry in `cat menu/hidden-menu-entries`;do \
-	  install -D /dev/null menu/applications/$$entry.desktop; \
-	  echo -e "[Desktop Entry]\nHidden=true" > menu/applications/$$entry.desktop; \
-	done
-
 all: graphics
 
-install: browser-qt ahttpd boot-images boot-splash @X86@ indexhtml hidden-menu-entries
+install: browser-qt ahttpd boot-images boot-splash @X86@ indexhtml
 	# install product icon
 	for size in 16 22 24 32 48 64 128; do \
 	    install -Dm 0644 icons/alt-$(THEME)-$$size.png $(datadir)/icons/hicolor/$${size}x$${size}/apps/alt-$(THEME).png; \
@@ -200,10 +194,3 @@ install: browser-qt ahttpd boot-images boot-splash @X86@ indexhtml hidden-menu-e
 	cp -a indexhtml/{*.html,images} $(datadir)/doc/indexhtml
 	install -Dm755 indexhtml/indexhtml-desktop.desktop $(datadir)/kf5/kio_desktop/DesktopLinks/indexhtml.desktop
 	install -Dm755 indexhtml/indexhtml-desktop.desktop $(datadir)/Desktop/indexhtml.desktop
-	#menu
-	mkdir -p $(datadir)/slinux-style/applications
-	cp -a menu/applications/* $(datadir)/slinux-style/applications/
-	mkdir -p $(sysconfdir)/xdg/menus/xfce-applications-merged
-	cp menu/50-xfce-applications.menu $(sysconfdir)/xdg/menus/xfce-applications-merged/
-	mkdir -p $(datadir)/desktop-directories
-	cp menu/altlinux-wine.directory $(datadir)/desktop-directories/

branding.spec

@@ -230,18 +230,6 @@ Requires(post): indexhtml-common
 В данном пакете содержится стартовая страница для дистрибутива
 %distro_name_ru.
 
-%package menu
-BuildArch: noarch
-Summary: Menu for %distro_name
-License: Distributable
-Group: Graphical desktop/Other
-Requires(pre): altlinux-freedesktop-menu-common
-Requires: altlinux-freedesktop-menu-common
-%branding_add_conflicts %flavour menu
-
-%description menu
-Menu for %distro_name
-
 %prep
 %setup -n branding
 
@@ -371,11 +359,6 @@ fi
 %attr(0755,root,root) %_datadir/Desktop/indexhtml.desktop
 %_iconsdir/hicolor/*/apps/alt-%theme-desktop.png
 
-%files menu
-/usr/share/slinux-style
-/etc/xdg/menus/xfce-applications-merged/50-xfce-applications.menu
-/usr/share/desktop-directories/altlinux-wine.directory
-
 %changelog
 * Wed May 29 2019 Alexey Shabalin <shaba@altlinux.org> 8.90-alt1
 - Alpha version of ALT Server 9.0 (based on Education by cas@).

menu/50-xfce-applications.menu

-<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
-  "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
-
-<Menu>
-    <Name>Xfce</Name>
-    <AppDir>/usr/share/slinux-style/applications</AppDir>
-
-    <Menu>
-        <Name>ShallowSettings</Name>
-        <Directory>altlinux-settings-desktop.directory</Directory>
-        <Menu>
-            <Name>WineSettings</Name>
-            <Directory>altlinux-wine.directory</Directory>
-            <Include>
-                <And>
-                    <Category>Wine</Category>
-                    <Category>Settings</Category>
-                </And>
-            </Include>
-        </Menu>
-        <Include>
-            <Category>Settings</Category>
-        </Include>
-        <Exclude>
-			<Category>Wine</Category>
-			<Category>X-XFCE-SettingsDialog</Category>
-        </Exclude>
-
-        <Layout>
-            <Filename>xfce-settings-manager.desktop</Filename>
-            <Filename>acc.desktop</Filename>
-            <Separator/>
-            <Merge type="all"/>
-        </Layout>
-
-        <Menu>
-            <Name>Screensavers</Name>
-            <Directory>altlinux-screensaver.directory</Directory>
-            <Include>
-                <Category>Screensaver</Category>
-            </Include>
-        </Menu>
-    </Menu>
-
-    <Layout>
-        <Filename>xfce4-run.desktop</Filename>
-        <Filename>xfce4-appfinder.desktop</Filename>
-        <Separator/>
-        <Filename>exo-terminal-emulator.desktop</Filename>
-        <Filename>exo-file-manager.desktop</Filename>
-        <Filename>exo-mail-reader.desktop</Filename>
-        <Filename>exo-web-browser.desktop</Filename>
-        <Separator/>
-        <Menuname>Settings</Menuname>
-        <Menuname>ShallowSettings</Menuname>
-        <Separator/>
-        <Merge type="all"/>
-        <Separator/>
-        <Filename>xfce4-about.desktop</Filename>
-        <Filename>xfce4-session-logout.desktop</Filename>
-    </Layout>
-
-    <Move>
-      <Old>Settings/DesktopSettings/XFCE</Old>
-      <New>Settings/NativeSettings</New>
-    </Move>
-
-    <Menu>
-        <Name>Accessories</Name>
-        <Menu>
-            <Name>WineUtils</Name>
-            <Directory>altlinux-wine.directory</Directory>
-            <Include>
-                <And>
-                    <Category>Wine</Category>
-                    <Category>Utility</Category>
-                </And>
-            </Include>
-        </Menu>
-        <Exclude>
-            <Or>
-                <Filename>exo-file-manager.desktop</Filename>
-                <Filename>exo-terminal-emulator.desktop</Filename>
-                <Filename>xfce4-about.desktop</Filename>
-                <Filename>xfce4-run.desktop</Filename>
-                <Category>Wine</Category>
-            </Or>
-        </Exclude>
-	<Menu>
-	    <Name>Other</Name>
-	    <Exclude>
-	        <Or>
-        	    <Category>X-Xfce-Toplevel</Category>
-		    <Filename>exo-file-manager.desktop</Filename>
-		    <Filename>exo-terminal-emulator.desktop</Filename>
-		    <Filename>xfce4-about.desktop</Filename>
-		    <Filename>xfce4-run.desktop</Filename>
-		</Or>
-	    </Exclude>
-	</Menu>
-    </Menu>
-
-    <Menu>
-        <Name>Internet</Name>
-        <Exclude>
-            <Or>
-                <Filename>exo-mail-reader.desktop</Filename>
-                <Filename>exo-web-browser.desktop</Filename>
-            </Or>
-        </Exclude>
-	<Menu>
-	    <Name>Other</Name>
-	    <Exclude>
-	        <Or>
-                    <Filename>exo-mail-reader.desktop</Filename>
-		    <Filename>exo-web-browser.desktop</Filename>
-		    <Category>X-Xfce-Toplevel</Category>
-		</Or>
-	    </Exclude>
-	</Menu>
-    </Menu>
-
-    <Menu>
-        <Name>System</Name>
-        <Exclude>
-            <Or>
-                <Filename>xfce4-session-logout.desktop</Filename>
-            </Or>
-        </Exclude>
-        <Layout>
-        <Filename>indexhtml.desktop</Filename>
-        <Filename>livecd-install.desktop</Filename>
-        <Filename>apt-indicator.desktop</Filename>
-        <Separator/>
-        <Merge type="all"/>
-        </Layout>
-	<Menu>
-	    <Name>Other</Name>
-	    <Exclude>
-	        <Or>
-                    <Filename>xfce4-session-logout.desktop</Filename>
-		    <Category>X-Xfce-Toplevel</Category>
-		</Or>
-	    </Exclude>
-	</Menu>
-    </Menu>
-
-    <Include>
-        <Category>X-Xfce-Toplevel</Category>
-    </Include>
-
-    <MergeFile>applications-menueditor.menu</MergeFile>
-    <MergeFile>xfce-applications-menueditor.menu</MergeFile>
-
-</Menu>

menu/altlinux-wine.directory

-[Desktop Entry]
-Name=Wine
-Comment=Wine
-Icon=wine
-Type=Directory
\ No newline at end of file

menu/applications/codeblocks.desktop

-[Desktop Entry]
-Version=1.0
-Name=Code::Blocks IDE
-Name[ru]=Среда разработки Code::Blocks
-Comment=Configurable and extensible IDE
-Comment[ru]=Среда разработки на C/C++
-Exec=codeblocks %F
-TryExec=codeblocks
-Icon=codeblocks
-Terminal=false
-X-MultipleArgs=false
-Type=Application
-Categories=Development;IDE;
-StartupNotify=true
-MimeType=application/x-codeblocks;application/x-codeblocks-workspace;

menu/applications/logisim.desktop

-[Desktop Entry]
-Name=Logisim
-GenericName=Logisim
-GenericName[ru]=Проектирование и моделирование логических цепей
-Comment=Graphical tool for designing and simulating logic circuits
-Comment[ru]=Графический инструмент для проектирования и моделирования логических цепей
-Exec=logisim
-TryExec=logisim
-Icon=logisim-icon-128
-Terminal=false
-Type=Application
-Categories=Education;Science;ComputerScience;Java;

menu/applications/medit.desktop

-[Desktop Entry]
-Name=medit
-Name[cs]=medit
-Name[de]=medit
-Name[es]=medit
-Name[fr]=medit
-Name[nl]=medit
-Name[ru]=Текстовый редактор
-Name[zh_CN]=medit
-Comment=Text editor
-Comment[cs]=Textový editor
-Comment[de]=Texteditor
-Comment[es]=Editor de texto
-Comment[fr]=Éditeur de texte
-Comment[nl]=Teksteditor
-Comment[ru]=Текстовый редактор 
-Comment[zh_CN]=文本编辑器
-Exec=medit %F
-TryExec=medit %F
-Terminal=false
-Type=Application
-StartupNotify=true
-MimeType=text/plain;
-Icon=medit
-Categories=Utility;TextEditor;

menu/applications/wine-regedit.desktop

-[Desktop Entry]
-Name=Wine RegEdit
-Name[ru]=Редактор реестра
-Comment=Wine Registry Editor
-Comment[ru]=Редактор реестра Wine
-GenericName=Wine RegEdit
-GenericName[ru]=Редактор реестра
-Exec=regedit
-TryExec=regedit
-Terminal=false
-Type=Application
-Icon=preferences-system
-Categories=Wine;Settings;

menu/applications/wine-uninstaller.desktop

-[Desktop Entry]
-Name=Wine Software Uninstaller
-Name[ru]=Установка и удаление программ
-Comment=Uninstall software from Wine
-Comment[ru]=Установка и удаление программ в Wine
-GenericName=Wine Software Uninstaller
-GenericName[ru]=Установка и удаление программ
-Exec=wine uninstaller
-TryExec=wine uninstaller
-Terminal=false
-Type=Application
-Icon=wine-uninstaller
-Categories=Wine;Settings;

menu/applications/wine-winecfg.desktop

-[Desktop Entry]
-Name=Wine Configuration
-Name[ru]=Настройки Wine
-Comment=Setup the compatibility layer for Windows programs
-Comment[ru]=Программа для настройки параметров Wine
-GenericName=Wine Configuration
-GenericName[ru]=Настройки Wine
-Exec=winecfg
-TryExec=winecfg
-Terminal=false
-Icon=wine-winecfg
-Type=Application
-Categories=Wine;Settings;

menu/hidden-menu-entries

-alt-alt_linux
-alt-docs-main
-ccsm
-cups
-dosbox
-flash-player-properties
-fp
-gnuplot
-htop
-ImageMagick
-lftp
-links2
-mc
-nano
-nvidia-settings
-policyeditor
-ppapi-plugin-adobe-flash
-pysol
-uxterm
-wine-winemine
-xfce-xfcalendar-settings
-xterm
-gnome-mplayer
-mplayer
-gmplayer
-xkill
-mcedit
-math
-stardict
-qt3-qtconfig
-grass
-screensavers/xfce-floaters
-screensavers/xfce-personal-slideshow
-screensavers/xfce-popsquares
-eric6_browser
-eric6_webbrowser
-kumir2-python
-vncviewer
-scinotes
-xcos
-italc-client
-pictomir-creator
-pictomir-navigator
-wine-wineconsole
-kf5/org.kde.kalgebra
-kf5/org.kde.kalgebramobile
-blender-win
-gnuplot
-qbrowser
-hp-uiscan