Makefile.fetch                                                      |   15 
 Repository.mk                                                       |   13 
 config_host.mk.in                                                   |    1 
 configure.ac                                                        |   42 
 cui/source/dialogs/about.cxx                                        |    2 
 distro-configs/CPAndroidBranding.conf                               |    3 
 distro-configs/CPLinux-LOKit.conf                                   |   65 
 distro-configs/CPLinux.conf                                         |   48 
 distro-configs/CPOSX.conf                                           |   20 
 distro-configs/CPWin32-MPL.conf                                     |   28 
 distro-configs/CPWin32.conf                                         |   26 
 distro-configs/CPWin64.conf                                         |   26 
 download.lst                                                        |   22 
 external/Module_external.mk                                         |    1 
 external/more_fonts/ExternalPackage_karla.mk                        |   19 
 external/more_fonts/ExternalPackage_opendyslexic.mk                 |   19 
 external/more_fonts/Module_more_fonts.mk                            |    4 
 external/more_fonts/UnpackedTarball_karla.mk                        |   14 
 external/more_fonts/UnpackedTarball_opendyslexic.mk                 |   14 
 external/noto_font/ExternalPackage_noto.mk                          |  134 
 external/noto_font/ExternalPackage_notosansjp.mk                    |   17 
 external/noto_font/ExternalPackage_notosanskr.mk                    |   17 
 external/noto_font/ExternalPackage_notosanssc.mk                    |   17 
 external/noto_font/ExternalPackage_notosanstc.mk                    |   17 
 external/noto_font/ExternalPackage_notoserifjp.mk                   |   17 
 external/noto_font/ExternalPackage_notoserifkr.mk                   |   17 
 external/noto_font/ExternalPackage_notoserifsc.mk                   |   17 
 external/noto_font/ExternalPackage_notoseriftc.mk                   |   17 
 external/noto_font/Makefile                                         |    7 
 external/noto_font/Module_noto_font.mk                              |   33 
 external/noto_font/README                                           |    1 
 external/noto_font/UnpackedTarball_noto.mk                          |   46 
 external/noto_font/UnpackedTarball_notosansjp.mk                    |   14 
 external/noto_font/UnpackedTarball_notosanskr.mk                    |   14 
 external/noto_font/UnpackedTarball_notosanssc.mk                    |   14 
 external/noto_font/UnpackedTarball_notosanstc.mk                    |   14 
 external/noto_font/UnpackedTarball_notoserifjp.mk                   |   14 
 external/noto_font/UnpackedTarball_notoserifkr.mk                   |   14 
 external/noto_font/UnpackedTarball_notoserifsc.mk                   |   14 
 external/noto_font/UnpackedTarball_notoseriftc.mk                   |   14 
 framework/source/helper/titlebarupdate.cxx                          |    2 
 icon-themes/colibre/sfx2/res/logo.png                               |binary
 icon-themes/galaxy/brand_cp/about.svg                               | 1463 
+++++++++
 icon-themes/galaxy/brand_cp/about_inverted.svg                      | 1452 
+++++++++
 icon-themes/galaxy/brand_cp/flat_logo.svg                           |  717 ++++
 icon-themes/galaxy/brand_cp/intro-highres.png                       |binary
 icon-themes/galaxy/brand_cp/intro.png                               |binary
 icon-themes/galaxy/brand_cp/logo-sc.svg                             |   98 
 icon-themes/galaxy/brand_cp/logo-sc_inverted.svg                    |   59 
 icon-themes/galaxy/brand_cp/logo.svg                                |   98 
 icon-themes/galaxy/brand_cp/logo_inverted.svg                       |   59 
 icon-themes/galaxy/brand_cp_snapshot/about.svg                      | 1511 
+++++++++
 icon-themes/galaxy/brand_cp_snapshot/about_inverted.svg             | 1535 
++++++++++
 icon-themes/galaxy/brand_cp_snapshot/flat_logo.svg                  |  736 ++++
 icon-themes/galaxy/brand_cp_snapshot/intro-highres.png              |binary
 icon-themes/galaxy/brand_cp_snapshot/intro.png                      |binary
 icon-themes/galaxy/brand_cp_snapshot/logo-sc.svg                    |   98 
 icon-themes/galaxy/brand_cp_snapshot/logo-sc_inverted.svg           |   59 
 icon-themes/galaxy/brand_cp_snapshot/logo.svg                       |   98 
 icon-themes/galaxy/brand_cp_snapshot/logo_inverted.svg              |   59 
 icon-themes/karasa_jaga/sfx2/res/logo.png                           |binary
 include/default.rc                                                  |    2 
 instsetoo_native/CustomTarget_install.mk                            |    1 
 instsetoo_native/CustomTarget_setup.mk                              |   18 
 instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp |binary
 instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp  |binary
 instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt |    8 
 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt  |    8 
 instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt       |    8 
 instsetoo_native/util/openoffice.lst.in                             |   51 
 officecfg/registry/data/org/openoffice/Office/Common.xcu            |    2 
 postprocess/CustomTarget_registry.mk                                |    2 
 readlicense_oo/license/license.xml                                  |   14 
 scp2/inc/macros.inc                                                 |   30 
 scp2/source/base/folderitem_base.scp                                |    2 
 scp2/source/base/registryitem_base.scp                              |   26 
 scp2/source/calc/folderitem_calc.scp                                |    2 
 scp2/source/calc/registryitem_calc.scp                              |   94 
 scp2/source/draw/folderitem_draw.scp                                |    2 
 scp2/source/draw/registryitem_draw.scp                              |   96 
 scp2/source/impress/folderitem_impress.scp                          |    2 
 scp2/source/impress/registryitem_impress.scp                        |  100 
 scp2/source/math/folderitem_math.scp                                |    2 
 scp2/source/math/registryitem_math.scp                              |   56 
 scp2/source/ooo/folderitem_ooo.scp                                  |    6 
 scp2/source/writer/folderitem_writer.scp                            |    2 
 scp2/source/writer/registryitem_writer.scp                          |  182 -
 setup_native/source/packinfo/osxdndinstall.png                      |binary
 setup_native/source/packinfo/package_names.txt                      |   84 
 setup_native/source/packinfo/packinfo_brand.txt                     |  103 
 setup_native/source/packinfo/packinfo_extensions.txt                |   78 
 setup_native/source/packinfo/packinfo_librelogo_disabled.txt        |    2 
 setup_native/source/packinfo/packinfo_office.txt                    |  882 
