Commit 012ae45a authored by Roman Alifanov's avatar Roman Alifanov

Merge branch 'remove-libreoffice-still-0.9.4' into 'ximper_0.9.4'

Удалить LibreOffice-still и избавиться от виртуального пакета LibreOffice See merge request !8
parents ee9b2f7b 0d72a3e4
...@@ -90,7 +90,6 @@ use/ximper/software/base: ...@@ -90,7 +90,6 @@ use/ximper/software/base:
etersoft/base/office/atril\ etersoft/base/office/atril\
etersoft/base/office/fragments\ etersoft/base/office/fragments\
etersoft/base/office/libreoffice-latest\ etersoft/base/office/libreoffice-latest\
etersoft/base/office/libreoffice-still\
\ \
etersoft/groups/02_multimedia\ etersoft/groups/02_multimedia\
etersoft/base/multimedia/amberol\ etersoft/base/multimedia/amberol\
...@@ -118,7 +117,6 @@ use/ximper/software/base: ...@@ -118,7 +117,6 @@ use/ximper/software/base:
) )
@$(call add,LIVE_LISTS,\ @$(call add,LIVE_LISTS,\
etersoft/base/browsers/yandex-browser-stable\ etersoft/base/browsers/yandex-browser-stable\
etersoft/base/office/libreoffice-still\
etersoft/base/office/atril\ etersoft/base/office/atril\
etersoft/base/messengers/telegram\ etersoft/base/messengers/telegram\
etersoft/base/graphics/shotwell\ etersoft/base/graphics/shotwell\
......
[Desktop Entry] [Desktop Entry]
Encoding=UTF-8 Encoding=UTF-8
Type=Directory Type=Directory
Name=LibreOffice (latest) Name=LibreOffice
X-Alterator-PackageList=etersoft/base/office/libreoffice-latest X-Alterator-PackageList=etersoft/base/office/libreoffice-latest
X-Alterator-Required=no X-Alterator-Required=yes
Name[ru_RU]=LibreOffice (последний) Name[ru_RU]=Офисный пакет LibreOffice
X-Alterator-Parent=etersoft/groups/03_office X-Alterator-Parent=etersoft/groups/03_office
X-Alterator-Conflicts=etersoft/base/office/libreoffice-still
[Desktop Entry]
Encoding=UTF-8
Type=Directory
Name=LibreOffice-still (stable)
X-Alterator-PackageList=etersoft/base/office/libreoffice-still
X-Alterator-Required=yes
Name[ru_RU]=LibreOffice-still (стабильный)
X-Alterator-Parent=etersoft/groups/03_office
X-Alterator-Conflicts=etersoft/base/office/libreoffice-latest
LibreOffice libreoffice
LibreOffice-langpack-ru libreoffice-langpack-ru
LibreOffice-gtk3 libreoffice-gtk3
LibreOffice-common
java-17-openjdk java-17-openjdk
......
LibreOffice-still
LibreOffice-still-langpack-ru
LibreOffice-still-gtk3
LibreOffice-still-common
java-17-openjdk
document-templates
templates
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