Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv5262
Modified Files:
changelog control control.in
Log Message:
version conflict with kwin-style-baghira (<< 0.6)
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.429
retrieving revision 1.430
diff -u -d -r1.429 -r1.430
--- changelog 20 Feb 2005 23:06:38 -0000 1.429
+++ changelog 22 Feb 2005 19:57:01 -0000 1.430
@@ -2,8 +2,10 @@
* debian/rules:
- fix get-ooo-build to get right ooo-build branch [RE]
+ * debian/control.in:
+ - version conflict with kwin-style-baghira (<< 0.6) [CH]
- -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 21 Feb 2005 00:04:18 +0100
+ -- Chris Halls <[EMAIL PROTECTED]> Tue, 22 Feb 2005 19:55:11 +0000
openoffice.org (1.1.3-6) unstable; urgency=high
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -d -r1.165 -r1.166
--- control.in 15 Feb 2005 21:23:25 -0000 1.165
+++ control.in 22 Feb 2005 19:57:02 -0000 1.166
@@ -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, openclipart
-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)
+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 (<< 0.6), 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.198
retrieving revision 1.199
diff -u -d -r1.198 -r1.199
--- control 15 Feb 2005 21:23:24 -0000 1.198
+++ control 22 Feb 2005 19:57:01 -0000 1.199
@@ -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, openclipart
-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)
+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 (<< 0.6), 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
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