++---
 setup_native/source/packinfo/packinfo_office_help.txt               |   16 
 setup_native/source/packinfo/packinfo_office_lang.txt               |  160 -
 setup_native/source/packinfo/packinfo_sdkoo.txt                     |   14 
 setup_native/source/packinfo/packinfo_ure.txt                       |   20 
 solenv/bin/modules/installer/download.pm                            |    4 
 solenv/bin/modules/installer/epmfile.pm                             |    6 
 solenv/bin/modules/installer/globals.pm                             |    2 
 solenv/bin/modules/installer/helppack.pm                            |    2 
 solenv/bin/modules/installer/languagepack.pm                        |    2 
 solenv/bin/modules/installer/parameter.pm                           |    2 
 solenv/bin/modules/installer/setupscript.pm                         |    2 
 solenv/bin/modules/installer/simplepackage.pm                       |    2 
 solenv/bin/modules/installer/worker.pm                              |    2 
 solenv/flatpak-manifest.in                                          |    6 
 sysui/CustomTarget_deb.mk                                           |   10 
 sysui/CustomTarget_rpm.mk                                           |   10 
 sysui/desktop/debian/control                                        |    2 
 sysui/desktop/freedesktop/freedesktop-menus.spec                    |    5 
 sysui/desktop/icons/hicolor/1024x1024/apps/main.png                 |binary
 sysui/desktop/icons/hicolor/128x128/apps/main.png                   |binary
 sysui/desktop/icons/hicolor/128x128/apps/startcenter.png            |binary
 sysui/desktop/icons/hicolor/16x16/apps/main.png                     |binary
 sysui/desktop/icons/hicolor/16x16/apps/startcenter.png              |binary
 sysui/desktop/icons/hicolor/256x256/apps/main.png                   |binary
 sysui/desktop/icons/hicolor/256x256/apps/startcenter.png            |binary
 sysui/desktop/icons/hicolor/32x32/apps/main.png                     |binary
 sysui/desktop/icons/hicolor/32x32/apps/startcenter.png              |binary
 sysui/desktop/icons/hicolor/48x48/apps/main.png                     |binary
 sysui/desktop/icons/hicolor/48x48/apps/startcenter.png              |binary
 sysui/desktop/icons/hicolor/512x512/apps/main.png                   |binary
 sysui/desktop/icons/hicolor/scalable/apps/main.svg                  |   78 
 sysui/desktop/icons/hicolor/scalable/apps/startcenter.svg           |   78 
 sysui/desktop/icons/main.icns                                       |binary
 sysui/desktop/icons/soffice.ico                                     |binary
 sysui/desktop/menus/startcenter.desktop                             |    2 
 sysui/desktop/share/create_tree.sh                                  |    8 
 sysui/desktop/share/launcher_comment.ulf                            |    2 
 sysui/productlist.mk                                                |    4 
 vcl/win/app/salinst.cxx                                             |    2 
 132 files changed, 10130 insertions(+), 1071 deletions(-)

New commits:
commit 04ae86ce140985f314f7d2312fa101b55f5ef26c
Author:     Andras Timar <[email protected]>
AuthorDate: Sat Jan 22 22:00:56 2022 +0100
Commit:     Andras Timar <[email protected]>
CommitDate: Sun Feb 13 09:39:00 2022 +0100

    change rpm compression algorithm to multi threaded xz
    
    Our baseline is CentOS 7, it's safe to switch to xz that is supported there.
    Here is my measurement on rpm package build time and package size on a
    48 core machine, however 48 cores were never used (8-10 max). Compared to
    reference w9.gzdio which was used before the patch.
    
    Compression   Build     Package
    method        time %    size %
    w9.gzdio      100%      100%
    w7T.xzdio      69%       66%
    w6T.xzdio      62%       67%
    w5T.xzdio      55%       67%
    w4T.xzdio      41%       70%
    w3T.xzdio      31%       73%
    w2T.xzdio      26%       75%
    w1T.xzdio      24%       77%
    
    Conclusion: we'd like to optimize rather for the build time, therefore
    w1T.xzdio was picked. The package size was still smaller than the reference
    size, and the build time was 4x faster (in this measurement 18m16 -> 4m26).
    That makes a difference.
    
    Change-Id: Iabb532628d38a2d5091fa41fd08bfee69007d0ca

diff --git a/solenv/bin/modules/installer/epmfile.pm 
b/solenv/bin/modules/installer/epmfile.pm
index ecddeb395712..495366823604 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -1193,7 +1193,7 @@ sub set_autoprovreq_in_specfile
         close (FINDREQUIRES);
     }
 
