CVS:oo-deb/debian changelog,1.228,1.229 control,1.134,1.135 control.in,1.102,1.103
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv28304/debian
Modified Files:
changelog control control.in
Log Message:
- mention datasources_types_add_mysql
- fix openoffice.org-debian-files dependency at openoffice.org
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -d -r1.228 -r1.229
--- changelog 4 Nov 2003 15:38:22 -0000 1.228
+++ changelog 5 Nov 2003 01:30:56 -0000 1.229
@@ -3,6 +3,9 @@
* New patches:
+ solar-use-fork: use fork in tools/source/solar/solar.c to make it build
with 2.5/2.6 kernels, thanks Ken Foskey (IZ #17241) [RE]
+ + datasources_types_add_mysql: add missing MySQL entries in datasource
+ dialog (closes: #218036), thanks Josep Monés i Teixador for the
+ patch [RE]
* Modified patches:
+ setup-in-bind-mount: Use official fix from IZ#20459 using
realpath(); also return non-zero exit code on failure. [CH]
@@ -38,7 +41,7 @@
is compatible with other backports that need a newer
libfreetype (X 4.3, Gnome 2 etc.)
- -- Chris Halls <halls@debian.org> Mon, 3 Nov 2003 17:12:56 +0100
+ -- Rene Engelhard <rene@debian.org> Tue, 4 Nov 2003 23:29:24 +0100
openoffice.org (1.1.0-2) unstable; urgency=low
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- control.in 3 Nov 2003 16:17:56 -0000 1.102
+++ control.in 5 Nov 2003 01:30:56 -0000 1.103
@@ -8,7 +8,7 @@
Package: openoffice.org
Architecture: all
-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
+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
Recommends: x-ttcidfont-conf, openoffice.org-mimelnk
Suggests: myspell-dictionary, openoffice.org-help, menu, ooqstart-gnome | oooqs-kde, unixodbc, cupsys-bsd, libsane, ttf-bitstream-vera, openoffice.org-crashrep, openoffice.org-gnome, prelink, openoffice.org-hyphenation, openoffice.org-thesaurus
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)
Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -d -r1.134 -r1.135
--- control 3 Nov 2003 16:17:56 -0000 1.134
+++ control 5 Nov 2003 01:30:56 -0000 1.135
@@ -8,7 +8,7 @@
Package: openoffice.org
Architecture: all
-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
+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
Recommends: x-ttcidfont-conf, openoffice.org-mimelnk
Suggests: myspell-dictionary, openoffice.org-help, menu, ooqstart-gnome | oooqs-kde, unixodbc, cupsys-bsd, libsane, ttf-bitstream-vera, openoffice.org-crashrep, openoffice.org-gnome, prelink, openoffice.org-hyphenation, openoffice.org-thesaurus
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)
Reply to: