[SCM] LibreOffice packaging repository (debian/ directory only) branch, master, updated. 0ad993ee1217244336ed0d3904892aae772dc3de
The following commit has been merged in the master branch:
commit 0ad993ee1217244336ed0d3904892aae772dc3de
Author: Rene Engelhard <rene@debian.org>
Date: Mon Feb 14 20:03:27 2011 +0100
more s/OOo/LibreOffice/ (also in README.Debian, bug-resubj and soffice.sh)
diff --git a/README.Debian b/README.Debian
index 6c8459f..95ed2b2 100644
--- a/README.Debian
+++ b/README.Debian
@@ -17,7 +17,7 @@ Font problems
Why are the menu fonts smaller than in older versions?
Changing the default user interface font typeface for non-KDE/Gnome desktops
Disabling the splash screen
-More information about OOo in Debian
+More information about LibreOffice in Debian
Introduction
@@ -28,7 +28,7 @@ modifications:
* Packaged as libreoffice-core (architecture-dependent core files),
libreoffice-common (architecture-independent common files),
- libreoffice-{calc,writer,draw,impress,base} (the OOo modules)
+ libreoffice-{calc,writer,draw,impress,base} (the LibreOffice modules)
libreoffice-l10n-<lang> and libreoffice-help-<lang> and
other subpackages (-filters-* for lesser used filters, -gtk/-gnome/-kde,
ttf-opensymbol for the OpenSymbol font, ...).
@@ -62,17 +62,17 @@ Printing
Printing on CUPS systems
------------------------
The Debian packages include native CUPS support from version 1.1.1-3. This
-is standard in all OOo versions from 2.0.
-When OOo detects a CUPS system, it will download printer settings for all
-CUPS queues, and these can be set from within the printer properties dialog.
+is standard in all OpenOffice.org versions since 2.0.
+When LibreOffice detects a CUPS system, it will download printer settings for
+all CUPS queues, and these can be set from within the printer properties dialog.
If you wish to add additional filters or print commands, you can add them
using 'spadmin'. Note that the 'Add a printer' option is disabled - you
should add printers using your favourite CUPS frontend.
-When creating a new document, OOo will use the default paper size of your
-default CUPS printer queue. If your new documents have the wrong paper size,
-please check the configuration of your printer.
+When creating a new document, LibreOffice will use the default paper size of
+your default CUPS printer queue. If your new documents have the wrong paper
+size, please check the configuration of your printer.
Non-CUPS systems (lpr, lprng, SAL_DISABLE_CUPS=1)
---------------------------------
@@ -185,22 +185,23 @@ Font problems
Why are the menu fonts smaller than in older versions?
------------------------------------------------------
-This is caused by a change in the way OOo inteprets your X server DPI setting.
+This is caused by a change in the way LibreOfffice inteprets your X server DPI
+setting.
This setting, when correctly configured, means that software can display text
at its true size on the display.
-The official OOo version assumes that anyone who has their X server configured
-with a DPI of less than 96 has not actually configured it at all, and sets it
-back to 96. Unfortunately, this has the side effect that displays with a lower
-DPI setting, such as some LCD laptop displays, cannot display the page at its
-true size.
+The official OpenOffice.org version assumes that anyone who has their X server
+configured with a DPI of less than 96 has not actually configured it at all,
+and sets it back to 96. Unfortunately, this has the side effect that
+displays with a lower DPI setting, such as some LCD laptop displays, cannot
+display the page at its true size.
-So you can fix this by correctly setting the DPI for your X server. Gnome users
-will find that it is set to 96 DPI by default; others may need to edit their X
-server configuration.
+So you can fix this by correctly setting the DPI for your X server. Gnome
+users will find that it is set to 96 DPI by default; others may need to edit
+their X server configuration.
-The best way to get the correct DPI setting is to add a 'DisplaySize' entry to the
-Monitor section. From the XF86Config-4 man page:
+The best way to get the correct DPI setting is to add a 'DisplaySize' entry to
+the Monitor section. From the XF86Config-4 man page:
DisplaySize width height
This optional entry gives the width and height, in millimetres, of the
@@ -237,16 +238,16 @@ From Juergen Kreileder <jk at blackdown.de>:>
(That's with the proprietary NVIDIA drivers but other XFree86 drivers have
that support too.)
-If you use KDE or Gnome, OOo will use the same font face and size as your
-desktop environment. If you use another window manager, you can either let OOo
-pick a default font itself, or change the font to be used (see next section),
-or set the OOO_FORCE_DESKTOP environment variable to kde (for kde3)/kde4 or
-gnome, to use KDE or Gnome settings respectively.
+If you use KDE or Gnome, LibreOffice will use the same font face and size as
+your desktop environment. If you use another window manager, you can either
+let it pick a default font itself, or change the font to be used (see next
+section), or set the OOO_FORCE_DESKTOP environment variable to
+kde (for kde3)/kde4 or gnome, to use KDE or Gnome settings respectively.
Changing the default user interface font typeface for non-KDE/Gnome desktops
----------------------------------------------------------------------------
If you do not want to use KDE or Gnome settings and want to change font sizes
-within OOo, you can configure the user interface font as follows:
+within LibreOffice, you can configure the user interface font as follows:
- Font size -
diff --git a/bug-presubj b/bug-presubj
index 6a4801e..46b2fc2 100644
--- a/bug-presubj
+++ b/bug-presubj
@@ -1,13 +1,13 @@
-Reporting a bug against libreoffice
+Reporting a bug against LibreOffice
--------------------------------------
-I) Make sure it's a OOo bug after all: #398923 and its friends for example
- are not.
+I) Make sure it's a LibreOffice bug after all: #398923 and its friends for
+ example are not.
Set the Version: header right. If you found a bug in a specific version,
set that as version:, even if you in the meanwhile upgraded. If you are on
an up-to-date version and tried old versions and they have the bug, too, set
- the Version: header to the earliest version you found it in (of course, if versions
- inbetween don't have the bug use the version in which it reappeared and sustained to
- the current version)
+ the Version: header to the earliest version you found it in (of course, if
+ versions inbetween don't have the bug use the version in which it reappeared
+ and sustained to the current version)
II) Check on the BTS (http://bugs.debian.org/src:libreoffice) whether the
bug already is reported. Do *NOT* report a new one then. For judging whether
@@ -27,22 +27,23 @@ IV) Please attach a backtrace if possible (see
read-only when they should be read-write), also see the "File Locking"
section in above file.
-V) If the bug is also in the version you can get from www.libreoffice, file
+V) If the bug is also in the version you can get from www.libreoffice.org, file
it there in the first place. If you really think this also should be a bug
in the Debian BTS (because it's (release-)critical or otherwise important)
- please file a bug there too *BUT* note the issue number in the bug or mark it
- forwarded yourself if you can. Especially this is for feature requests.
- If you tested other OOos and the bug is (not) in version foo from bar, mention
- that, too.
+ please file a bug there too *BUT* note the issue number in the bug or
+ mark it forwarded yourself if you can. Especially this is for feature
+ requests.
+ If you tested other LibreOffice packages and the bug is (not) in version
+ foo from bar, mention that, too.
VI) Only report bugs on completely up-to-date systems. Don't file bugs on a
obsolete version and neither on sid/testing systems really old. If bugs
got fixed in sid, it doesn't make sense to file them anymore. (Exception
is security bugs or really critical bugs which should be get fixed in
- stable.) When you think a dependency is missing/wrong/too lax please be *sure*
- that this is the case before reporting it. Most times it isn't.
- Use common sense and the bug severities for judging here. When you think you have
- an up-to-date system, check whether you really have one.
+ stable.) When you think a dependency is missing/wrong/too lax please be
+ *sure* that this is the case before reporting it. Most times it isn't.
+ Use common sense and the bug severities for judging here. When you think
+ you have an up-to-date system, check whether you really have one.
(And do a dist-upgrade, try to reproduce the bug again).
Also don't report bugs on broken mix systems unless you are sure about the
dependencies/conflicts (see above).
diff --git a/changelog b/changelog
index ecc2f20..d568e80 100644
--- a/changelog
+++ b/changelog
@@ -2,10 +2,10 @@ libreoffice (1:3.3.1~rc1-3) UNRELEASED; urgency=low
* debian/control.in:
- update for new git
- * debian/rules:
- - s/OOo/LibreOffice/ for libldap-2.4-2 (closes: #613215)
+ * debian/rules, debian/soffice.sh, debian/README.DEbian:
+ - more s/OOo/LibreOffice/ (closes: #613215)
- -- Rene Engelhard <rene@debian.org> Sat, 12 Feb 2011 19:52:55 +0100
+ -- Rene Engelhard <rene@debian.org> Mon, 14 Feb 2011 20:02:55 +0100
libreoffice (1:3.3.1~rc1-2) unstable; urgency=low
diff --git a/soffice.sh b/soffice.sh
index 88335cc..bd14b9a 100644
--- a/soffice.sh
+++ b/soffice.sh
@@ -1,4 +1,4 @@
-# configuration file to set up some environment variables for OOo
+# configuration file to set up some environment variables for LibreOffice
# File locking; possible values are:
# - yes: enable file locking unconditionally
--
LibreOffice packaging repository (debian/ directory only)
Reply to: