readlicense_oo/docs/readme.xrm | 21 ++++-----------------
solenv/gbuild/Configuration.mk | 12 ------------
2 files changed, 4 insertions(+), 29 deletions(-)
New commits:
commit 7cfd041c13ef3fdd2a597d4b862a6ceb884f7806
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Sep 11 12:11:44 2013 +0200
tweak README for Linux a bit
Change-Id: I60769987b1e81cbef0e78662af781309c0b9aaca
diff --git a/readlicense_oo/docs/readme.xrm b/readlicense_oo/docs/readme.xrm
index bae4f26..4fd3135 100755
--- a/readlicense_oo/docs/readme.xrm
+++ b/readlicense_oo/docs/readme.xrm
@@ -69,27 +69,15 @@
</li>
<li>
- <p id="s256we"
xml:lang="en-US">gtk version 2.10.4 or higher;</p>
- </li>
-
- <li>
- <p id="s2etfseg"
xml:lang="en-US">Pentium compatible PC (Pentium III or Athlon recommended);</p>
+ <p id="s255we"
xml:lang="en-US">freetype version 2.2.0 or higher;</p>
</li>
<li>
- <p id="s2ssdfe"
xml:lang="en-US">256 MB RAM (512 MB RAM recommended);</p>
- </li>
-
- <li>
- <p id="n42dfgf"
xml:lang="en-US">Up to 1.55 GB available hard disk space;</p>
- </li>
-
- <li>
- <p id="ghjhhr"
xml:lang="en-US">X Server with 1024x768 resolution (higher resolution
recommended), with at least 256 colors;</p>
+ <p id="s256we"
xml:lang="en-US">gtk version 2.10.4 or higher;</p>
</li>
<li>
- <p id="wd2dff"
xml:lang="en-US">Gnome 2.16 or higher, with the gail 1.8.6 and the at-spi 1.7
packages (required for support for assistive technology [AT] tools), or another
compatible GUI (such as KDE, among others).</p>
+ <p id="wd2dff"
xml:lang="en-US">Gnome 2.16 or higher, with the gail 1.9 and the at-spi 1.7
packages (required for support for assistive technology [AT] tools), or another
compatible GUI (such as KDE, among others).</p>
</li>
</ul>
<p id="Linuxi3a" xml:lang="en-US">There is a
wide variety of Linux distributions, and there may be different installation
options (KDE vs Gnome, etc.) available from the same Linux vendor. Some
distributions ship with their own ânativeâ version of ${PRODUCTNAME}, which
may have different features from this community-supplied version of
${PRODUCTNAME}. In many cases, you can install the community-supplied
${PRODUCTNAME} alongside a native version. However, you may prefer to remove
the ânativeâ version before installing this community-supplied version. For
details on how to do that, please consult the user help resources provided by
your particular Linux vendor.</p>
@@ -113,7 +101,7 @@
<p id="rpminstall6" xml:lang="en-US">For Mandriva-based
systems: sudo urpmi *.rpm</p>
<p id="rpminstall7" xml:lang="en-US">For other
RPM-based systems (openSUSE, etc.): rpm -Uvh *.rpm</p>
<p id="rpminstallE" 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>
- <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.</p>
+ <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
libreoffice4.1-freedesktop-menus-4.1.0-3.noarch.rpm (or
libreoffice4.1-debian-menus_4.1.0-3_all.deb, respectively, or similar). This is
a package for all Linux distributions that support the Freedesktop.org
specifications/recommendations (<a
href="http://en.wikipedia.org/wiki/Freedesktop.org";>http://en.wikipedia.org/wiki/Freedesktop.org</a>),
and is provided for installation on other Linux distributions not covered in
the aforementioned instructions.</p>
@@ -164,7 +152,6 @@
<div class="LINUX MAC SOLSPARC SOLX86" id="FileLocking">
<h2 id="gfh6w" xml:lang="en-US">File Locking</h2>
<p id="pji76w" xml:lang="en-US">File locking is enabled
by default in ${PRODUCTNAME}. On a network that uses the Network File System
protocol (NFS), the locking daemon for NFS clients must be active. To disable
file locking, edit the <tt>soffice</tt> script and change the line "<tt>export
SAL_ENABLE_FILE_LOCKING</tt>" to "<tt># export SAL_ENABLE_FILE_LOCKING</tt>".
If you disable file locking, the write access of a document is not restricted
to the user who first opens the document.</p>
- <p class="note" id="pji76wsdf"
xml:lang="en-US">Warning: The activated file locking feature can cause problems
with Solaris 2.5.1 and 2.7 used in conjunction with Linux NFS 2.0. If your
system environment has these parameters, we strongly recommend that you avoid
using the file locking feature. Otherwise, ${PRODUCTNAME} will hang when you
try to open a file from a NFS mounted directory from a Linux computer.</p>
</div>
<div class="LINUX" id="Graphic Performance">
commit 27052d5b8f9721f0e50a0b7342f638d24a7f8731
Author: Michael Stahl <mst...@redhat.com>
Date: Tue Sep 10 23:36:16 2013 +0200
remove comment about removed multi-repository support
Change-Id: I67e9caa794ec5b55a7e7ab897c331008a675a2ac
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index a82d3e1..4b67015 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -40,18 +40,6 @@
# => *.po
# => XcsTarget (schema)
-# Per-repo pattern rules for each repository do not work for all targets
-# because the prerequisites of some targets need to have the stem mangled
-# and this does not seem to be possible in GNU make because when the stem is
-# matched variables have already been expanded (this was possible in dmake).
-#
-# So to keep things consistent the Configuration takes a parameter for the
-# repository and all targets use that to find the source file.
-#
-# Targets where % rule per repo works: XcsTarget XcuDataTarget XcuMergeTarget
-# fails: XcuModuleTarget XcuLangpackTarget XcuResTarget
-#
-
# The main LibreOffice registry (cf. officecfg/Configuration_officecfg.mk):
gb_Configuration_PRIMARY_REGISTRY_NAME := registry
gb_Configuration_PRIMARY_REGISTRY_SCHEMA_ROOT = \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