-    $autoreqprovline .= "%define _binary_filedigest_algorithm 1\n%define 
_binary_payload w9.gzdio\n";
+    $autoreqprovline .= "%define _binary_filedigest_algorithm 1\n%define 
_binary_payload w1T.xzdio\n";
 
     for ( my $i = 0; $i <= $#{$changefile}; $i++ )
     {
diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec 
b/sysui/desktop/freedesktop/freedesktop-menus.spec
index 3afa0600de08..2452a44b99dc 100644
--- a/sysui/desktop/freedesktop/freedesktop-menus.spec
+++ b/sysui/desktop/freedesktop/freedesktop-menus.spec
@@ -33,7 +33,7 @@ Conflicts: %pkgprefix-mandriva-menus
 BuildArch: noarch
 AutoReqProv: no
 %define _binary_filedigest_algorithm 1
-%define _binary_payload w9.gzdio
+%define _binary_payload w1T.xzdio
 
 %define gnome_dir /usr
 
commit 77a3333b45e10959863e2980a7b17caaeac2694f
Author:     Thorsten Behrens <[email protected]>
AuthorDate: Sat Jan 15 16:24:33 2022 +0100
Commit:     Andras Timar <[email protected]>
CommitDate: Sun Feb 13 09:38:59 2022 +0100

    Make installer compression tool configurable
    
    So we can use pigz or other parallelizable tools if available. Shaves
    off noticeable build time when packaging install sets.
    
    - figure out if pigz is available (fallback to gzip otherwise)
    - pass compression tool down into make_installer
    - and handle as one of many global options there
    
    Change-Id: Ia9d1ea27a9f990874238b6f0be3e1fd30a662ec6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128469
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <[email protected]>

diff --git a/config_host.mk.in b/config_host.mk.in
index 02f6ec6aba46..dc2bac228fd6 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -87,6 +87,7 @@ export COMPILER_PLUGINS_CXXFLAGS=@COMPILER_PLUGINS_CXXFLAGS@
 export COMPILER_PLUGINS_CXX_LINKFLAGS=@COMPILER_PLUGINS_CXX_LINKFLAGS@
 export COMPILER_PLUGINS_DEBUG=@COMPILER_PLUGINS_DEBUG@
 export COMPILER_PLUGINS_TOOLING_ARGS=@COMPILER_PLUGINS_TOOLING_ARGS@
+export COMPRESSIONTOOL=@COMPRESSIONTOOL@
 export COM_IS_CLANG=@COM_IS_CLANG@
 export CPPU_ENV=@CPPU_ENV@
 export CPPU_ENV_FOR_BUILD=@CPPU_ENV_FOR_BUILD@
diff --git a/configure.ac b/configure.ac
index ca0eadef239d..70c77ea5d7b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2901,6 +2901,16 @@ if test -z "$BASH"; then
 fi
 AC_SUBST(BASH)
 
+# prefer parallel comression tools, if available
+AC_PATH_PROG(COMPRESSIONTOOL, pigz)
+if test -z "$COMPRESSIONTOOL"; then
+    AC_PATH_PROG(COMPRESSIONTOOL, gzip)
+    if test -z "$COMPRESSIONTOOL"; then
+        AC_MSG_ERROR([gzip not found in \$PATH])
+    fi
+fi
+AC_SUBST(COMPRESSIONTOOL)
+
 AC_MSG_CHECKING([for GNU or BSD tar])
 for a in $GNUTAR gtar gnutar bsdtar tar /usr/sfw/bin/gtar; do
     $a --version 2> /dev/null | egrep "GNU|bsdtar"  2>&1 > /dev/null
diff --git a/instsetoo_native/CustomTarget_install.mk 
b/instsetoo_native/CustomTarget_install.mk
index 1dd705217c63..0dab73ad904c 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -85,6 +85,7 @@ $(foreach pkgformat,$(5),\
        -l $(subst $(WHITESPACE),$(COMMA),$(strip $(2))) \
        -p $(PRODUCTNAME_WITHOUT_SPACES)$(3) \
        -u $(instsetoo_OUT) \
+       -packer $(COMPRESSIONTOOL) \
        -buildid $(if $(filter deb0 
rpm0,$(pkgformat)$(LIBO_VERSION_PATCH)),1,$(LIBO_VERSION_PATCH)) \
        $(if $(filter WNT,$(OS)), \
                -msitemplate $(dir $@)msi_templates \
diff --git a/solenv/bin/modules/installer/download.pm 
b/solenv/bin/modules/installer/download.pm
index d74ee707900f..428a0a0315c2 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -520,7 +520,7 @@ sub create_tar_gz_file_from_directory
         unlink("$installdir/install");
     }
 
-    my $systemcall = "cd $changedir; $fakerootstring tar -cf - $packdir | gzip 
> $targzname";
+    my $systemcall = "cd $changedir; $fakerootstring tar -cf - $packdir | 
$installer::globals::packertool > $targzname";
 
     my $returnvalue = system($systemcall);
 
diff --git a/solenv/bin/modules/installer/epmfile.pm 
b/solenv/bin/modules/installer/epmfile.pm
index 7a1f5fd94c52..ecddeb395712 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -1839,7 +1839,7 @@ sub create_packages_without_epm
 
     # Solaris: pkgmk -o -f solaris-2.8-sparc/SUNWso8m34.prototype -d 
solaris-2.8-sparc
     # Solaris: pkgtrans solaris-2.8-sparc SUNWso8m34.pkg SUNWso8m34
-    # Solaris: tar -cf - SUNWso8m34 | gzip > SUNWso8m34.tar.gz
+    # Solaris: tar -cf - SUNWso8m34 | $installer::globals::packertool > 
SUNWso8m34.tar.gz
 
     if ( $installer::globals::issolarispkgbuild )
     {
@@ -1983,7 +1983,7 @@ sub create_packages_without_epm
         #########################
 
         # my $targzname = $packagename . ".tar.gz";
-        # $systemcall = "cd $destinationdir; tar -cf - $packagename | gzip > 
$targzname";
+        # $systemcall = "cd $destinationdir; tar -cf - $packagename | 
$installer::globals::packertool > $targzname";
         # print "... $systemcall ...\n";
 
         # $returnvalue = system($systemcall);
diff --git a/solenv/bin/modules/installer/globals.pm 
b/solenv/bin/modules/installer/globals.pm
index 2309a3781b4e..11442ef202a8 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -129,6 +129,8 @@ BEGIN
 
     $strip = 0;
 
+    $packertool = "gzip";           # the default package compression tool for 
*NIX
+
     $logfilename = "logfile.log";   # the default logfile name for global 
errors
     @logfileinfo = ();
     @errorlogfileinfo = ();
diff --git a/solenv/bin/modules/installer/helppack.pm 
b/solenv/bin/modules/installer/helppack.pm
index 726157be2e27..456e91ecfdb0 100644
--- a/solenv/bin/modules/installer/helppack.pm
+++ b/solenv/bin/modules/installer/helppack.pm
@@ -130,7 +130,7 @@ sub create_tar_gz_file
 
     $packagename =~ s/\.rpm\s*$//;
     my $targzname = $packagename . ".tar.gz";
-    my $systemcall = "cd $installdir; tar -cf - $packagestring | gzip > 
$targzname";
+    my $systemcall = "cd $installdir; tar -cf - $packagestring | 
$installer::globals::packertool > $targzname";
     installer::logger::print_message( "... $systemcall ...\n" );
 
     my $returnvalue = system($systemcall);
diff --git a/solenv/bin/modules/installer/languagepack.pm 
b/solenv/bin/modules/installer/languagepack.pm
index a39769144de6..14a870866128 100644
--- a/solenv/bin/modules/installer/languagepack.pm
+++ b/solenv/bin/modules/installer/languagepack.pm
@@ -128,7 +128,7 @@ sub create_tar_gz_file
 
     $packagename =~ s/\.rpm\s*$//;
     my $targzname = $packagename . ".tar.gz";
-    $systemcall = "cd $installdir; tar -cf - $packagestring | gzip > 
$targzname";
+    $systemcall = "cd $installdir; tar -cf - $packagestring | 
$installer::globals::packertool > $targzname";
     installer::logger::print_message( "... $systemcall ...\n" );
 
     my $returnvalue = system($systemcall);
diff --git a/solenv/bin/modules/installer/parameter.pm 
b/solenv/bin/modules/installer/parameter.pm
index 8c63a341d34d..8f259c3e9a32 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -56,6 +56,7 @@ The following parameter are needed:
 -languagepack : do create a languagepack, no product pack (optional)
 -helppack : do create a helppack, no product pack (optional)
 -strip: Stripping files (Unix only)
+-packer: Path and parameters for tarball packaging tool (default: gzip (Unix 
only))
 -log : Logging all available information (optional)
 
 Examples for Windows:
@@ -127,6 +128,7 @@ sub getparameter
         elsif ($param eq "-helppack") { $installer::globals::helppack = 1;}
         elsif ($param eq "-debian") { $installer::globals::debian = 1; }
         elsif ($param eq "-strip") { $installer::globals::strip = 1; }
+        elsif ($param eq "-packer") { $installer::globals::packertool = 
shift(@ARGV); }
         elsif ($param eq "-destdir")    # new parameter for simple installer
         {
             $installer::globals::rootpath ne "" && die "must set destdir 
before -i or -simple";
diff --git a/solenv/bin/modules/installer/simplepackage.pm 
b/solenv/bin/modules/installer/simplepackage.pm
index b1d3acdf67ac..5ab12978362d 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -470,7 +470,7 @@ sub create_package
             $fakerootstring = "fakeroot";
         }
 
-        $systemcall = "cd $tempdir; $fakerootstring tar -cf - . | gzip > 
$archive";
+        $systemcall = "cd $tempdir; $fakerootstring tar -cf - . | 
$installer::globals::packertool > $archive";
     }
 
     if ( $makesystemcall )
diff --git a/solenv/bin/modules/installer/worker.pm 
b/solenv/bin/modules/installer/worker.pm
index 8da6b14ba7fe..fb2969f77e1c 100644
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@@ -913,7 +913,7 @@ sub collectpackagemaps
     # Create a tar gz file with all package maps
     my $tarfilename = $subdirname . ".tar";
     my $targzname = $tarfilename . ".gz";
-    $systemcall = "cd $pkgmapdir; tar -cf - $subdirname | gzip > $targzname";
+    $systemcall = "cd $pkgmapdir; tar -cf - $subdirname | 
$installer::globals::packertool > $targzname";
     installer::systemactions::make_systemcall($systemcall);
     installer::systemactions::remove_complete_directory($pkgmapsubdir, 1);
 }
commit df4fb11e2dd9f678a9dd07e60bc908bccf873111
Author:     Andras Timar <[email protected]>
AuthorDate: Mon May 3 16:04:19 2021 +0200
Commit:     Andras Timar <[email protected]>
CommitDate: Sun Feb 13 09:38:59 2022 +0100

    [cp] do not include version number to package name
    
    Change-Id: I2f5d9eb0e43c80d5712e0a65167ad8d0e56ab330

diff --git a/setup_native/source/packinfo/package_names.txt 
b/setup_native/source/packinfo/package_names.txt
index 980dc602a9ce..9b8a7d30a9b5 100644
--- a/setup_native/source/packinfo/package_names.txt
+++ b/setup_native/source/packinfo/package_names.txt
@@ -1,37 +1,37 @@
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING   Language module 
for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-base      Base 
language module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-calc      Calc 
language module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-draw      Draw 
language module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-fonts     
Language fonts module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-help      
Language help module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-impress   Impress 
language module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-math      Math 
language module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-onlineupd Online 
update language module for %PRODUCTNAME %PRODUCTVERSION, language 
%LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-res       
Language resource module for %PRODUCTNAME %PRODUCTVERSION, language 
%LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-writer    Writer 
language module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-activex   ActiveX control for 
%PRODUCTNAME %PRODUCTVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-base      Base module for 
%PRODUCTNAME %PRODUCTVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-calc      Calc module for 
%PRODUCTNAME %PRODUCTVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core      Core module for 
%PRODUCTNAME %PRODUCTVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-dict-gl   Gl dictionary for 
%PRODUCTNAME %PRODUCTVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-dict-vi   Vietnamese dictionary 
for %PRODUCTNAME %PRODUCTVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-draw      Draw module for 
%PRODUCTNAME %PRODUCTVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-emailmerge        Email mailmerge 
module for %PRODUCTNAME %PRODUCTVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-gnome-integratn   GNOME 
integration module for %PRODUCTNAME %PRODUCTVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-graphicfilter     Graphic filter 
module for %PRODUCTNAME %PRODUCTVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-headless  Headless display module 
for %PRODUCTNAME %PRODUCTVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-images    Images module for 
%PRODUCTNAME %PRODUCTVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-impress   Impress module for 
%PRODUCTNAME %PRODUCTVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-kde-integration   KDE integration 
module for %PRODUCTNAME %PRODUCTVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-math      Math module for 
%PRODUCTNAME %PRODUCTVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-onlineupdate      Online update 
module for %PRODUCTNAME %PRODUCTVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-ooofonts  3rd party free fonts 
for %PRODUCTNAME %PRODUCTVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-ooolinguistic     Linguistic 
module for %PRODUCTNAME %PRODUCTVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-pyuno     Pyuno module for 
%PRODUCTNAME %PRODUCTVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-spellcheck        English 
spellchecker module for %PRODUCTNAME %PRODUCTVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-testtool  Testtool module for 
%PRODUCTNAME %PRODUCTVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-writer    Writer module for 
%PRODUCTNAME %PRODUCTVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-xsltfilter        XSLT filter 
samples module for %PRODUCTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX-%LANGUAGESTRING    Language module for %PRODUCTNAME 
%PRODUCTVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX-%LANGUAGESTRING-base       Base language module for 
%PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX-%LANGUAGESTRING-calc       Calc language module for 
%PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX-%LANGUAGESTRING-draw       Draw language module for 
%PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX-%LANGUAGESTRING-fonts      Language fonts module for 
%PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX-%LANGUAGESTRING-help       Language help module for 
%PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX-%LANGUAGESTRING-impress    Impress language module for 
%PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX-%LANGUAGESTRING-math       Math language module for 
%PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX-%LANGUAGESTRING-onlineupd  Online update language module 
for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX-%LANGUAGESTRING-res        Language resource module for 
%PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX-%LANGUAGESTRING-writer     Writer language module for 
%PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX-activex    ActiveX control for %PRODUCTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX-base       Base module for %PRODUCTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX-calc       Calc module for %PRODUCTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX-core       Core module for %PRODUCTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX-dict-gl    Gl dictionary for %PRODUCTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX-dict-vi    Vietnamese dictionary for %PRODUCTNAME 
%PRODUCTVERSION
+%BASISPACKAGEPREFIX-draw       Draw module for %PRODUCTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX-emailmerge Email mailmerge module for %PRODUCTNAME 
%PRODUCTVERSION
+%BASISPACKAGEPREFIX-gnome-integratn    GNOME integration module for 
%PRODUCTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX-graphicfilter      Graphic filter module for %PRODUCTNAME 
%PRODUCTVERSION
+%BASISPACKAGEPREFIX-headless   Headless display module for %PRODUCTNAME 
%PRODUCTVERSION
+%BASISPACKAGEPREFIX-images     Images module for %PRODUCTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX-impress    Impress module for %PRODUCTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX-kde-integration    KDE integration module for %PRODUCTNAME 
%PRODUCTVERSION
+%BASISPACKAGEPREFIX-math       Math module for %PRODUCTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX-onlineupdate       Online update module for %PRODUCTNAME 
%PRODUCTVERSION
+%BASISPACKAGEPREFIX-ooofonts   3rd party free fonts for %PRODUCTNAME 
%PRODUCTVERSION
+%BASISPACKAGEPREFIX-ooolinguistic      Linguistic module for %PRODUCTNAME 
%PRODUCTVERSION
+%BASISPACKAGEPREFIX-pyuno      Pyuno module for %PRODUCTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX-spellcheck English spellchecker module for %PRODUCTNAME 
%PRODUCTVERSION
+%BASISPACKAGEPREFIX-testtool   Testtool module for %PRODUCTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX-writer     Writer module for %PRODUCTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX-xsltfilter XSLT filter samples module for %PRODUCTNAME 
%PRODUCTVERSION
 %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-af     Af 
dictionary for %PRODUCTNAME %PRODUCTVERSION
 %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-cs     Cs 
dictionary for %PRODUCTNAME %PRODUCTVERSION
 %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-da     Da 
dictionary for %PRODUCTNAME %PRODUCTVERSION
@@ -55,11 +55,11 @@
 %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-sw     Sw 
dictionary for %PRODUCTNAME %PRODUCTVERSION
 %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-th     Th 
dictionary for %PRODUCTNAME %PRODUCTVERSION
 %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-zu     Zu 
dictionary for %PRODUCTNAME %PRODUCTVERSION
-%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION Brand module for %PRODUCTNAME 
%PRODUCTVERSION
-%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-%LANGUAGESTRING Brand language 
module for %PRODUCTNAME %PRODUCTVERSION
-%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-base    Base brand module for 
%PRODUCTNAME %PRODUCTVERSION
-%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-calc    Calc brand module for 
%PRODUCTNAME %PRODUCTVERSION
-%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-draw    Draw brand module for 
%PRODUCTNAME %PRODUCTVERSION
-%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-impress Impress brand module 
for %PRODUCTNAME %PRODUCTVERSION
-%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-math    Math brand module for 
%PRODUCTNAME %PRODUCTVERSION
-%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-writer  Writer brand module for 
%PRODUCTNAME %PRODUCTVERSION
+%WITHOUTDOTUNIXPACKAGENAME     Brand module for %PRODUCTNAME %PRODUCTVERSION
+%WITHOUTDOTUNIXPACKAGENAME-%LANGUAGESTRING     Brand language module for 
%PRODUCTNAME %PRODUCTVERSION
+%WITHOUTDOTUNIXPACKAGENAME-base        Base brand module for %PRODUCTNAME 
%PRODUCTVERSION
+%WITHOUTDOTUNIXPACKAGENAME-calc        Calc brand module for %PRODUCTNAME 
%PRODUCTVERSION
+%WITHOUTDOTUNIXPACKAGENAME-draw        Draw brand module for %PRODUCTNAME 
%PRODUCTVERSION
+%WITHOUTDOTUNIXPACKAGENAME-impress     Impress brand module for %PRODUCTNAME 
%PRODUCTVERSION
+%WITHOUTDOTUNIXPACKAGENAME-math        Math brand module for %PRODUCTNAME 
%PRODUCTVERSION
+%WITHOUTDOTUNIXPACKAGENAME-writer      Writer brand module for %PRODUCTNAME 
%PRODUCTVERSION
diff --git a/setup_native/source/packinfo/packinfo_brand.txt 
b/setup_native/source/packinfo/packinfo_brand.txt
index f82eea24d4fe..edf89bf97d78 100644
--- a/setup_native/source/packinfo/packinfo_brand.txt
+++ b/setup_native/source/packinfo/packinfo_brand.txt
@@ -18,10 +18,10 @@
 
 Start
 module = "gid_Module_Root_Brand"
-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")"
+solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME"
+packagename = "%UNIXPACKAGENAME"
+requires = "%UREPACKAGEPREFIX-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-images %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure (Name="UNO 
Runtime Environment"), %BASISPACKAGEPREFIX-core (Name="Core module for 
%PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX-images (Name="Images module 
for %PRODUCTNAME %PRODUCTVERSION")"
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
 vendor = "Collabora Productivity Ltd."
@@ -33,10 +33,10 @@ End
 
 Start
 module = "gid_Module_Brand_Prg_Wrt"
-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"
+solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME-writer"
+packagename = "%UNIXPACKAGENAME-writer"
+requires = "%UNIXPACKAGENAME %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-writer %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME,%BASISPACKAGEPREFIX-writer"
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
 vendor = "Collabora Productivity Ltd."
@@ -48,10 +48,10 @@ End
 
 Start
 module = "gid_Module_Brand_Prg_Calc"
-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"
+solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME-calc"
+packagename = "%UNIXPACKAGENAME-calc"
+requires = "%UNIXPACKAGENAME %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-calc %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME,%BASISPACKAGEPREFIX-calc"
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
 vendor = "Collabora Productivity Ltd."
@@ -63,10 +63,10 @@ End
 
 Start
 module = "gid_Module_Brand_Prg_Impress"
-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"
+solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME-impress"
+packagename = "%UNIXPACKAGENAME-impress"
+requires = "%UNIXPACKAGENAME %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-impress %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME,%BASISPACKAGEPREFIX-impress"
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
 vendor = "Collabora Productivity Ltd."
@@ -78,10 +78,10 @@ End
 
 Start
 module = "gid_Module_Brand_Prg_Draw"
-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"
+solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME-draw"
+packagename = "%UNIXPACKAGENAME-draw"
+requires = "%UNIXPACKAGENAME %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-draw %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME,%BASISPACKAGEPREFIX-draw"
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
 vendor = "Collabora Productivity Ltd."
@@ -93,10 +93,10 @@ End
 
 Start
 module = "gid_Module_Brand_Prg_Math"
-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"
+solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME-math"
+packagename = "%UNIXPACKAGENAME-math"
+requires = "%UNIXPACKAGENAME %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-math %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME,%BASISPACKAGEPREFIX-math"
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
 vendor = "Collabora Productivity Ltd."
@@ -108,10 +108,10 @@ End
 
 Start
 module = "gid_Module_Brand_Prg_Base"
-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"
+solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME-base"
+packagename = "%UNIXPACKAGENAME-base"
+requires = "%UNIXPACKAGENAME %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-base %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME,%BASISPACKAGEPREFIX-base"
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
 vendor = "Collabora Productivity Ltd."
@@ -123,10 +123,10 @@ End
 
 Start
 module = "gid_Module_Langpack_Brand"
-solarispackagename = 
"%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-%LANGUAGESTRING"
-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")"
+solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME-%LANGUAGESTRING"
+packagename = "%UNIXPACKAGENAME-%LANGUAGESTRING"
+requires = "%UNIXPACKAGENAME %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-%LANGUAGESTRING 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = 
"%WITHOUTDOTUNIXPACKAGENAME,%BASISPACKAGEPREFIX-%LANGUAGESTRING (Name="Language 
module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING")"
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
 vendor = "Collabora Productivity Ltd."
diff --git a/setup_native/source/packinfo/packinfo_extensions.txt 
b/setup_native/source/packinfo/packinfo_extensions.txt
index cbe1d9efe98b..23f6e07fcdee 100644
--- a/setup_native/source/packinfo/packinfo_extensions.txt
+++ b/setup_native/source/packinfo/packinfo_extensions.txt
@@ -36,10 +36,10 @@
 
 Start
 module = "gid_Module_Optional_Extensions_MEDIAWIKI"
-solarispackagename = 
"%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extension-mediawiki-publisher"
-solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core 
(Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-packagename = 
"%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-mediawiki-publisher"
-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
+solarispackagename = "%BASISPACKAGEPREFIX-extension-mediawiki-publisher"
+solarisrequires =  "%BASISPACKAGEPREFIX-core (Name="Core module for 
%PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX-extension-mediawiki-publisher"
+requires = "%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 linuxpatchrequires = ""
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
@@ -51,10 +51,10 @@ End
 
 Start
 module = "gid_Module_Optional_Extensions_NumberText"
-solarispackagename = 
"%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extension-numbertext"
-solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core 
(Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-numbertext"
-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
+solarispackagename = "%BASISPACKAGEPREFIX-extension-numbertext"
+solarisrequires =  "%BASISPACKAGEPREFIX-core (Name="Core module for 
%PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX-extension-numbertext"
+requires = "%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 linuxpatchrequires = ""
 copyright = "2009 by FSF.hu"
 solariscopyright = "solariscopyrightfile"
@@ -66,10 +66,10 @@ End
 
 Start
 module = "gid_Module_Optional_Extensions_CT2N"
-solarispackagename = 
"%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extension-ct2n"
-solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core 
(Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-ct2n"
-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
+solarispackagename = "%BASISPACKAGEPREFIX-extension-ct2n"
+solarisrequires =  "%BASISPACKAGEPREFIX-core (Name="Core module for 
%PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX-extension-ct2n"
+requires = "%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 linuxpatchrequires = ""
 copyright = "Copyright (c) 2008 Cor Nouws"
 solariscopyright = "solariscopyrightfile"
@@ -81,10 +81,10 @@ End
 
 Start
 module = "gid_Module_Optional_Extensions_NLPSolver"
-solarispackagename = 
"%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extension-nlpsolver"
-solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core 
(Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-nlpsolver"
-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
+solarispackagename = "%BASISPACKAGEPREFIX-extension-nlpsolver"
+solarisrequires =  "%BASISPACKAGEPREFIX-core (Name="Core module for 
%PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX-extension-nlpsolver"
+requires = "%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 linuxpatchrequires = ""
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
@@ -96,10 +96,10 @@ End
 
 Start
 module = "gid_Module_Optional_Extensions_LanguageTool"
-solarispackagename = 
"%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extension-languagetool"
-solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core 
(Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-languagetool"
-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
+solarispackagename = "%BASISPACKAGEPREFIX-extension-languagetool"
+solarisrequires =  "%BASISPACKAGEPREFIX-core (Name="Core module for 
%PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX-extension-languagetool"
+requires = "%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 linuxpatchrequires = ""
 copyright = "2005-2009 by Daniel Naber"
 solariscopyright = "solariscopyrightfile"
@@ -111,10 +111,10 @@ End
 
 Start
 module = "gid_Module_Optional_Extensions_Script_Provider_For_BS"
-solarispackagename = 
"%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extension-beanshell-script-provider"
-solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core 
(Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-packagename = 
"%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-beanshell-script-provider"
-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
+solarispackagename = "%BASISPACKAGEPREFIX-extension-beanshell-script-provider"
+solarisrequires =  "%BASISPACKAGEPREFIX-core (Name="Core module for 
%PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX-extension-beanshell-script-provider"
+requires = "%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 linuxpatchrequires = ""
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
@@ -126,10 +126,10 @@ End
 
 Start
 module = "gid_Module_Optional_Extensions_Script_Provider_For_JS"
-solarispackagename = 
"%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extension-javascript-script-provider"
-solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core 
(Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-packagename = 
"%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-javascript-script-provider"
-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
+solarispackagename = "%BASISPACKAGEPREFIX-extension-javascript-script-provider"
+solarisrequires =  "%BASISPACKAGEPREFIX-core (Name="Core module for 
%PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX-extension-javascript-script-provider"
+requires = "%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 linuxpatchrequires = ""
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
diff --git a/setup_native/source/packinfo/packinfo_office.txt 
b/setup_native/source/packinfo/packinfo_office.txt
index 2a0ce1540551..d79ef1fd5a68 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -41,11 +41,11 @@
 
 Start
 module = "gid_Module_Optional_Gnome"
-solarispackagename = 
"%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-gnome-integratn"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
SUNWgnome-config, SUNWgnome-vfs, SUNWlibC"
-packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-gnome-integration"
-freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core"
-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
+solarispackagename = "%BASISPACKAGEPREFIX-gnome-integratn"
+solarisrequires = "%BASISPACKAGEPREFIX-core, SUNWgnome-config, SUNWgnome-vfs, 
SUNWlibC"
+packagename = "%BASISPACKAGEPREFIX-gnome-integration"
+freebsdrequires = "%BASISPACKAGEPREFIX-core"
+requires = "%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 findrequires = ""
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
@@ -58,11 +58,11 @@ End
 
 Start
 module = "gid_Module_Optional_Tde"
-solarispackagename = 
"%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-tde-integration"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core"
-packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-tde-integration"
-freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core"
-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
+solarispackagename = "%BASISPACKAGEPREFIX-tde-integration"
+solarisrequires = "%BASISPACKAGEPREFIX-core"
+packagename = "%BASISPACKAGEPREFIX-tde-integration"
+freebsdrequires = "%BASISPACKAGEPREFIX-core"
+requires = "%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
 vendor = "Collabora Productivity Ltd."
@@ -73,11 +73,11 @@ End
 
 Start
 module = "gid_Module_Optional_Kde"
-solarispackagename = 
"%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-kde-integration"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core"
-packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-kde-integration"
-freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core"
-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
+solarispackagename = "%BASISPACKAGEPREFIX-kde-integration"
+solarisrequires = "%BASISPACKAGEPREFIX-core"
+packagename = "%BASISPACKAGEPREFIX-kde-integration"
+freebsdrequires = "%BASISPACKAGEPREFIX-core"
+requires = "%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
 vendor = "Collabora Productivity Ltd."
@@ -88,13 +88,13 @@ 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"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION, %BASISPACKAGEPREFIX%PRODUCTVERSION-ooofonts 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+solarispackagename = "%BASISPACKAGEPREFIX-core"
+packagename = "%BASISPACKAGEPREFIX-core"
+linuxreplaces = "%BASISPACKAGEPREFIX-core01, %BASISPACKAGEPREFIX-core02, 
%BASISPACKAGEPREFIX-core03, %BASISPACKAGEPREFIX-core04, 
%BASISPACKAGEPREFIX-core05, %BASISPACKAGEPREFIX-core06, 
%BASISPACKAGEPREFIX-core07"
+requires = "%UREPACKAGEPREFIX-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION, %BASISPACKAGEPREFIX-ooofonts %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 solarisrequires = "SUNWcar, SUNWkvm, SUNWcsr, SUNWcsu, SUNWcsd, SUNWcsl,
-SUNWxwrtl, SUNWxwplt, SUNWlibC, %SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-ooofonts"
-freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-ooofonts"
+SUNWxwrtl, SUNWxwplt, SUNWlibC, %SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX-ooofonts"
+freebsdrequires = "%BASISPACKAGEPREFIX-ooofonts"
 findrequires = "find-requires-x11.sh"
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
@@ -107,11 +107,11 @@ End
 
 Start
 module = "gid_Module_Prg_Wrt_Bin"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-writer"
-packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-writer"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, SUNWlibC"
-freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core"
-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
+solarispackagename = "%BASISPACKAGEPREFIX-writer"
+packagename = "%BASISPACKAGEPREFIX-writer"
+solarisrequires = "%BASISPACKAGEPREFIX-core, SUNWlibC"
+freebsdrequires = "%BASISPACKAGEPREFIX-core"
+requires = "%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
 vendor = "Collabora Productivity Ltd."
@@ -122,11 +122,11 @@ End
 
 Start
 module = "gid_Module_Prg_Calc_Bin"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-calc"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, SUNWlibC"
-packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-calc"
-freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core"
-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
+solarispackagename = "%BASISPACKAGEPREFIX-calc"
+solarisrequires = "%BASISPACKAGEPREFIX-core, SUNWlibC"
+packagename = "%BASISPACKAGEPREFIX-calc"
+freebsdrequires = "%BASISPACKAGEPREFIX-core"
+requires = "%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
 vendor = "Collabora Productivity Ltd."
@@ -137,11 +137,11 @@ End
 
 Start
 module = "gid_Module_Prg_Draw_Bin"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-draw"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, SUNWlibC"
-packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-draw"
-freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core"
-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
+solarispackagename = "%BASISPACKAGEPREFIX-draw"
+solarisrequires = "%BASISPACKAGEPREFIX-core, SUNWlibC"
+packagename = "%BASISPACKAGEPREFIX-draw"
+freebsdrequires = "%BASISPACKAGEPREFIX-core"
+requires = "%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
 vendor = "Collabora Productivity Ltd."
@@ -152,11 +152,11 @@ End
 
 Start
 module = "gid_Module_Prg_Impress_Bin"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-impress"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, SUNWlibC"
-packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-impress"
-freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core"
-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
+solarispackagename = "%BASISPACKAGEPREFIX-impress"
+solarisrequires = "%BASISPACKAGEPREFIX-core, SUNWlibC"
+packagename = "%BASISPACKAGEPREFIX-impress"
+freebsdrequires = "%BASISPACKAGEPREFIX-core"
+requires = "%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
 vendor = "Collabora Productivity Ltd."
@@ -167,11 +167,11 @@ End
 
 Start
 module = "gid_Module_Prg_Base_Bin"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-base"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, SUNWlibC"
-packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-base"
-freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core"
-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
+solarispackagename = "%BASISPACKAGEPREFIX-base"
+solarisrequires = "%BASISPACKAGEPREFIX-core, SUNWlibC"
+packagename = "%BASISPACKAGEPREFIX-base"
+freebsdrequires = "%BASISPACKAGEPREFIX-core"
+requires = "%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
 vendor = "Collabora Productivity Ltd."
@@ -182,11 +182,11 @@ End
 
 Start
 module = "gid_Module_Prg_Math_Bin"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-math"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, SUNWlibC"
-packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-math"
-freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core"
-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
+solarispackagename = "%BASISPACKAGEPREFIX-math"
+solarisrequires = "%BASISPACKAGEPREFIX-core, SUNWlibC"
+packagename = "%BASISPACKAGEPREFIX-math"
+freebsdrequires = "%BASISPACKAGEPREFIX-core"
+requires = "%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
 vendor = "Collabora Productivity Ltd."
@@ -197,11 +197,11 @@ End
 
 Start
 module = "gid_Module_Optional_Firebird"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-Firebird"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core"
-packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-firebird"
-freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core"
-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core"
+solarispackagename = "%BASISPACKAGEPREFIX-Firebird"
+solarisrequires = "%BASISPACKAGEPREFIX-core"
+packagename = "%BASISPACKAGEPREFIX-firebird"
+freebsdrequires = "%BASISPACKAGEPREFIX-core"
+requires = "%BASISPACKAGEPREFIX-core"
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
 vendor = "Collabora Productivity Ltd."
@@ -212,11 +212,11 @@ End
 
 Start
 module = "gid_Module_Optional_Grfflt"
-solarispackagename = 
"%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-graphicfilter"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core"
-packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-graphicfilter"
-freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core"
-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
+solarispackagename = "%BASISPACKAGEPREFIX-graphicfilter"
+solarisrequires = "%BASISPACKAGEPREFIX-core"
+packagename = "%BASISPACKAGEPREFIX-graphicfilter"
+freebsdrequires = "%BASISPACKAGEPREFIX-core"
+requires = "%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
 vendor = "Collabora Productivity Ltd."
@@ -227,11 +227,11 @@ End
 
 Start
 module = "gid_Module_Optional_Xsltfiltersamples"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-xsltfilter"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core"
-packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-xsltfilter"
-freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core"
-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
+solarispackagename = "%BASISPACKAGEPREFIX-xsltfilter"
+solarisrequires = "%BASISPACKAGEPREFIX-core"
+packagename = "%BASISPACKAGEPREFIX-xsltfilter"
+freebsdrequires = "%BASISPACKAGEPREFIX-core"
+requires = "%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
 vendor = "Collabora Productivity Ltd."
@@ -242,11 +242,11 @@ End
 
 Start
 module = "gid_Module_Optional_Activexcontrol"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-activex"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core"
-packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-activex"
-freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core"
-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
+solarispackagename = "%BASISPACKAGEPREFIX-activex"
+solarisrequires = "%BASISPACKAGEPREFIX-core"
+packagename = "%BASISPACKAGEPREFIX-activex"
+freebsdrequires = "%BASISPACKAGEPREFIX-core"
+requires = "%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
 vendor = "Collabora Productivity Ltd."
@@ -257,10 +257,10 @@ End
 
 Start
 module = "gid_Module_Optional_Onlineupdate"
-solarispackagename = 
"%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-onlineupdate"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
SUNWlibC, SUNWgzip"
-packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-onlineupdate"
-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
+solarispackagename = "%BASISPACKAGEPREFIX-onlineupdate"
+solarisrequires = "%BASISPACKAGEPREFIX-core, SUNWlibC, SUNWgzip"
+packagename = "%BASISPACKAGEPREFIX-onlineupdate"
+requires = "%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
 vendor = "Collabora Productivity Ltd."
@@ -271,11 +271,11 @@ End
 
 Start
 module = "gid_Module_Pyuno"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-pyuno"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
SUNWPython"
-packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-pyuno"
-freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core"
-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
+solarispackagename = "%BASISPACKAGEPREFIX-pyuno"
+solarisrequires = "%BASISPACKAGEPREFIX-core, SUNWPython"
+packagename = "%BASISPACKAGEPREFIX-pyuno"
+freebsdrequires = "%BASISPACKAGEPREFIX-core"
+requires = "%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
 vendor = "Collabora Productivity Ltd."
@@ -286,11 +286,11 @@ End
 
 Start
 module = "gid_Module_Optional_Pyuno_LibreLogo"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-librelogo"
-solarisrequires = 
"%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-pyuno,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-writer,SUNWPython"
-packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-librelogo"
-freebsdrequires = 
"%BASISPACKAGEPREFIX%PRODUCTVERSION-pyuno,%BASISPACKAGEPREFIX%PRODUCTVERSION-writer"
-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-pyuno %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-writer 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+solarispackagename = "%BASISPACKAGEPREFIX-librelogo"
+solarisrequires = 
"%BASISPACKAGEPREFIX-pyuno,%BASISPACKAGEPREFIX-writer,SUNWPython"
+packagename = "%BASISPACKAGEPREFIX-librelogo"
+freebsdrequires = "%BASISPACKAGEPREFIX-pyuno,%BASISPACKAGEPREFIX-writer"
+requires = "%BASISPACKAGEPREFIX-pyuno %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-writer %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
 vendor = "Collabora Productivity Ltd."
@@ -301,11 +301,11 @@ End
 
 Start
 module = "gid_Module_Script_Provider_For_Python"
-solarispackagename = 
"%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-python-script-provider"
-solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core 
(Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-python-script-provider"
-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
-freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core"
+solarispackagename = "%BASISPACKAGEPREFIX-python-script-provider"
+solarisrequires =  "%BASISPACKAGEPREFIX-core (Name="Core module for 
%PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX-python-script-provider"
+requires = "%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
+freebsdrequires = "%BASISPACKAGEPREFIX-core"
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
 vendor = "Collabora Productivity Ltd."
@@ -316,11 +316,11 @@ End
 
 Start
 module = "gid_Module_Root_Files_Images"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-images"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core"
-packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-images"
-freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core"
-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
+solarispackagename = "%BASISPACKAGEPREFIX-images"
+solarisrequires = "%BASISPACKAGEPREFIX-core"
+packagename = "%BASISPACKAGEPREFIX-images"
+freebsdrequires = "%BASISPACKAGEPREFIX-core"
+requires = "%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
 vendor = "Collabora Productivity Ltd."
@@ -331,9 +331,9 @@ End
 
 Start
 module = "gid_Module_Root_Fonts_OOo_Hidden"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-ooofonts"
+solarispackagename = "%BASISPACKAGEPREFIX-ooofonts"
 solarisrequires = ""
-packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-ooofonts"
+packagename = "%BASISPACKAGEPREFIX-ooofonts"
 freebsdrequires = ""
 requires = ""
 copyright = "2021 Collabora Productivity Ltd."
@@ -346,11 +346,11 @@ End
 
 Start
 module = "gid_Module_Oo_Linguistic"
-solarispackagename = 
"%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-ooolinguistic"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core"
-packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-ooolinguistic"
-freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core"
-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
+solarispackagename = "%BASISPACKAGEPREFIX-ooolinguistic"
+solarisrequires = "%BASISPACKAGEPREFIX-core"
+packagename = "%BASISPACKAGEPREFIX-ooolinguistic"
+freebsdrequires = "%BASISPACKAGEPREFIX-core"
+requires = "%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
 vendor = "Collabora Productivity Ltd."
@@ -362,9 +362,9 @@ End
 Start
 module = "gid_Module_Root_Extension_Dictionary_Af"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-af"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-af"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME-dict-af"
+requires = "%UREPACKAGEPREFIX-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 linuxpatchrequires = ""
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
@@ -377,9 +377,9 @@ End
 Start
 module = "gid_Module_Root_Extension_Dictionary_An"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-an"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-an"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME-dict-an"
+requires = "%UREPACKAGEPREFIX-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 linuxpatchrequires = ""
 copyright = "2011 Santiago Paricio, Juan Pablo Martinez"
 solariscopyright = "solariscopyrightfile"
@@ -392,9 +392,9 @@ End
 Start
 module = "gid_Module_Root_Extension_Dictionary_Ar"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-ar"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-ar"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME-dict-ar"
+requires = "%UREPACKAGEPREFIX-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 linuxpatchrequires = ""
 copyright = "2006-2008 by Mohamed Kebdani, 2006-2009 Taha Zerrouki"
 solariscopyright = "solariscopyrightfile"
@@ -407,9 +407,9 @@ End
 Start
 module = "gid_Module_Root_Extension_Dictionary_Be"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-be"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-be"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME-dict-be"
+requires = "%UREPACKAGEPREFIX-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 linuxpatchrequires = ""
 copyright = "Copyright (C) 2005 Mikalai Udodau"
 solariscopyright = "solariscopyrightfile"
@@ -422,9 +422,9 @@ End
 Start
 module = "gid_Module_Root_Extension_Dictionary_Bg"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-bg"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-bg"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME-dict-bg"
+requires = "%UREPACKAGEPREFIX-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 linuxpatchrequires = ""
 copyright = "Copyright (C) 2001 Anton Zinoviev, Borislav Mitev, Radostin 
Radnev"
 solariscopyright = "solariscopyrightfile"
@@ -437,9 +437,9 @@ End
 Start
 module = "gid_Module_Root_Extension_Dictionary_Bn"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-bn"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-bn"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME-dict-bn"
+requires = "%UREPACKAGEPREFIX-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 linuxpatchrequires = ""
 copyright = "2002 Dr Abhijit Das, 2002 Taneem Ahmed, 2008 Jamil Ahmed"
 solariscopyright = "solariscopyrightfile"
@@ -452,9 +452,9 @@ End
 Start
 module = "gid_Module_Root_Extension_Dictionary_Bo"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-bo"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-bo"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME-dict-bo"
+requires = "%UREPACKAGEPREFIX-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 linuxpatchrequires = ""
 copyright = "2016 Elie Roux"
 solariscopyright = "solariscopyrightfile"
@@ -467,9 +467,9 @@ End
 Start
 module = "gid_Module_Root_Extension_Dictionary_Br"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-br"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-br"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME-dict-br"
+requires = "%UREPACKAGEPREFIX-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 linuxpatchrequires = ""
 copyright = "2009-2011 by An Drouizig"
 solariscopyright = "solariscopyrightfile"
@@ -482,9 +482,9 @@ End
 Start
 module = "gid_Module_Root_Extension_Dictionary_Bs"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-bs"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-bs"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME-dict-bs"
+requires = "%UREPACKAGEPREFIX-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 linuxpatchrequires = ""
 copyright = "2013 by Vedran Ljubović"
 solariscopyright = "solariscopyrightfile"
@@ -497,9 +497,9 @@ End
 Start
 module = "gid_Module_Root_Extension_Dictionary_Ca"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-ca"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-ca"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME-dict-ca"
+requires = "%UREPACKAGEPREFIX-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 linuxpatchrequires = ""
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
@@ -512,9 +512,9 @@ End
 Start
 module = "gid_Module_Root_Extension_Dictionary_Cs"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-cs"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-cs"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME-dict-cs"
+requires = "%UREPACKAGEPREFIX-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 linuxpatchrequires = ""
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
@@ -527,9 +527,9 @@ End
 Start
 module = "gid_Module_Root_Extension_Dictionary_Da"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-da"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-da"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME-dict-da"
+requires = "%UREPACKAGEPREFIX-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 linuxpatchrequires = ""
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
@@ -542,9 +542,9 @@ End
 Start
 module = "gid_Module_Root_Extension_Dictionary_De"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-de"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-de"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME-dict-de"
+requires = "%UREPACKAGEPREFIX-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 linuxpatchrequires = ""
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
@@ -557,9 +557,9 @@ End
 Start
 module = "gid_Module_Root_Extension_Dictionary_En"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-en"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-en"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME-dict-en"
+requires = "%UREPACKAGEPREFIX-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 linuxpatchrequires = ""
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
@@ -572,9 +572,9 @@ End
 Start
 module = "gid_Module_Root_Extension_Dictionary_El"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-el"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-el"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME-dict-el"
+requires = "%UREPACKAGEPREFIX-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 linuxpatchrequires = ""
 copyright = "2002 by Evripidis Papakostas, 2006 by Steve Stavropoulos"
 solariscopyright = "solariscopyrightfile"
@@ -602,9 +602,9 @@ End
 Start
 module = "gid_Module_Root_Extension_Dictionary_Es"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-es"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-es"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME-dict-es"
+requires = "%UREPACKAGEPREFIX-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 linuxpatchrequires = ""
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
@@ -617,9 +617,9 @@ End
 Start
 module = "gid_Module_Root_Extension_Dictionary_Et"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-et"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-et"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME-dict-et"
+requires = "%UREPACKAGEPREFIX-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 linuxpatchrequires = ""
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
@@ -632,9 +632,9 @@ End
 Start
 module = "gid_Module_Root_Extension_Dictionary_Fr"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-fr"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-fr"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME-dict-fr"
+requires = "%UREPACKAGEPREFIX-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 linuxpatchrequires = ""
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
@@ -647,9 +647,9 @@ End
 Start
 module = "gid_Module_Root_Extension_Dictionary_Gd"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-gd"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-gd"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME-dict-gd"
+requires = "%UREPACKAGEPREFIX-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 linuxpatchrequires = ""
 copyright = "2010 by Am Faclair Beag"
 solariscopyright = "solariscopyrightfile"
@@ -662,9 +662,9 @@ End
 Start
 module = "gid_Module_Root_Extension_Dictionary_Gl"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-gl"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-gl"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME-dict-gl"
+requires = "%UREPACKAGEPREFIX-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 linuxpatchrequires = ""
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
@@ -677,9 +677,9 @@ End
 Start
 module = "gid_Module_Root_Extension_Dictionary_Gu"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-gu"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-gu"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME-dict-gu"
+requires = "%UREPACKAGEPREFIX-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 linuxpatchrequires = ""
 copyright = "2009 by Kartik Mistry"
 solariscopyright = "solariscopyrightfile"
@@ -692,9 +692,9 @@ End
 Start
 module = "gid_Module_Root_Extension_Dictionary_He"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-he"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-he"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME-dict-he"
+requires = "%UREPACKAGEPREFIX-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 linuxpatchrequires = ""
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
@@ -707,9 +707,9 @@ End
 Start
 module = "gid_Module_Root_Extension_Dictionary_Hi"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-hi"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-hi"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME-dict-hi"
+requires = "%UREPACKAGEPREFIX-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 linuxpatchrequires = ""
 copyright = "2005 Swapnil {Hajare, Sant}"
 solariscopyright = "solariscopyrightfile"
@@ -722,9 +722,9 @@ End
 Start
 module = "gid_Module_Root_Extension_Dictionary_Hu"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-hu"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-hu"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME-dict-hu"
+requires = "%UREPACKAGEPREFIX-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 linuxpatchrequires = ""
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
@@ -737,9 +737,9 @@ End
 Start
 module = "gid_Module_Root_Extension_Dictionary_Hr"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-hr"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-hr"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME-dict-hr"
+requires = "%UREPACKAGEPREFIX-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 linuxpatchrequires = ""
 copyright = "2003-2010 by Denis Lackovic"
 solariscopyright = "solariscopyrightfile"
@@ -752,9 +752,9 @@ End
 Start
 module = "gid_Module_Root_Extension_Dictionary_Id"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-id"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-id"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME-dict-id"
+requires = "%UREPACKAGEPREFIX-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 linuxpatchrequires = ""
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
@@ -767,9 +767,9 @@ End
 Start
 module = "gid_Module_Root_Extension_Dictionary_Is"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-is"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-is"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME-dict-is"
+requires = "%UREPACKAGEPREFIX-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 linuxpatchrequires = ""
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
@@ -782,9 +782,9 @@ End
 Start
 module = "gid_Module_Root_Extension_Dictionary_It"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-it"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-it"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME-dict-it"
+requires = "%UREPACKAGEPREFIX-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 linuxpatchrequires = ""
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
@@ -797,9 +797,9 @@ End
 Start
 module = "gid_Module_Root_Extension_Dictionary_Kmr_Latn"
 solarispackagename = 
"%PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-kmr-Latn"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION"
-packagename = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-kmr-Latn"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPRODUCTNAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX-core, 
%PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME-dict-kmr-Latn"
+requires = "%UREPACKAGEPREFIX-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 linuxpatchrequires = ""
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
@@ -812,9 +812,9 @@ End
 Start
 module = "gid_Module_Root_Extension_Dictionary_Ko"
 solarispackagename = 
"%PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-ko"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION"
-packagename = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-ko"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPRODUCTNAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX-core, 
%PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME-dict-ko"
+requires = "%UREPACKAGEPREFIX-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 linuxpatchrequires = ""
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
@@ -827,9 +827,9 @@ End
 Start
 module = "gid_Module_Root_Extension_Dictionary_Lo"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-lo"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-lo"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME-dict-lo"
+requires = "%UREPACKAGEPREFIX-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 linuxpatchrequires = ""
 copyright = "2013 by Brian Eugene Wilson, Robert Martin Campbell"
 solariscopyright = "solariscopyrightfile"
@@ -842,9 +842,9 @@ End
 Start
 module = "gid_Module_Root_Extension_Dictionary_Lt"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-lt"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-lt"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME-dict-lt"
+requires = "%UREPACKAGEPREFIX-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 linuxpatchrequires = ""
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
@@ -857,9 +857,9 @@ End
 Start
 module = "gid_Module_Root_Extension_Dictionary_Lv"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-lv"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-lv"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME-dict-lv"
+requires = "%UREPACKAGEPREFIX-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 linuxpatchrequires = ""
 copyright = "2004-2005 Janis Vilims, 2002-2010 Janis Eisaks"
 solariscopyright = "solariscopyrightfile"
@@ -872,9 +872,9 @@ End
 Start
 module = "gid_Module_Root_Extension_Dictionary_Ne"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-ne"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-ne"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME-dict-ne"
+requires = "%UREPACKAGEPREFIX-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 linuxpatchrequires = ""
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
@@ -887,9 +887,9 @@ End
 Start
 module = "gid_Module_Root_Extension_Dictionary_Nl"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-nl"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-nl"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME-dict-nl"
+requires = "%UREPACKAGEPREFIX-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
 linuxpatchrequires = ""
 copyright = "2021 Collabora Productivity Ltd."
 solariscopyright = "solariscopyrightfile"
@@ -917,9 +917,9 @@ End
 Start
 module = "gid_Module_Root_Extension_Dictionary_No"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-no"
-solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
-packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-no"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"

... etc. - the rest is truncated

Reply via email to