Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv31434
Modified Files:
changelog control control.in control.lang.in
Log Message:
* debian/control*:
- Bump virtual l10n package to 1.1.0.final; openoffice.org conflicts
with l10n-1.1.0 to force versions without the Ximian icons off the
system. (closes: #214703: all icons have magenta background)
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -d -r1.202 -r1.203
--- changelog 8 Oct 2003 11:25:30 -0000 1.202
+++ changelog 8 Oct 2003 11:36:19 -0000 1.203
@@ -11,8 +11,12 @@
* debian/rules:
- Fix Gnome desktop Exec= line, thanks to MK for spotting the problem
(closes: #214673) [CH]
+ * debian/control*:
+ - Bump virtual l10n package to 1.1.0.final; openoffice.org conflicts
+ with l10n-1.1.0 to force versions without the Ximian icons off the
+ system. (closes: #214703: all icons have magenta background) [CH]
- -- Chris Halls <[EMAIL PROTECTED]> Wed, 8 Oct 2003 13:23:24 +0200
+ -- Chris Halls <[EMAIL PROTECTED]> Wed, 8 Oct 2003 13:32:49 +0200
openoffice.org (1.1.0-1) unstable; urgency=low
Index: control.lang.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.lang.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- control.lang.in 11 Aug 2003 11:31:30 -0000 1.18
+++ control.lang.in 8 Oct 2003 11:36:19 -0000 1.19
@@ -3,7 +3,7 @@
Depends: openoffice.org (>> 1.0.99+1.1)
Conflicts: [EMAIL PROTECTED]@
Replaces: [EMAIL PROTECTED]@
-Provides: openoffice.org-l10n-1.1.0, [EMAIL PROTECTED]@
+Provides: openoffice.org-l10n-1.1.0.final, [EMAIL PROTECTED]@
Suggests: [EMAIL PROTECTED]@, [EMAIL PROTECTED]@, [EMAIL PROTECTED]@, [EMAIL
PROTECTED]@
Description: @LNAME@ language package for openoffice.org
OpenOffice is a complete modern office suite, licensed under the GPL,
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- control.in 6 Oct 2003 17:46:19 -0000 1.92
+++ control.in 8 Oct 2003 11:36:19 -0000 1.93
@@ -8,10 +8,10 @@
Package: openoffice.org
Architecture: all
-Depends: openoffice.org-debian-files (>> 1.1.0), openoffice.org-bin (>>
1.1.0), openoffice.org-l10n-en (>> 1.1.0) | openoffice.org-l10n-1.1.0,
dictionaries-common (>= 0.10) | openoffice.org-updatedicts
+Depends: openoffice.org-debian-files (>> 1.1.0), openoffice.org-bin (>>
1.1.0), 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-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)
+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)
Provides: openoffice.org1.1, openoffice.org-thesaurus-en,
openoffice.org-thesaurus, 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.124
retrieving revision 1.125
diff -u -d -r1.124 -r1.125
--- control 6 Oct 2003 17:46:19 -0000 1.124
+++ control 8 Oct 2003 11:36:19 -0000 1.125
@@ -8,10 +8,10 @@
Package: openoffice.org
Architecture: all
-Depends: openoffice.org-debian-files (>> 1.1.0), openoffice.org-bin (>>
1.1.0), openoffice.org-l10n-en (>> 1.1.0) | openoffice.org-l10n-1.1.0,
dictionaries-common (>= 0.10) | openoffice.org-updatedicts
+Depends: openoffice.org-debian-files (>> 1.1.0), openoffice.org-bin (>>
1.1.0), 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-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)
+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)
Provides: openoffice.org1.1, openoffice.org-thesaurus-en,
openoffice.org-thesaurus, openoffice-de-en, openoffice-de
Description: high-quality office productivity suite
@@ -96,7 +96,7 @@
Depends: openoffice.org (>> 1.0.99+1.1)
Conflicts: openoffice.org1.1-l10n-en
Replaces: openoffice.org1.1-l10n-en
-Provides: openoffice.org-l10n-1.1.0, openoffice.org1.1-l10n-en
+Provides: openoffice.org-l10n-1.1.0.final, openoffice.org1.1-l10n-en
Suggests: myspell-dictionary-en, openoffice.org-hyphenation-en,
openoffice.org-thesaurus-en, openoffice.org-help-en
Description: English (US) language package for openoffice.org
OpenOffice is a complete modern office suite, licensed under the GPL,
@@ -123,7 +123,7 @@
Depends: openoffice.org (>> 1.0.99+1.1)
Conflicts: openoffice.org1.1-l10n-pt
Replaces: openoffice.org1.1-l10n-pt
-Provides: openoffice.org-l10n-1.1.0, openoffice.org1.1-l10n-pt
+Provides: openoffice.org-l10n-1.1.0.final, openoffice.org1.1-l10n-pt
Suggests: myspell-dictionary-pt, openoffice.org-hyphenation-pt,
openoffice.org-thesaurus-pt, openoffice.org-help-pt
Description: Portuguese language package for openoffice.org
OpenOffice is a complete modern office suite, licensed under the GPL,
@@ -150,7 +150,7 @@
Depends: openoffice.org (>> 1.0.99+1.1)
Conflicts: openoffice.org1.1-l10n-ru
Replaces: openoffice.org1.1-l10n-ru
-Provides: openoffice.org-l10n-1.1.0, openoffice.org1.1-l10n-ru
+Provides: openoffice.org-l10n-1.1.0.final, openoffice.org1.1-l10n-ru
Suggests: myspell-dictionary-ru, openoffice.org-hyphenation-ru,
openoffice.org-thesaurus-ru, openoffice.org-help-ru
Description: Russian language package for openoffice.org
OpenOffice is a complete modern office suite, licensed under the GPL,
@@ -177,7 +177,7 @@
Depends: openoffice.org (>> 1.0.99+1.1)
Conflicts: openoffice.org1.1-l10n-el
Replaces: openoffice.org1.1-l10n-el
-Provides: openoffice.org-l10n-1.1.0, openoffice.org1.1-l10n-el
+Provides: openoffice.org-l10n-1.1.0.final, openoffice.org1.1-l10n-el
Suggests: myspell-dictionary-el, openoffice.org-hyphenation-el,
openoffice.org-thesaurus-el, openoffice.org-help-el
Description: Greek language package for openoffice.org
OpenOffice is a complete modern office suite, licensed under the GPL,
@@ -204,7 +204,7 @@
Depends: openoffice.org (>> 1.0.99+1.1)
Conflicts: openoffice.org1.1-l10n-nl
Replaces: openoffice.org1.1-l10n-nl
-Provides: openoffice.org-l10n-1.1.0, openoffice.org1.1-l10n-nl
+Provides: openoffice.org-l10n-1.1.0.final, openoffice.org1.1-l10n-nl
Suggests: myspell-dictionary-nl, openoffice.org-hyphenation-nl,
openoffice.org-thesaurus-nl, openoffice.org-help-nl
Description: Dutch language package for openoffice.org
OpenOffice is a complete modern office suite, licensed under the GPL,
@@ -231,7 +231,7 @@
Depends: openoffice.org (>> 1.0.99+1.1)
Conflicts: openoffice.org1.1-l10n-fr
Replaces: openoffice.org1.1-l10n-fr
-Provides: openoffice.org-l10n-1.1.0, openoffice.org1.1-l10n-fr
+Provides: openoffice.org-l10n-1.1.0.final, openoffice.org1.1-l10n-fr
Suggests: myspell-dictionary-fr, openoffice.org-hyphenation-fr,
openoffice.org-thesaurus-fr, openoffice.org-help-fr
Description: French language package for openoffice.org
OpenOffice is a complete modern office suite, licensed under the GPL,
@@ -258,7 +258,7 @@
Depends: openoffice.org (>> 1.0.99+1.1)
Conflicts: openoffice.org1.1-l10n-es
Replaces: openoffice.org1.1-l10n-es
-Provides: openoffice.org-l10n-1.1.0, openoffice.org1.1-l10n-es
+Provides: openoffice.org-l10n-1.1.0.final, openoffice.org1.1-l10n-es
Suggests: myspell-dictionary-es, openoffice.org-hyphenation-es,
openoffice.org-thesaurus-es, openoffice.org-help-es
Description: Spanish language package for openoffice.org
OpenOffice is a complete modern office suite, licensed under the GPL,
@@ -285,7 +285,7 @@
Depends: openoffice.org (>> 1.0.99+1.1)
Conflicts: openoffice.org1.1-l10n-fi
Replaces: openoffice.org1.1-l10n-fi
-Provides: openoffice.org-l10n-1.1.0, openoffice.org1.1-l10n-fi
+Provides: openoffice.org-l10n-1.1.0.final, openoffice.org1.1-l10n-fi
Suggests: myspell-dictionary-fi, openoffice.org-hyphenation-fi,
openoffice.org-thesaurus-fi, openoffice.org-help-fi
Description: Finnish language package for openoffice.org
OpenOffice is a complete modern office suite, licensed under the GPL,
@@ -312,7 +312,7 @@
Depends: openoffice.org (>> 1.0.99+1.1)
Conflicts: openoffice.org1.1-l10n-ca
Replaces: openoffice.org1.1-l10n-ca
-Provides: openoffice.org-l10n-1.1.0, openoffice.org1.1-l10n-ca
+Provides: openoffice.org-l10n-1.1.0.final, openoffice.org1.1-l10n-ca
Suggests: myspell-dictionary-ca, openoffice.org-hyphenation-ca,
openoffice.org-thesaurus-ca, openoffice.org-help-ca
Description: Catalan language package for openoffice.org
OpenOffice is a complete modern office suite, licensed under the GPL,
@@ -339,7 +339,7 @@
Depends: openoffice.org (>> 1.0.99+1.1)
Conflicts: openoffice.org1.1-l10n-it
Replaces: openoffice.org1.1-l10n-it
-Provides: openoffice.org-l10n-1.1.0, openoffice.org1.1-l10n-it
+Provides: openoffice.org-l10n-1.1.0.final, openoffice.org1.1-l10n-it
Suggests: myspell-dictionary-it, openoffice.org-hyphenation-it,
openoffice.org-thesaurus-it, openoffice.org-help-it
Description: Italian language package for openoffice.org
OpenOffice is a complete modern office suite, licensed under the GPL,
@@ -366,7 +366,7 @@
Depends: openoffice.org (>> 1.0.99+1.1)
Conflicts: openoffice.org1.1-l10n-cs
Replaces: openoffice.org1.1-l10n-cs
-Provides: openoffice.org-l10n-1.1.0, openoffice.org1.1-l10n-cs
+Provides: openoffice.org-l10n-1.1.0.final, openoffice.org1.1-l10n-cs
Suggests: myspell-dictionary-cs, openoffice.org-hyphenation-cs,
openoffice.org-thesaurus-cs, openoffice.org-help-cs
Description: Czech language package for openoffice.org
OpenOffice is a complete modern office suite, licensed under the GPL,
@@ -393,7 +393,7 @@
Depends: openoffice.org (>> 1.0.99+1.1)
Conflicts: openoffice.org1.1-l10n-sk
Replaces: openoffice.org1.1-l10n-sk
-Provides: openoffice.org-l10n-1.1.0, openoffice.org1.1-l10n-sk
+Provides: openoffice.org-l10n-1.1.0.final, openoffice.org1.1-l10n-sk
Suggests: myspell-dictionary-sk, openoffice.org-hyphenation-sk,
openoffice.org-thesaurus-sk, openoffice.org-help-sk
Description: Slovak language package for openoffice.org
OpenOffice is a complete modern office suite, licensed under the GPL,
@@ -420,7 +420,7 @@
Depends: openoffice.org (>> 1.0.99+1.1)
Conflicts: openoffice.org1.1-l10n-da
Replaces: openoffice.org1.1-l10n-da
-Provides: openoffice.org-l10n-1.1.0, openoffice.org1.1-l10n-da
+Provides: openoffice.org-l10n-1.1.0.final, openoffice.org1.1-l10n-da
Suggests: myspell-dictionary-da, openoffice.org-hyphenation-da,
openoffice.org-thesaurus-da, openoffice.org-help-da
Description: Danish language package for openoffice.org
OpenOffice is a complete modern office suite, licensed under the GPL,
@@ -447,7 +447,7 @@
Depends: openoffice.org (>> 1.0.99+1.1)
Conflicts: openoffice.org1.1-l10n-sv
Replaces: openoffice.org1.1-l10n-sv
-Provides: openoffice.org-l10n-1.1.0, openoffice.org1.1-l10n-sv
+Provides: openoffice.org-l10n-1.1.0.final, openoffice.org1.1-l10n-sv
Suggests: myspell-dictionary-sv, openoffice.org-hyphenation-sv,
openoffice.org-thesaurus-sv, openoffice.org-help-sv
Description: Swedish language package for openoffice.org
OpenOffice is a complete modern office suite, licensed under the GPL,
@@ -474,7 +474,7 @@
Depends: openoffice.org (>> 1.0.99+1.1)
Conflicts: openoffice.org1.1-l10n-pl
Replaces: openoffice.org1.1-l10n-pl
-Provides: openoffice.org-l10n-1.1.0, openoffice.org1.1-l10n-pl
+Provides: openoffice.org-l10n-1.1.0.final, openoffice.org1.1-l10n-pl
Suggests: myspell-dictionary-pl, openoffice.org-hyphenation-pl,
openoffice.org-thesaurus-pl, openoffice.org-help-pl
Description: Polish language package for openoffice.org
OpenOffice is a complete modern office suite, licensed under the GPL,
@@ -501,7 +501,7 @@
Depends: openoffice.org (>> 1.0.99+1.1)
Conflicts: openoffice.org1.1-l10n-de
Replaces: openoffice.org1.1-l10n-de
-Provides: openoffice.org-l10n-1.1.0, openoffice.org1.1-l10n-de
+Provides: openoffice.org-l10n-1.1.0.final, openoffice.org1.1-l10n-de
Suggests: myspell-dictionary-de, openoffice.org-hyphenation-de,
openoffice.org-thesaurus-de, openoffice.org-help-de
Description: German language package for openoffice.org
OpenOffice is a complete modern office suite, licensed under the GPL,
@@ -528,7 +528,7 @@
Depends: openoffice.org (>> 1.0.99+1.1)
Conflicts: openoffice.org1.1-l10n-pt-br
Replaces: openoffice.org1.1-l10n-pt-br
-Provides: openoffice.org-l10n-1.1.0, openoffice.org1.1-l10n-pt-br
+Provides: openoffice.org-l10n-1.1.0.final, openoffice.org1.1-l10n-pt-br
Suggests: myspell-dictionary-pt-br, openoffice.org-hyphenation-pt-br,
openoffice.org-thesaurus-pt-br, openoffice.org-help-pt-br
Description: Brazilian Portuguese language package for openoffice.org
OpenOffice is a complete modern office suite, licensed under the GPL,
@@ -555,7 +555,7 @@
Depends: openoffice.org (>> 1.0.99+1.1)
Conflicts: openoffice.org1.1-l10n-ja
Replaces: openoffice.org1.1-l10n-ja
-Provides: openoffice.org-l10n-1.1.0, openoffice.org1.1-l10n-ja
+Provides: openoffice.org-l10n-1.1.0.final, openoffice.org1.1-l10n-ja
Suggests: myspell-dictionary-ja, openoffice.org-hyphenation-ja,
openoffice.org-thesaurus-ja, openoffice.org-help-ja
Description: Japanese language package for openoffice.org
OpenOffice is a complete modern office suite, licensed under the GPL,
@@ -582,7 +582,7 @@
Depends: openoffice.org (>> 1.0.99+1.1)
Conflicts: openoffice.org1.1-l10n-ko
Replaces: openoffice.org1.1-l10n-ko
-Provides: openoffice.org-l10n-1.1.0, openoffice.org1.1-l10n-ko
+Provides: openoffice.org-l10n-1.1.0.final, openoffice.org1.1-l10n-ko
Suggests: myspell-dictionary-ko, openoffice.org-hyphenation-ko,
openoffice.org-thesaurus-ko, openoffice.org-help-ko
Description: Korean language package for openoffice.org
OpenOffice is a complete modern office suite, licensed under the GPL,
@@ -609,7 +609,7 @@
Depends: openoffice.org (>> 1.0.99+1.1)
Conflicts: openoffice.org1.1-l10n-zh-cn
Replaces: openoffice.org1.1-l10n-zh-cn
-Provides: openoffice.org-l10n-1.1.0, openoffice.org1.1-l10n-zh-cn
+Provides: openoffice.org-l10n-1.1.0.final, openoffice.org1.1-l10n-zh-cn
Suggests: myspell-dictionary-zh-cn, openoffice.org-hyphenation-zh-cn,
openoffice.org-thesaurus-zh-cn, openoffice.org-help-zh-cn
Description: Chinese (simplified) language package for openoffice.org
OpenOffice is a complete modern office suite, licensed under the GPL,
@@ -636,7 +636,7 @@
Depends: openoffice.org (>> 1.0.99+1.1)
Conflicts: openoffice.org1.1-l10n-zh-tw
Replaces: openoffice.org1.1-l10n-zh-tw
-Provides: openoffice.org-l10n-1.1.0, openoffice.org1.1-l10n-zh-tw
+Provides: openoffice.org-l10n-1.1.0.final, openoffice.org1.1-l10n-zh-tw
Suggests: myspell-dictionary-zh-tw, openoffice.org-hyphenation-zh-tw,
openoffice.org-thesaurus-zh-tw, openoffice.org-help-zh-tw
Description: Chinese (traditional) language package for openoffice.org
OpenOffice is a complete modern office suite, licensed under the GPL,
@@ -663,7 +663,7 @@
Depends: openoffice.org (>> 1.0.99+1.1)
Conflicts: openoffice.org1.1-l10n-tr
Replaces: openoffice.org1.1-l10n-tr
-Provides: openoffice.org-l10n-1.1.0, openoffice.org1.1-l10n-tr
+Provides: openoffice.org-l10n-1.1.0.final, openoffice.org1.1-l10n-tr
Suggests: myspell-dictionary-tr, openoffice.org-hyphenation-tr,
openoffice.org-thesaurus-tr, openoffice.org-help-tr
Description: Turkish language package for openoffice.org
OpenOffice is a complete modern office suite, licensed under the GPL,
@@ -690,7 +690,7 @@
Depends: openoffice.org (>> 1.0.99+1.1)
Conflicts: openoffice.org1.1-l10n-ar
Replaces: openoffice.org1.1-l10n-ar
-Provides: openoffice.org-l10n-1.1.0, openoffice.org1.1-l10n-ar
+Provides: openoffice.org-l10n-1.1.0.final, openoffice.org1.1-l10n-ar
Suggests: myspell-dictionary-ar, openoffice.org-hyphenation-ar,
openoffice.org-thesaurus-ar, openoffice.org-help-ar
Description: Arabic language package for openoffice.org
OpenOffice is a complete modern office suite, licensed under the GPL,
