Merge lp:~alexandru.cucu/ubuntu/natty/openoffice.org-dictionaries/fix-for-773136 into lp:ubuntu/natty/openoffice.org-dictionaries

[Alexandru Cucu]

[Martin Pitt (pitti)]

Applied to oneiric, thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-28 15:45:51 +0000
+++ debian/changelog	2011-07-04 20:14:30 +0000
@@ -1,3 +1,9 @@
+openoffice.org-dictionaries (1:3.3.0~rc10-2ubuntu3) natty; urgency=low
+
+  * hunspell-ro: fixed conflict with Thunderbird (LP: #773136)
+
+ -- Alexandru Cucu <[e-mail]>  Mon, 04 Jul 2011 23:10:07 +0300
+
 openoffice.org-dictionaries (1:3.3.0~rc10-2ubuntu2) natty; urgency=low
 
   * added versioned conflicts/replaces

=== modified file 'debian/control'
--- debian/control	2011-03-28 15:45:51 +0000
+++ debian/control	2011-07-04 20:14:30 +0000
@@ -328,7 +328,7 @@
 Depends: dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ${misc:Depends}
 Provides: hunspell-dictionary, hunspell-dictionary-ro
 Suggests: hunspell, openoffice.org-hunspell | openoffice.org-core (>= 2.0.2)
-Conflicts: openoffice.org (<= 1.0.3-2), mozilla-browser (<< 1.8+1.1.1-2), iceape-browser (<< 1.1.1-2), firefox (<< 2.0.0.3-2), thunderbird, iceweasel (<< 2.0.0.3-2), icedove (<< 2.0.0.0-4), openoffice.org-core (<< 2.1~m190-1), libxul0d (= 1.8.0.11-3)
+Conflicts: openoffice.org (<= 1.0.3-2), mozilla-browser (<< 1.8+1.1.1-2), iceape-browser (<< 1.1.1-2), firefox (<< 2.0.0.3-2), thunderbird (<< 2.0.0.1+0dfsg-0), iceweasel (<< 2.0.0.3-2), icedove (<< 2.0.0.0-4), openoffice.org-core (<< 2.1~m190-1), libxul0d (= 1.8.0.11-3)
 Description: Romanian dictionary for hunspell
  This is the Romanian dictionary for use with the hunspell spellchecker