From 2865e71e74f80e109ff57f3b6076fdf4d2b17de0 Mon Sep 17 00:00:00 2001 From: Mikhail Efremov Date: Tue, 17 Oct 2017 15:05:14 +0300 Subject: [PATCH] Drop menu subpackage It was menu for old Simply Linux and doesn't related to MATE. (cherry picked from commit cc5af09359502ec1a5f37a6a130a4e696a8c9d1e) --- Makefile.in | 17 +-- branding.spec | 17 --- menu/50-xfce-applications.menu | 155 --------------------- menu/altlinux-wine.directory | 5 - menu/applications/codeblocks.desktop | 15 -- menu/applications/logisim.desktop | 12 -- menu/applications/medit.desktop | 25 ---- menu/applications/wine-regedit.desktop | 13 -- menu/applications/wine-uninstaller.desktop | 13 -- menu/applications/wine-winecfg.desktop | 13 -- menu/hidden-menu-entries | 50 ------- 11 files changed, 2 insertions(+), 333 deletions(-) delete mode 100644 menu/50-xfce-applications.menu delete mode 100644 menu/altlinux-wine.directory delete mode 100644 menu/applications/codeblocks.desktop delete mode 100644 menu/applications/logisim.desktop delete mode 100644 menu/applications/medit.desktop delete mode 100644 menu/applications/wine-regedit.desktop delete mode 100644 menu/applications/wine-uninstaller.desktop delete mode 100644 menu/applications/wine-winecfg.desktop delete mode 100644 menu/hidden-menu-entries diff --git a/Makefile.in b/Makefile.in index 288ae5a..771bd41 100644 --- a/Makefile.in +++ b/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/ diff --git a/branding.spec b/branding.spec index f7c7ac0..273b74f 100644 --- a/branding.spec +++ b/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 8.90-alt1 - Alpha version of ALT Server 9.0 (based on Education by cas@). diff --git a/menu/50-xfce-applications.menu b/menu/50-xfce-applications.menu deleted file mode 100644 index 9d1d374..0000000 --- a/menu/50-xfce-applications.menu +++ /dev/null @@ -1,155 +0,0 @@ - - - - Xfce - /usr/share/slinux-style/applications - - - ShallowSettings - altlinux-settings-desktop.directory - - WineSettings - altlinux-wine.directory - - - Wine - Settings - - - - - Settings - - - Wine - X-XFCE-SettingsDialog - - - - xfce-settings-manager.desktop - acc.desktop - - - - - - Screensavers - altlinux-screensaver.directory - - Screensaver - - - - - - xfce4-run.desktop - xfce4-appfinder.desktop - - exo-terminal-emulator.desktop - exo-file-manager.desktop - exo-mail-reader.desktop - exo-web-browser.desktop - - Settings - ShallowSettings - - - - xfce4-about.desktop - xfce4-session-logout.desktop - - - - Settings/DesktopSettings/XFCE - Settings/NativeSettings - - - - Accessories - - WineUtils - altlinux-wine.directory - - - Wine - Utility - - - - - - exo-file-manager.desktop - exo-terminal-emulator.desktop - xfce4-about.desktop - xfce4-run.desktop - Wine - - - - Other - - - X-Xfce-Toplevel - exo-file-manager.desktop - exo-terminal-emulator.desktop - xfce4-about.desktop - xfce4-run.desktop - - - - - - - Internet - - - exo-mail-reader.desktop - exo-web-browser.desktop - - - - Other - - - exo-mail-reader.desktop - exo-web-browser.desktop - X-Xfce-Toplevel - - - - - - - System - - - xfce4-session-logout.desktop - - - - indexhtml.desktop - livecd-install.desktop - apt-indicator.desktop - - - - - Other - - - xfce4-session-logout.desktop - X-Xfce-Toplevel - - - - - - - X-Xfce-Toplevel - - - applications-menueditor.menu - xfce-applications-menueditor.menu - - diff --git a/menu/altlinux-wine.directory b/menu/altlinux-wine.directory deleted file mode 100644 index 595db8e..0000000 --- a/menu/altlinux-wine.directory +++ /dev/null @@ -1,5 +0,0 @@ -[Desktop Entry] -Name=Wine -Comment=Wine -Icon=wine -Type=Directory \ No newline at end of file diff --git a/menu/applications/codeblocks.desktop b/menu/applications/codeblocks.desktop deleted file mode 100644 index a3aa582..0000000 --- a/menu/applications/codeblocks.desktop +++ /dev/null @@ -1,15 +0,0 @@ -[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; diff --git a/menu/applications/logisim.desktop b/menu/applications/logisim.desktop deleted file mode 100644 index c96ca75..0000000 --- a/menu/applications/logisim.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[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; diff --git a/menu/applications/medit.desktop b/menu/applications/medit.desktop deleted file mode 100644 index cd5841e..0000000 --- a/menu/applications/medit.desktop +++ /dev/null @@ -1,25 +0,0 @@ -[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; diff --git a/menu/applications/wine-regedit.desktop b/menu/applications/wine-regedit.desktop deleted file mode 100644 index a910661..0000000 --- a/menu/applications/wine-regedit.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[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; diff --git a/menu/applications/wine-uninstaller.desktop b/menu/applications/wine-uninstaller.desktop deleted file mode 100644 index bf12aaa..0000000 --- a/menu/applications/wine-uninstaller.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[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; diff --git a/menu/applications/wine-winecfg.desktop b/menu/applications/wine-winecfg.desktop deleted file mode 100644 index 08108a4..0000000 --- a/menu/applications/wine-winecfg.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[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; diff --git a/menu/hidden-menu-entries b/menu/hidden-menu-entries deleted file mode 100644 index 9899161..0000000 --- a/menu/hidden-menu-entries +++ /dev/null @@ -1,50 +0,0 @@ -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