officecfg/registry/data/org/openoffice/Setup.xcu | 2 setup_native/source/packinfo/packinfo_brand.txt | 24 +++++++ setup_native/source/packinfo/packinfo_extensions.txt | 8 ++ setup_native/source/packinfo/packinfo_office.txt | 61 +++++++++++++++++- setup_native/source/packinfo/packinfo_office_help.txt | 3 setup_native/source/packinfo/packinfo_office_lang.txt | 4 - setup_native/source/packinfo/packinfo_sdkoo.txt | 2 setup_native/source/packinfo/packinfo_ure.txt | 8 +- sysui/desktop/debian/control | 2 sysui/desktop/freedesktop/freedesktop-menus.spec | 1 sysui/productlist.mk | 2 11 files changed, 106 insertions(+), 11 deletions(-)
New commits: commit 66cf3f31f6db9dd4b54e06913ac377ae731e4c82 Author: Gabor Kelemen <[email protected]> AuthorDate: Wed Aug 31 00:30:49 2022 +0200 Commit: Gabor Kelemen <[email protected]> CommitDate: Wed Aug 31 08:10:19 2022 +0200 [CIBO] Support old brand profile dir migration on Linux as well Change-Id: I79a105aea5d126ae3df84ceefce7c43009279e9b diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu index acd6503c7914..d8b8f15e8600 100644 --- a/officecfg/registry/data/org/openoffice/Setup.xcu +++ b/officecfg/registry/data/org/openoffice/Setup.xcu @@ -781,7 +781,7 @@ <value>10</value> </prop> <prop oor:name="VersionIdentifiers"> - <value oor:separator=",">LibreOffice powered by CIB=LibreOfficepoweredbyCIB/4,Libreoffice 3=libreoffice/3,Openoffice.org 3=openoffice.org/3,OpenOffice.org 2=openoffice.org2,StarOffice 8=staroffice8,StarSuite 8=starsuite8</value> + <value oor:separator=",">LibreOffice powered by CIB=libreofficepoweredbycib/4,Libreoffice 3=libreoffice/3,Openoffice.org 3=openoffice.org/3,OpenOffice.org 2=openoffice.org2,StarOffice 8=staroffice8,StarSuite 8=starsuite8</value> </prop> <node oor:name="MigrationSteps"> <node oor:name="Datasources" oor:op="replace"> commit f9044209817710689ce26566ff34986ab7b3e081 Author: Gabor Kelemen <[email protected]> AuthorDate: Tue Aug 30 23:25:01 2022 +0200 Commit: Gabor Kelemen <[email protected]> CommitDate: Tue Aug 30 23:26:32 2022 +0200 [CIBO] Support upgrade from Linux packages with old productname still not perfect when installing cibofficebasis6.4-en-us Change-Id: Iccbf4c3895a0d34d181c491c675de0945bf0e9d9 diff --git a/setup_native/source/packinfo/packinfo_brand.txt b/setup_native/source/packinfo/packinfo_brand.txt index 80bad782774c..b4909fc6c266 100644 --- a/setup_native/source/packinfo/packinfo_brand.txt +++ b/setup_native/source/packinfo/packinfo_brand.txt @@ -22,12 +22,15 @@ solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-images %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure (Name="UNO Runtime Environment"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-images (Name="Images module for %PRODUCTNAME %PRODUCTVERSION")" +linuxreplaces = "libreofficepoweredbycib6.4" +linuxincompat = "libreofficepoweredbycib6.4" copyright = "2022 CIB software GmbH" solariscopyright = "solariscopyrightfile" vendor = "CIB software GmbH" description = "Brand module for %PRODUCTNAME %PRODUCTVERSION" destpath = "/opt" packageversion = "%PACKAGEVERSION" +provides = "libreofficepoweredbycib6.4" End Start @@ -36,12 +39,15 @@ solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-writer" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-writer" requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-writer %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-writer" +linuxreplaces = "libreofficepoweredbycib6.4-writer" +linuxincompat = "libreofficepoweredbycib6.4-writer" copyright = "2022 CIB software GmbH" solariscopyright = "solariscopyrightfile" vendor = "CIB software GmbH" description = "Writer brand module for %PRODUCTNAME %PRODUCTVERSION" destpath = "/opt" packageversion = "%PACKAGEVERSION" +provides = "libreofficepoweredbycib6.4-writer" End Start @@ -50,12 +56,15 @@ solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-calc" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-calc" requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-calc %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-calc" +linuxreplaces = "libreofficepoweredbycib6.4-calc" +linuxincompat = "libreofficepoweredbycib6.4-calc" copyright = "2022 CIB software GmbH" solariscopyright = "solariscopyrightfile" vendor = "CIB software GmbH" description = "Calc brand module for %PRODUCTNAME %PRODUCTVERSION" destpath = "/opt" packageversion = "%PACKAGEVERSION" +provides = "libreofficepoweredbycib6.4-calc" End Start @@ -64,12 +73,15 @@ solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-impress" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-impress" requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-impress %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-impress" +linuxreplaces = "libreofficepoweredbycib6.4-impress" +linuxincompat = "libreofficepoweredbycib6.4-impress" copyright = "2022 CIB software GmbH" solariscopyright = "solariscopyrightfile" vendor = "CIB software GmbH" description = "Impress brand module for %PRODUCTNAME %PRODUCTVERSION" destpath = "/opt" packageversion = "%PACKAGEVERSION" +provides = "libreofficepoweredbycib6.4-impress" End Start @@ -78,12 +90,15 @@ solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-draw" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-draw" requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-draw %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-draw" +linuxreplaces = "libreofficepoweredbycib6.4-draw" +linuxincompat = "libreofficepoweredbycib6.4-draw" copyright = "2022 CIB software GmbH" solariscopyright = "solariscopyrightfile" vendor = "CIB software GmbH" description = "Draw brand module for %PRODUCTNAME %PRODUCTVERSION" destpath = "/opt" packageversion = "%PACKAGEVERSION" +provides = "libreofficepoweredbycib6.4-draw" End Start @@ -92,12 +107,15 @@ solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-math" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-math" requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-math %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-math" +linuxreplaces = "libreofficepoweredbycib6.4-math" +linuxincompat = "libreofficepoweredbycib6.4-math" copyright = "2022 CIB software GmbH" solariscopyright = "solariscopyrightfile" vendor = "CIB software GmbH" description = "Math brand module for %PRODUCTNAME %PRODUCTVERSION" destpath = "/opt" packageversion = "%PACKAGEVERSION" +provides = "libreofficepoweredbycib6.4-math" End Start @@ -106,12 +124,15 @@ solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-base" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-base" requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-base %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-base" +linuxreplaces = "libreofficepoweredbycib6.4-base" +linuxincompat = "libreofficepoweredbycib6.4-base" copyright = "2022 CIB software GmbH" solariscopyright = "solariscopyrightfile" vendor = "CIB software GmbH" description = "Base brand module for %PRODUCTNAME %PRODUCTVERSION" destpath = "/opt" packageversion = "%PACKAGEVERSION" +provides = "libreofficepoweredbycib6.4-base" End Start @@ -120,10 +141,13 @@ solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-%LANGUAGEST packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-%LANGUAGESTRING" requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING (Name="Language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING")" +linuxreplaces = "libreofficepoweredbycib6.4-%LANGUAGESTRING" +linuxincompat = "libreofficepoweredbycib6.4-%LANGUAGESTRING" copyright = "2022 CIB software GmbH" solariscopyright = "solariscopyrightfile" vendor = "CIB software GmbH" description = "Brand language module for %PRODUCTNAME %PRODUCTVERSION" destpath = "/opt" packageversion = "%PACKAGEVERSION" +provides = "libreofficepoweredbycib6.4-%LANGUAGESTRING" End diff --git a/setup_native/source/packinfo/packinfo_extensions.txt b/setup_native/source/packinfo/packinfo_extensions.txt index cb23f7f11b42..bb50dec0f3a6 100644 --- a/setup_native/source/packinfo/packinfo_extensions.txt +++ b/setup_native/source/packinfo/packinfo_extensions.txt @@ -41,6 +41,8 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core (Name="Cor packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-mediawiki-publisher" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" +linuxreplaces = "libreofficepoweredbycibbasis6.4-extension-mediawiki-publisher" +linuxincompat = "libreofficepoweredbycibbasis6.4-extension-mediawiki-publisher" copyright = "2022 CIB software GmbH" solariscopyright = "solariscopyrightfile" vendor = "CIB software GmbH" @@ -86,6 +88,8 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core (Name="Cor packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-nlpsolver" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" +linuxreplaces = "libreofficepoweredbycibbasis6.4-extension-nlpsolver" +linuxincompat = "libreofficepoweredbycibbasis6.4-extension-nlpsolver" copyright = "2022 CIB software GmbH" solariscopyright = "solariscopyrightfile" vendor = "CIB software GmbH" @@ -116,6 +120,8 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core (Name="Cor packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-beanshell-script-provider" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" +linuxreplaces = "libreofficepoweredbycibbasis6.4-extension-beanshell-script-provider" +linuxincompat = "libreofficepoweredbycibbasis6.4-extension-beanshell-script-provider" copyright = "2022 CIB software GmbH" solariscopyright = "solariscopyrightfile" vendor = "CIB software GmbH" @@ -131,6 +137,8 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core (Name="Cor packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-javascript-script-provider" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" +linuxreplaces = "libreofficepoweredbycibbasis6.4-extension-javascript-script-provider" +linuxincompat = "libreofficepoweredbycibbasis6.4-extension-javascript-script-provider" copyright = "2022 CIB software GmbH" solariscopyright = "solariscopyrightfile" vendor = "CIB software GmbH" diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt index cbafe649d9fd..48a1b1be91ae 100644 --- a/setup_native/source/packinfo/packinfo_office.txt +++ b/setup_native/source/packinfo/packinfo_office.txt @@ -47,6 +47,8 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-gnome-integration" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" findrequires = "" +linuxreplaces = "libreofficepoweredbycibbasis6.4-gnome-integration" +linuxincompat = "libreofficepoweredbycibbasis6.4-gnome-integration" copyright = "2022 CIB software GmbH" solariscopyright = "solariscopyrightfile" vendor = "CIB software GmbH" @@ -77,19 +79,23 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core" packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-kde-integration" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" +linuxreplaces = "libreofficepoweredbycibbasis6.4-kde-integration" +linuxincompat = "libreofficepoweredbycibbasis6.4-kde-integration" copyright = "2022 CIB software GmbH" solariscopyright = "solariscopyrightfile" vendor = "CIB software GmbH" description = "KDE integration module for %PRODUCTNAME %PRODUCTVERSION" destpath = "/opt" packageversion = "%PACKAGEVERSION" +provides = "libreofficepoweredbycibbasis6.4-kde-integration" End Start module = "gid_Module_Root" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core" packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" -linuxreplaces = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01, %BASISPACKAGEPREFIX%PRODUCTVERSION-core02, %BASISPACKAGEPREFIX%PRODUCTVERSION-core03, %BASISPACKAGEPREFIX%PRODUCTVERSION-core04, %BASISPACKAGEPREFIX%PRODUCTVERSION-core05, %BASISPACKAGEPREFIX%PRODUCTVERSION-core06, %BASISPACKAGEPREFIX%PRODUCTVERSION-core07" +linuxreplaces = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01, %BASISPACKAGEPREFIX%PRODUCTVERSION-core02, %BASISPACKAGEPREFIX%PRODUCTVERSION-core03, %BASISPACKAGEPREFIX%PRODUCTVERSION-core04, %BASISPACKAGEPREFIX%PRODUCTVERSION-core05, %BASISPACKAGEPREFIX%PRODUCTVERSION-core06, %BASISPACKAGEPREFIX%PRODUCTVERSION-core07, libreofficepoweredbycibbasis6.4-core" +linuxincompat = "libreofficepoweredbycibbasis6.4-core" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION, %BASISPACKAGEPREFIX%PRODUCTVERSION-ooofonts %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" solarisrequires = "SUNWcar, SUNWkvm, SUNWcsr, SUNWcsu, SUNWcsd, SUNWcsl, SUNWxwrtl, SUNWxwplt, SUNWlibC, %SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-ooofonts" @@ -101,6 +107,7 @@ vendor = "CIB software GmbH" description = "Core module for %PRODUCTNAME %PRODUCTVERSION" destpath = "/opt" packageversion = "%PACKAGEVERSION" +provides = "libreofficepoweredbycibbasis6.4-core" End Start @@ -110,6 +117,8 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-writer" solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, SUNWlibC" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" +linuxreplaces = "libreofficepoweredbycibbasis6.4-writer" +linuxincompat = "libreofficepoweredbycibbasis6.4-writer" copyright = "2022 CIB software GmbH" solariscopyright = "solariscopyrightfile" vendor = "CIB software GmbH" @@ -125,6 +134,8 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, SUNWlibC" packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-calc" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" +linuxreplaces = "libreofficepoweredbycibbasis6.4-calc" +linuxincompat = "libreofficepoweredbycibbasis6.4-calc" copyright = "2022 CIB software GmbH" solariscopyright = "solariscopyrightfile" vendor = "CIB software GmbH" @@ -140,6 +151,8 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, SUNWlibC" packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-draw" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" +linuxreplaces = "libreofficepoweredbycibbasis6.4-draw" +linuxincompat = "libreofficepoweredbycibbasis6.4-draw" copyright = "2022 CIB software GmbH" solariscopyright = "solariscopyrightfile" vendor = "CIB software GmbH" @@ -155,6 +168,8 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, SUNWlibC" packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-impress" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" +linuxreplaces = "libreofficepoweredbycibbasis6.4-impress" +linuxincompat = "libreofficepoweredbycibbasis6.4-impress" copyright = "2022 CIB software GmbH" solariscopyright = "solariscopyrightfile" vendor = "CIB software GmbH" @@ -170,6 +185,8 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, SUNWlibC" packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-base" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" +linuxreplaces = "libreofficepoweredbycibbasis6.4-base" +linuxincompat = "libreofficepoweredbycibbasis6.4-base" copyright = "2022 CIB software GmbH" solariscopyright = "solariscopyrightfile" vendor = "CIB software GmbH" @@ -185,6 +202,8 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, SUNWlibC" packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-math" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" +linuxreplaces = "libreofficepoweredbycibbasis6.4-math" +linuxincompat = "libreofficepoweredbycibbasis6.4-math" copyright = "2022 CIB software GmbH" solariscopyright = "solariscopyrightfile" vendor = "CIB software GmbH" @@ -200,6 +219,8 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core" packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-firebird" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" +linuxreplaces = "libreofficepoweredbycibbasis6.4-firebird" +linuxincompat = "libreofficepoweredbycibbasis6.4-firebird" copyright = "2022 CIB software GmbH" solariscopyright = "solariscopyrightfile" vendor = "CIB software GmbH" @@ -215,6 +236,8 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core" packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-graphicfilter" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" +linuxreplaces = "libreofficepoweredbycibbasis6.4-graphicfilter" +linuxincompat = "libreofficepoweredbycibbasis6.4-graphicfilter" copyright = "2022 CIB software GmbH" solariscopyright = "solariscopyrightfile" vendor = "CIB software GmbH" @@ -230,6 +253,8 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core" packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-xsltfilter" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" +linuxreplaces = "libreofficepoweredbycibbasis6.4-xsltfilter" +linuxincompat = "libreofficepoweredbycibbasis6.4-xsltfilter" copyright = "2022 CIB software GmbH" solariscopyright = "solariscopyrightfile" vendor = "CIB software GmbH" @@ -272,8 +297,8 @@ module = "gid_Module_Pyuno" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-pyuno" solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, SUNWPython" packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-pyuno" -linuxreplaces = "%BASISPACKAGEPREFIX%PRODUCTVERSION-librelogo" -linuxincompat = "%BASISPACKAGEPREFIX%PRODUCTVERSION-librelogo" +linuxreplaces = "%BASISPACKAGEPREFIX%PRODUCTVERSION-librelogo, libreofficepoweredbycibbasis6.4-pyuno" +linuxincompat = "%BASISPACKAGEPREFIX%PRODUCTVERSION-librelogo, libreofficepoweredbycibbasis6.4-pyuno" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" copyright = "2022 CIB software GmbH" @@ -291,6 +316,8 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core (Name="Cor packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-python-script-provider" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" +linuxreplaces = "libreofficepoweredbycibbasis6.4-python-script-provider" +linuxincompat = "libreofficepoweredbycibbasis6.4-python-script-provider" copyright = "2022 CIB software GmbH" solariscopyright = "solariscopyrightfile" vendor = "CIB software GmbH" @@ -306,6 +333,8 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core" packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-images" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" +linuxreplaces = "libreofficepoweredbycibbasis6.4-images" +linuxincompat = "libreofficepoweredbycibbasis6.4-images" copyright = "2022 CIB software GmbH" solariscopyright = "solariscopyrightfile" vendor = "CIB software GmbH" @@ -321,6 +350,8 @@ solarisrequires = "" packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-ooofonts" freebsdrequires = "" requires = "" +linuxreplaces = "libreofficepoweredbycibbasis6.4-ooofonts" +linuxincompat = "libreofficepoweredbycibbasis6.4-ooofonts" copyright = "2022 CIB software GmbH" solariscopyright = "solariscopyrightfile" vendor = "CIB software GmbH" @@ -336,6 +367,8 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core" packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-ooolinguistic" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" +linuxreplaces = "libreofficepoweredbycibbasis6.4-ooolinguistic" +linuxincompat = "libreofficepoweredbycibbasis6.4-ooolinguistic" copyright = "2022 CIB software GmbH" solariscopyright = "solariscopyrightfile" vendor = "CIB software GmbH" @@ -531,6 +564,8 @@ solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEP packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-de" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" +linuxreplaces = "libreofficepoweredbycib6.4-dict-de" +linuxincompat = "libreofficepoweredbycib6.4-dict-de" copyright = "2022 CIB software GmbH" solariscopyright = "solariscopyrightfile" vendor = "CIB software GmbH" @@ -546,6 +581,8 @@ solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEP packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-en" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" +linuxreplaces = "libreofficepoweredbycib6.4-dict-en" +linuxincompat = "libreofficepoweredbycib6.4-dict-en" copyright = "2022 CIB software GmbH" solariscopyright = "solariscopyrightfile" vendor = "CIB software GmbH" @@ -576,6 +613,8 @@ solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEP packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-es" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" +linuxreplaces = "libreofficepoweredbycib6.4-dict-es" +linuxincompat = "libreofficepoweredbycib6.4-dict-es" copyright = "2022 CIB software GmbH" solariscopyright = "solariscopyrightfile" vendor = "CIB software GmbH" @@ -606,6 +645,8 @@ solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEP packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-fr" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" +linuxreplaces = "libreofficepoweredbycib6.4-dict-fr" +linuxincompat = "libreofficepoweredbycib6.4-dict-fr" copyright = "2022 CIB software GmbH" solariscopyright = "solariscopyrightfile" vendor = "CIB software GmbH" @@ -756,6 +797,8 @@ solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEP packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-it" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" +linuxreplaces = "libreofficepoweredbycib6.4-dict-it" +linuxincompat = "libreofficepoweredbycib6.4-dict-it" copyright = "2022 CIB software GmbH" solariscopyright = "solariscopyrightfile" vendor = "CIB software GmbH" @@ -951,6 +994,8 @@ solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEP packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-ru" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" +linuxreplaces = "libreofficepoweredbycib6.4-dict-ru" +linuxincompat = "libreofficepoweredbycib6.4-dict-ru" copyright = "2022 CIB software GmbH" solariscopyright = "solariscopyrightfile" vendor = "CIB software GmbH" @@ -1147,6 +1192,8 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-impress" packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-ogltrans" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-impress" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-impress %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" +linuxreplaces = "libreofficepoweredbycibbasis6.4-ogltrans" +linuxincompat = "libreofficepoweredbycibbasis6.4-ogltrans" copyright = "2022 CIB software GmbH" solariscopyright = "solariscopyrightfile" vendor = "CIB software GmbH" @@ -1162,6 +1209,8 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-base" packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-postgresql-sdbc" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-base" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-base %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" +linuxreplaces = "libreofficepoweredbycibbasis6.4-postgresql-sdbc" +linuxincompat = "libreofficepoweredbycibbasis6.4-postgresql-sdbc" copyright = "2022 CIB software GmbH" solariscopyright = "solariscopyrightfile" vendor = "CIB software GmbH" @@ -1177,6 +1226,8 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core (Name="Core packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-pdf-import" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" +linuxreplaces = "libreofficepoweredbycibbasis6.4-extension-pdf-import" +linuxincompat = "libreofficepoweredbycibbasis6.4-extension-pdf-import" copyright = "2022 CIB software GmbH" solariscopyright = "solariscopyrightfile" vendor = "CIB software GmbH" @@ -1192,6 +1243,8 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core (Name="Core packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-report-builder" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" +linuxreplaces = "libreofficepoweredbycibbasis6.4-extension-report-builder" +linuxincompat = "libreofficepoweredbycibbasis6.4-extension-report-builder" copyright = "2022 CIB software GmbH" solariscopyright = "solariscopyrightfile" vendor = "CIB software GmbH" @@ -1207,6 +1260,8 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core (Name="Core packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-libreofficekit-data" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" +linuxreplaces = "libreofficepoweredbycibbasis6.4-libreofficekit-data" +linuxincompat = "libreofficepoweredbycibbasis6.4-libreofficekit-data" copyright = "2022 CIB software GmbH" solariscopyright = "solariscopyrightfile" vendor = "CIB software GmbH" diff --git a/setup_native/source/packinfo/packinfo_office_help.txt b/setup_native/source/packinfo/packinfo_office_help.txt index f6d6b85c04f6..970aabd59cc5 100644 --- a/setup_native/source/packinfo/packinfo_office_help.txt +++ b/setup_native/source/packinfo/packinfo_office_help.txt @@ -39,8 +39,9 @@ module = "gid_Module_Helppack_Help" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-help" solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING" packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-help" -provides = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-help" +provides = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-help, libreofficepoweredbycibbasis6.4-%LANGUAGESTRING-help" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" +linuxreplaces = "libreofficepoweredbycibbasis6.4-%LANGUAGESTRING-help" copyright = "2022 CIB software GmbH" solariscopyright = "solariscopyrightfile" vendor = "CIB software GmbH" diff --git a/setup_native/source/packinfo/packinfo_office_lang.txt b/setup_native/source/packinfo/packinfo_office_lang.txt index e33e12209e12..a084d4b14b71 100644 --- a/setup_native/source/packinfo/packinfo_office_lang.txt +++ b/setup_native/source/packinfo/packinfo_office_lang.txt @@ -39,8 +39,10 @@ module = "gid_Module_Langpack_Basis" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING" solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core" packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING" -provides = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING" +provides = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING,libreofficepoweredbycibbasis6.4-%LANGUAGESTRING" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" +linuxreplaces = "libreofficepoweredbycibbasis6.4-%LANGUAGESTRING" +linuxincompat = "libreofficepoweredbycibbasis6.4-%LANGUAGESTRING" copyright = "2022 CIB software GmbH" solariscopyright = "solariscopyrightfile" vendor = "CIB software GmbH" diff --git a/setup_native/source/packinfo/packinfo_sdkoo.txt b/setup_native/source/packinfo/packinfo_sdkoo.txt index bdb9d9000155..d193b238c361 100644 --- a/setup_native/source/packinfo/packinfo_sdkoo.txt +++ b/setup_native/source/packinfo/packinfo_sdkoo.txt @@ -23,6 +23,8 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, SUNWbtool packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-sdk" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" +linuxreplaces = "libreofficepoweredbycibbasis6.4-sdk" +linuxincompat = "libreofficepoweredbycibbasis6.4-sdk" copyright = "2022 CIB software GmbH" solariscopyright = "solariscopyrightfile" vendor = "CIB software GmbH" diff --git a/setup_native/source/packinfo/packinfo_ure.txt b/setup_native/source/packinfo/packinfo_ure.txt index 7672ce321a98..4fccbb70754c 100644 --- a/setup_native/source/packinfo/packinfo_ure.txt +++ b/setup_native/source/packinfo/packinfo_ure.txt @@ -21,8 +21,8 @@ module = "gid_Module_Root" solarispackagename = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure" solarisrequires = "SUNWzlibr" solarisprovides = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlibs" -linuxreplaces = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlibs" -linuxincompat = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlibs" +linuxreplaces = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlibs, libreofficepoweredbycib6.4-ure" +linuxincompat = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlibs, libreofficepoweredbycib6.4-ure" packagename = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure" copyright = "2022 CIB software GmbH" solariscopyright = "solariscopyrightfile" @@ -37,8 +37,8 @@ module = "gid_Module_Root_Ure_Hidden" solarispackagename = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure" solarisrequires = "SUNWzlibr" solarisprovides = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlibs" -linuxreplaces = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlibs" -linuxincompat = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlibs" +linuxreplaces = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlibs, libreofficepoweredbycib6.4-ure" +linuxincompat = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlibs, libreofficepoweredbycib6.4-ure" packagename = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure" copyright = "2022 CIB software GmbH" solariscopyright = "solariscopyrightfile" diff --git a/sysui/desktop/debian/control b/sysui/desktop/debian/control index 141069ddeb70..8fae8a745534 100644 --- a/sysui/desktop/debian/control +++ b/sysui/desktop/debian/control @@ -1,3 +1,5 @@ Description: %productname desktop integration Maintainer: CIB software GmbH Architecture: all +Replaces: libreofficepoweredbycib6.4-debian-menus +Conflicts: libreofficepoweredbycib6.4-debian-menus diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec b/sysui/desktop/freedesktop/freedesktop-menus.spec index 8ffc00089001..239a116a1700 100644 --- a/sysui/desktop/freedesktop/freedesktop-menus.spec +++ b/sysui/desktop/freedesktop/freedesktop-menus.spec @@ -30,6 +30,7 @@ Conflicts: %pkgprefix-suse-menus Conflicts: %pkgprefix-debian-menus Conflicts: %pkgprefix-redhat-menus Conflicts: %pkgprefix-mandriva-menus +Obsoletes: libreofficepoweredbycib6.4-freedesktop-menus BuildArch: noarch AutoReqProv: no %define _binary_filedigest_algorithm 1 commit 05187f867614b8fa0605129d4418996ad5c2d489 Author: Gabor Kelemen <[email protected]> AuthorDate: Tue Aug 30 23:12:58 2022 +0200 Commit: Gabor Kelemen <[email protected]> CommitDate: Tue Aug 30 23:12:58 2022 +0200 [CIBO] Fix typo in Unix product name Change-Id: Iebefc91e39aa8bdb35ce52ad55ab12ba72844257 diff --git a/sysui/productlist.mk b/sysui/productlist.mk index 2992e2f921e4..207be0506ef3 100644 --- a/sysui/productlist.mk +++ b/sysui/productlist.mk @@ -15,6 +15,6 @@ PRODUCTNAME.libreofficedev := LibreOfficeDev PRODUCTNAME.ciboffice := CIBOffice UNIXFILENAME.libreoffice := libreoffice$(PKGVERSIONSHORT) UNIXFILENAME.libreofficedev := libreofficedev$(PKGVERSIONSHORT) -UNIXFILENAME.ciboffice := cibboffice$(PKGVERSIONSHORT) +UNIXFILENAME.ciboffice := ciboffice$(PKGVERSIONSHORT) # vim: set noet sw=4 ts=4:
