Update of /home/halls/cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv15289
Modified Files:
changelog control control.in
Log Message:
* Mention create ~/.recently-used
* Mention psprint-handle-no-solar-java fix
* Build-Conflicts: g++-3.3 (3.3.3-0pre1) due to enum failure
* openoffice.org Conflicts with old package openoffice.org-gnome
* Mention prelink in description (closes: #229564)
Index: changelog
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -d -r1.264 -r1.265
--- changelog 28 Jan 2004 13:54:39 -0000 1.264
+++ changelog 28 Jan 2004 13:59:06 -0000 1.265
@@ -1,8 +1,15 @@
openoffice.org (1.1.0-5.pre6) unstable; urgency=low
* Modified patches:
- + recent-files.diff: remove usage of rtl_ in the interface exposed
- by recent-files.hxx (closes: #228324) [AB]
+ + recent-files: remove usage of rtl_ in the interface exposed
+ by recent-files.hxx (closes: #228324), create ~/.recently-used
+ if it does not exist [AB]
+ - psprint-handle-no-solar-java: Patch did not apply as indended,
+ fixed [CH]
+ * debian/control.in:
+ - Build-Conflicts: g++-3.3 (3.3.3-0pre1) due to enum failure [CH]
+ - openoffice.org Conflicts with old package openoffice.org-gnome [CH]
+ - Mention prelink in description (closes: #229564) [CH]
-- Rene Engelhard <[EMAIL PROTECTED]> Sun, 18 Jan 2004 19:10:47 +0100
Index: control.in
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- control.in 9 Jan 2004 09:39:53 -0000 1.114
+++ control.in 28 Jan 2004 13:59:06 -0000 1.115
@@ -4,7 +4,7 @@
Maintainer: Debian OpenOffice Team <[email protected]>
Uploaders: Chris Halls <[EMAIL PROTECTED]>, Jan-Hendrik Palic <[EMAIL
PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>=
4.0.9) | debhelper (= 4.0.2.openoffice), flex | flex-old, libpam0g-dev |
libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1) | g++-3.0
[!powerpc], autoconf, sharutils, libgtk2.0-dev, pkg-config, libpng12-dev |
libpng2-dev, libjpeg62-dev, libtiff3g-dev, libart-2.0-dev (>= 2.3.13), xsltproc
(>= 1.0.30), imagemagick, xutils, libfontconfig1-dev | g++-3.0 [!powerpc],
binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], gimp-perl |
gimp1.2-perl, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake,
libfreetype6-dev | g++-3.0 [!powerpc], libdb3++-dev, libaudio-dev | nas-dev,
xlibs-pic (>= 4.2.1-6) | xlibs-static-pic | g++-3.0 [!powerpc], xlibs-dev |
libx11-dev, xlibs-dev | libsm-dev, xlibs-dev | libxt-dev, xlibs-dev |
libxext-dev, xlibs-dev | libice-dev, libsane-dev, libcurl2-dev | libcurl-dev,
libmyspell-dev (>= 1:3.1-1), libaltlinuxhyph-dev
-Build-Conflicts: libhnj-dev
+Build-Conflicts: libhnj-dev, g++-3.3 (3.3.3-0pre1)
Standards-Version: 3.5.6
Package: openoffice.org
@@ -12,7 +12,7 @@
Depends: openoffice.org-debian-files (>> 1.1.0-2), openoffice.org-bin (>=
1.1.0-2), openoffice.org-l10n-en (>> 1.1.0) | openoffice.org-l10n-1.1.0.final,
dictionaries-common (>= 0.10) | openoffice.org-updatedicts${debianutils-depends}
Recommends: openoffice.org-mimelnk
Suggests: myspell-dictionary, openoffice.org-help, menu, ooqstart-gnome |
oooqs-kde, unixodbc, cupsys-bsd, libsane, ttf-bitstream-vera,
openoffice.org-crashrep, prelink, openoffice.org-hyphenation,
openoffice.org-thesaurus, www-browser, libxrender1, msttcorefonts
-Conflicts: openoffice.org1.1, openoffice, openoffice.org-l10n,
openoffice.org-l10n-1.1.0, openoffice-de-en, openoffice-de, oooqs-kde (<=
1.0rc3-2), openoffice.org-spellcheck-de-de (<= 20020701-6),
openoffice.org-spellcheck-de-ch (<= 20020701-6),
openoffice.org-spellcheck-de-at (<= 20020701-6), openoffice.org-spellcheck-es
(<= 0.0.2002.01.20-2), openoffice.org-spellcheck-fr-fr (<= 20030727-2)
+Conflicts: openoffice.org1.1, openoffice, openoffice.org-l10n,
openoffice.org-l10n-1.1.0, openoffice-de-en, openoffice-de, oooqs-kde (<=
1.0rc3-2), openoffice.org-spellcheck-de-de (<= 20020701-6),
openoffice.org-spellcheck-de-ch (<= 20020701-6),
openoffice.org-spellcheck-de-at (<= 20020701-6), openoffice.org-spellcheck-es
(<= 0.0.2002.01.20-2), openoffice.org-spellcheck-fr-fr (<= 20030727-2),
openoffice.org-gnome
Replaces: openoffice.org1.1, openoffice-de-en, openoffice-de,
openoffice.org-bin (<= 1.0.3-2), openoffice.org-gnome
Provides: openoffice.org1.1, openoffice.org-thesaurus-en,
openoffice.org-thesaurus, openoffice-de-en, openoffice-de
Description: high-quality office productivity suite
@@ -34,6 +34,7 @@
* libsane: Use your sane-supported scanner with OpenOffice.org
* libxrender1: Speed up display by using Xrender library
* msttcorefonts: Installs standard MS truetype fonts (contrib)
+ * prelink: Prelink OOo binaries for faster startup
.
See README.Debian for information about using OpenOffice.org in Debian, known
bugs and workarounds. More information about the Debian packages is available
Index: control
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -d -r1.147 -r1.148
--- control 14 Jan 2004 18:19:16 -0000 1.147
+++ control 28 Jan 2004 13:59:06 -0000 1.148
@@ -4,7 +4,7 @@
Maintainer: Debian OpenOffice Team <[email protected]>
Uploaders: Chris Halls <[EMAIL PROTECTED]>, Jan-Hendrik Palic <[EMAIL
PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>=
4.0.9) | debhelper (= 4.0.2.openoffice), flex | flex-old, libpam0g-dev |
libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1) | g++-3.0
[!powerpc], autoconf, sharutils, libgtk2.0-dev, pkg-config, libpng12-dev |
libpng2-dev, libjpeg62-dev, libtiff3g-dev, libart-2.0-dev (>= 2.3.13), xsltproc
(>= 1.0.30), imagemagick, xutils, libfontconfig1-dev | g++-3.0 [!powerpc],
binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], gimp-perl |
gimp1.2-perl, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake,
libfreetype6-dev | g++-3.0 [!powerpc], libdb3++-dev, libaudio-dev | nas-dev,
xlibs-pic (>= 4.2.1-6) | xlibs-static-pic | g++-3.0 [!powerpc], xlibs-dev |
libx11-dev, xlibs-dev | libsm-dev, xlibs-dev | libxt-dev, xlibs-dev |
libxext-dev, xlibs-dev | libice-dev, libsane-dev, libcurl2-dev | libcurl-dev,
libmyspell-dev (>= 1:3.1-1), libaltlinuxhyph-dev
-Build-Conflicts: libhnj-dev
+Build-Conflicts: libhnj-dev, g++-3.3 (3.3.3-0pre1)
Standards-Version: 3.5.6
Package: openoffice.org
@@ -12,7 +12,7 @@
Depends: openoffice.org-debian-files (>> 1.1.0-2), openoffice.org-bin (>=
1.1.0-2), openoffice.org-l10n-en (>> 1.1.0) | openoffice.org-l10n-1.1.0.final,
dictionaries-common (>= 0.10) | openoffice.org-updatedicts${debianutils-depends}
Recommends: openoffice.org-mimelnk
Suggests: myspell-dictionary, openoffice.org-help, menu, ooqstart-gnome |
oooqs-kde, unixodbc, cupsys-bsd, libsane, ttf-bitstream-vera,
openoffice.org-crashrep, prelink, openoffice.org-hyphenation,
openoffice.org-thesaurus, www-browser, libxrender1, msttcorefonts
-Conflicts: openoffice.org1.1, openoffice, openoffice.org-l10n,
openoffice.org-l10n-1.1.0, openoffice-de-en, openoffice-de, oooqs-kde (<=
1.0rc3-2), openoffice.org-spellcheck-de-de (<= 20020701-6),
openoffice.org-spellcheck-de-ch (<= 20020701-6),
openoffice.org-spellcheck-de-at (<= 20020701-6), openoffice.org-spellcheck-es
(<= 0.0.2002.01.20-2), openoffice.org-spellcheck-fr-fr (<= 20030727-2)
+Conflicts: openoffice.org1.1, openoffice, openoffice.org-l10n,
openoffice.org-l10n-1.1.0, openoffice-de-en, openoffice-de, oooqs-kde (<=
1.0rc3-2), openoffice.org-spellcheck-de-de (<= 20020701-6),
openoffice.org-spellcheck-de-ch (<= 20020701-6),
openoffice.org-spellcheck-de-at (<= 20020701-6), openoffice.org-spellcheck-es
(<= 0.0.2002.01.20-2), openoffice.org-spellcheck-fr-fr (<= 20030727-2),
openoffice.org-gnome
Replaces: openoffice.org1.1, openoffice-de-en, openoffice-de,
openoffice.org-bin (<= 1.0.3-2), openoffice.org-gnome
Provides: openoffice.org1.1, openoffice.org-thesaurus-en,
openoffice.org-thesaurus, openoffice-de-en, openoffice-de
Description: high-quality office productivity suite
@@ -34,6 +34,7 @@
* libsane: Use your sane-supported scanner with OpenOffice.org
* libxrender1: Speed up display by using Xrender library
* msttcorefonts: Installs standard MS truetype fonts (contrib)
+ * prelink: Prelink OOo binaries for faster startup
.
See README.Debian for information about using OpenOffice.org in Debian, known
bugs and workarounds. More information about the Debian packages is available
