readlicense_oo/CustomTarget_readme.mk | 1 +
readlicense_oo/docs/readme.xrm | 10 +++++-----
2 files changed, 6 insertions(+), 5 deletions(-)
New commits:
commit a123bed09507ca231e74bbf17b74b1358c6b4a3c
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Tue Nov 12 23:24:00 2024 +0100
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Wed Nov 13 08:03:53 2024 +0100
Some missing readme PRODUCTNAME parametrization
(and where two places need a lower case LCPRODUCTNAME)
Change-Id: I3879d3eef08d20f65b081a6dfd73658b0b76a33d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176513
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
diff --git a/readlicense_oo/CustomTarget_readme.mk
b/readlicense_oo/CustomTarget_readme.mk
index 14e6241ed72c..17dca39ab3dd 100644
--- a/readlicense_oo/CustomTarget_readme.mk
+++ b/readlicense_oo/CustomTarget_readme.mk
@@ -46,6 +46,7 @@ endif
readlicense_oo_README_SED := \
-e 's,$${PRODUCTNAME},$(PRODUCTNAME),g' \
-e 's,$${PRODUCTVERSION},$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR),g'
\
+ -e 's,$${LCPRODUCTNAME},'"$$(printf %s '$(PRODUCTNAME)' | tr A-Z
a-z)",g \
$(readlicense_oo_DIR)/$(call gb_README,%) : \
$(SRCDIR)/readlicense_oo/docs/readme.xsl \
diff --git a/readlicense_oo/docs/readme.xrm b/readlicense_oo/docs/readme.xrm
index 04d8b4c7f627..467fe288b8ab 100644
--- a/readlicense_oo/docs/readme.xrm
+++ b/readlicense_oo/docs/readme.xrm
@@ -86,15 +86,15 @@
<p id="Precautions" xml:lang="en-US">Please make sure
you have enough free memory in the temporary directory on your system, and
please ensure that read, write and run access rights have been granted. Close
all other programs before starting the installation process.</p>
<h3 id="sdfsdfgf42s" xml:lang="en-US">Installation of
${PRODUCTNAME} on Debian/Ubuntu-based Linux systems</h3>
<p id="debianinstall1" xml:lang="en-US">For
instructions on how to install a language pack (after having installed the US
English version of ${PRODUCTNAME}), please read the section below entitled
Installing a Language Pack.</p>
- <p id="debianinstall2" xml:lang="en-US">When you unpack
the downloaded archive, you will see that the contents have been decompressed
into a sub-directory. Open a file manager window, and change directory to the
one starting with "LibreOffice_", followed by the version number and some
platform information.</p>
+ <p id="debianinstall2" xml:lang="en-US">When you unpack
the downloaded archive, you will see that the contents have been decompressed
into a sub-directory. Open a file manager window, and change directory to the
one starting with "${PRODUCTNAME}_", followed by the version number and some
platform information.</p>
<p id="debianinstall3" xml:lang="en-US">This directory
contains a subdirectory called "DEBS". Change directory to the "DEBS"
directory.</p>
<p id="debianinstall4" xml:lang="en-US">Right-click
within the directory and choose "Open in Terminal". A terminal window will
open. From the command line of the terminal window, enter the following command
(you will be prompted to enter your root user's password before the command
will execute):</p>
- <p id="debianinstall5" xml:lang="en-US">The following
commands will install LibreOffice and the desktop integration packages (you may
just copy and paste them into the terminal screen rather than trying to type
them):</p>
+ <p id="debianinstall5" xml:lang="en-US">The following
commands will install ${PRODUCTNAME} and the desktop integration packages (you
may just copy and paste them into the terminal screen rather than trying to
type them):</p>
<p id="debianinstall6" xml:lang="en-US">sudo dpkg -i
*.deb</p>
<p id="debianinstall9" xml:lang="en-US">The
installation process is now completed, and you should have icons for all the
${PRODUCTNAME} applications in your desktop's Applications/Office menu.</p>
<h3 id="sdfsdfgf42t" xml:lang="en-US">Installation of
${PRODUCTNAME} on Fedora, openSUSE, Mandriva and other Linux systems using RPM
packages</h3>
<p id="rpminstall1" xml:lang="en-US">For instructions
on how to install a language pack (after having installed the US English
version of ${PRODUCTNAME}), please read the section below entitled Installing a
Language Pack.</p>
- <p id="rpminstall2" xml:lang="en-US">When you unpack
the downloaded archive, you will see that the contents have been decompressed
into a sub-directory. Open a file manager window, and change directory to the
one starting with "LibreOffice_", followed by the version number and some
platform information.</p>
+ <p id="rpminstall2" xml:lang="en-US">When you unpack
the downloaded archive, you will see that the contents have been decompressed
into a sub-directory. Open a file manager window, and change directory to the
one starting with "${PRODUCTNAME}_", followed by the version number and some
platform information.</p>
<p id="rpminstall3" xml:lang="en-US">This directory
contains a subdirectory called "RPMS". Change directory to the "RPMS"
directory.</p>
<p id="rpminstall4" xml:lang="en-US">Right-click within
the directory and choose "Open in Terminal". A terminal window will open. From
the command line of the terminal window, enter the following command (you will
be prompted to enter your root user's password before the command will
execute):</p>
<p id="rpminstall5" xml:lang="en-US">For Fedora-based
systems: sudo dnf install *.rpm</p>
@@ -104,11 +104,11 @@
<p id="rpminstall7a" xml:lang="en-US">Alternatively,
you can use the 'install' script, located in the toplevel directory of this
archive to perform an installation as a user. The script will set up
${PRODUCTNAME} to have its own profile for this installation, separated from
your normal ${PRODUCTNAME} profile. Note that this will not install the system
integration parts such as desktop menu items and desktop MIME type
registrations.</p>
<h3 id="sdfsdfgf42t2" xml:lang="en-US">Notes Concerning
Desktop Integration for Linux Distributions Not Covered in the Above
Installation Instructions</h3>
<p id="otherinstall1" xml:lang="en-US">It should be
easily possible to install ${PRODUCTNAME} on other Linux distributions not
specifically covered in these installation instructions. The main aspect for
which differences might be encountered is desktop integration.</p>
- <p id="otherinstall2" xml:lang="en-US">The RPMS (or
DEBS, respectively) directory also contains a package named
libreoffice${PRODUCTVERSION}-freedesktop-menus-${PRODUCTVERSION}.0.1-1.noarch.rpm
(or libreoffice${PRODUCTVERSION}-debian-menus_${PRODUCTVERSION}.0.1-1_all.deb,
respectively, or similar). This is a package for all Linux distributions that
support the Freedesktop.org specifications/recommendations (<a
href="https://en.wikipedia.org/wiki/Freedesktop.org";>https://en.wikipedia.org/wiki/Freedesktop.org</a>),
and is provided for installation on other Linux distributions not covered in
the aforementioned instructions.</p>
+ <p id="otherinstall2" xml:lang="en-US">The RPMS (or
DEBS, respectively) directory also contains a package named
${LCPRODUCTNAME}${PRODUCTVERSION}-freedesktop-menus-${PRODUCTVERSION}.0.1-1.noarch.rpm
(or
${LCPRODUCTNAME}${PRODUCTVERSION}-debian-menus_${PRODUCTVERSION}.0.1-1_all.deb,
respectively, or similar). This is a package for all Linux distributions that
support the Freedesktop.org specifications/recommendations (<a
href="https://en.wikipedia.org/wiki/Freedesktop.org";>https://en.wikipedia.org/wiki/Freedesktop.org</a>),
and is provided for installation on other Linux distributions not covered in
the aforementioned instructions.</p>
<h3 id="sdfsdfgf42t3" xml:lang="en-US">Installing a
Language Pack</h3>
<p id="linuxlangpack1" xml:lang="en-US">Download the
language pack for your desired language and platform. They are available from
the same location as the main installation archive. From the Nautilus file
manager, extract the downloaded archive into a directory (your desktop, for
instance). Ensure that you have exited all ${PRODUCTNAME} applications
(including the QuickStarter, if it is started).</p>
<p id="linuxlangpack2" xml:lang="en-US">Change
directory to the directory in which you extracted your downloaded language
pack.</p>
- <p id="linuxlangpack3" xml:lang="en-US">Now change
directory to the directory that was created during the extraction process. For
instance, for the French language pack for a 32-bit Debian/Ubuntu-based system,
the directory is named LibreOffice_, plus some version information, plus
Linux_x86_langpack-deb_fr.</p>
+ <p id="linuxlangpack3" xml:lang="en-US">Now change
directory to the directory that was created during the extraction process. For
instance, for the French language pack for a 32-bit Debian/Ubuntu-based system,
the directory is named ${PRODUCTNAME}_, plus some version information, plus
Linux_x86_langpack-deb_fr.</p>
<p id="linuxlangpack4" xml:lang="en-US">Now change
directory to the directory that contains the packages to install. On
Debian/Ubuntu-based systems, the directory will be DEBS. On Fedora, openSUSE or
Mandriva systems, the directory will be RPMS.</p>
<p id="linuxlangpack5" xml:lang="en-US">From the
Nautilus file manager, right-click in the directory and choose the command
"Open in terminal". In the terminal window you just opened, execute the command
to install the language pack (with all of the commands below, you may be
prompted to enter your root user's password):</p>
<p id="linuxlangpack6" xml:lang="en-US">For
Debian/Ubuntu-based systems: sudo dpkg -i *.deb</p>
