CVS:oo-deb/debian changelog,1.410,1.411 control,1.195,1.196 control.in,1.161,1.162
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv553
Modified Files:
changelog control control.in
Log Message:
- mention libgl-soname.diff
- suggest xlibmesa-gl | libgl1
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.410
retrieving revision 1.411
diff -u -d -r1.410 -r1.411
--- changelog 3 Jan 2005 01:56:26 -0000 1.410
+++ changelog 5 Jan 2005 15:33:01 -0000 1.411
@@ -1,3 +1,12 @@
+openoffice.org (1.1.3-4.5pre) unstable; urgency=low
+
+ * New patches:
+ - libgl-soname.diff: dlopen() libGL.so.1, not libGL.so [RE]
+ * debian/control.in:
+ - Suggest xlibmesa-gl | libgl1 [RE]
+
+ -- Rene Engelhard <rene@debian.org> Wed, 5 Jan 2005 16:16:36 +0100
+
openoffice.org (1.1.3-4) unstable; urgency=low
* Modified patches:
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -d -r1.161 -r1.162
--- control.in 21 Dec 2004 15:40:25 -0000 1.161
+++ control.in 5 Jan 2005 15:33:02 -0000 1.162
@@ -10,7 +10,7 @@
Package: openoffice.org
Architecture: all
Depends: openoffice.org-debian-files (>> 1.1.2+1.1.3), openoffice.org-bin (>> 1.1.2+1.1.3), openoffice.org-l10n-en (>> 1.1.2+1.1.3) | openoffice.org-l10n-1.1.3, dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ttf-opensymbol
-Suggests: myspell-dictionary, openoffice.org-help, menu, ooqstart-gnome | oooqs-kde, unixodbc, cupsys-bsd, libsane, ttf-bitstream-vera, prelink, openoffice.org-hyphenation, openoffice.org-thesaurus, libxrender1, msttcorefonts, openoffice.org-mimelnk, openoffice.org-gtk-gnome | openoffice.org-kde, openoffice.org-gnomevfs
+Suggests: myspell-dictionary, openoffice.org-help, menu, ooqstart-gnome | oooqs-kde, unixodbc, cupsys-bsd, libsane, ttf-bitstream-vera, prelink, openoffice.org-hyphenation, openoffice.org-thesaurus, libxrender1, msttcorefonts, openoffice.org-mimelnk, openoffice.org-gtk-gnome | openoffice.org-kde, openoffice.org-gnomevfs, xlibmesa-gl | libgl1
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, openoffice.org-spellcheck-nb-no (<= 20020814-1), openoffice.org-spellcheck-nn-no (<= 20021023-1), openoffice.org-l10n-1.1.1, openoffice.org-l10n-1.1.2
Replaces: openoffice.org1.1, openoffice-de-en, openoffice-de, openoffice.org-bin (<= 1.0.3-2), openoffice.org-gnome
Provides: openoffice.org1.1, openoffice-de-en, openoffice-de
@@ -33,6 +33,7 @@
automatically
* libsane: Use your sane-supported scanner with OpenOffice.org
* libxrender1: Speed up display by using Xrender library
+ * xlibmesa-gl / libgl1: OpenGL support
* msttcorefonts: Installs standard MS truetype fonts (contrib)
.
See README.Debian for information about using OpenOffice.org in Debian, known
Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -d -r1.195 -r1.196
--- control 21 Dec 2004 15:40:25 -0000 1.195
+++ control 5 Jan 2005 15:33:01 -0000 1.196
@@ -10,7 +10,7 @@
Package: openoffice.org
Architecture: all
Depends: openoffice.org-debian-files (>> 1.1.2+1.1.3), openoffice.org-bin (>> 1.1.2+1.1.3), openoffice.org-l10n-en (>> 1.1.2+1.1.3) | openoffice.org-l10n-1.1.3, dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ttf-opensymbol
-Suggests: myspell-dictionary, openoffice.org-help, menu, ooqstart-gnome | oooqs-kde, unixodbc, cupsys-bsd, libsane, ttf-bitstream-vera, prelink, openoffice.org-hyphenation, openoffice.org-thesaurus, libxrender1, msttcorefonts, openoffice.org-mimelnk, openoffice.org-gtk-gnome | openoffice.org-kde, openoffice.org-gnomevfs
+Suggests: myspell-dictionary, openoffice.org-help, menu, ooqstart-gnome | oooqs-kde, unixodbc, cupsys-bsd, libsane, ttf-bitstream-vera, prelink, openoffice.org-hyphenation, openoffice.org-thesaurus, libxrender1, msttcorefonts, openoffice.org-mimelnk, openoffice.org-gtk-gnome | openoffice.org-kde, openoffice.org-gnomevfs, xlibmesa-gl | libgl1
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, openoffice.org-spellcheck-nb-no (<= 20020814-1), openoffice.org-spellcheck-nn-no (<= 20021023-1), openoffice.org-l10n-1.1.1, openoffice.org-l10n-1.1.2
Replaces: openoffice.org1.1, openoffice-de-en, openoffice-de, openoffice.org-bin (<= 1.0.3-2), openoffice.org-gnome
Provides: openoffice.org1.1, openoffice-de-en, openoffice-de
@@ -33,6 +33,7 @@
automatically
* libsane: Use your sane-supported scanner with OpenOffice.org
* libxrender1: Speed up display by using Xrender library
+ * xlibmesa-gl / libgl1: OpenGL support
* msttcorefonts: Installs standard MS truetype fonts (contrib)
.
See README.Debian for information about using OpenOffice.org in Debian, known
Reply to: