CVS:oo-deb/debian changelog,1.247,1.248 control,1.141,1.142 control.in,1.109,1.110

[Rene Engelhard <rene@gluck.debian.org>]

Update of /home/halls/cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv5917/debian

Modified Files:
	changelog control control.in 
Log Message:
suggest www-browser | x-www-browser until the Provides: situation is sorted out; see debian-devel

Index: changelog
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -d -r1.247 -r1.248
--- changelog	11 Dec 2003 17:23:55 -0000	1.247
+++ changelog	13 Dec 2003 15:49:01 -0000	1.248
@@ -17,7 +17,7 @@
   * debian/control.in:
     - Remove Recommends: x-ttcidfont-conf since Debian fontconfig has defoma
       support now (thanks to Ozgur Murat Homurlu) [CH]
-    - Suggests: x-www-browser [RE]
+    - Suggests: www-browser | x-www-browser [RE]
     - Build-Depends:
       + add xlibs-pic (>= 4.2.1-6) | xlibs-static-pic | g++-3.0 [!powerpc] [RE]
       + add libdb3++-dev [RE]

Index: control.in
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- control.in	11 Dec 2003 16:44:32 -0000	1.109
+++ control.in	13 Dec 2003 15:49:01 -0000	1.110
@@ -10,7 +10,7 @@
 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
 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, x-www-browser
+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 | x-www-browser
 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)
 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

Index: control
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -d -r1.141 -r1.142
--- control	11 Dec 2003 16:44:32 -0000	1.141
+++ control	13 Dec 2003 15:49:01 -0000	1.142
@@ -10,7 +10,7 @@
 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
 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, x-www-browser
+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 | x-www-browser
 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)
 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