Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv24368/debian
Modified Files:
changelog control control.in
Log Message:
Conflict against kwin-style-baghira, kwin-baghira (<< 0.6)
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.411
retrieving revision 1.412
diff -u -d -r1.411 -r1.412
--- changelog 5 Jan 2005 15:33:01 -0000 1.411
+++ changelog 6 Jan 2005 23:31:34 -0000 1.412
@@ -4,6 +4,7 @@
- libgl-soname.diff: dlopen() libGL.so.1, not libGL.so [RE]
* debian/control.in:
- Suggest xlibmesa-gl | libgl1 [RE]
+ - Conflict against kwin-style-baghira, kwin-baghira (<< 0.6) [RE]
-- Rene Engelhard <[EMAIL PROTECTED]> Wed, 5 Jan 2005 16:16:36 +0100
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -d -r1.162 -r1.163
--- control.in 5 Jan 2005 15:33:02 -0000 1.162
+++ control.in 6 Jan 2005 23:31:35 -0000 1.163
@@ -11,7 +11,7 @@
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, 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
+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, kwin-style-baghira, kwin-baghira (<< 0.6)
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
Description: high-quality office productivity suite
Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -d -r1.196 -r1.197
--- control 5 Jan 2005 15:33:01 -0000 1.196
+++ control 6 Jan 2005 23:31:35 -0000 1.197
@@ -11,7 +11,7 @@
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, 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
+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, kwin-style-baghira, kwin-baghira (<< 0.6)
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
Description: high-quality office productivity suite
