diff -pruN 1:3.3.0~rc10-2/debian/changelog 1:3.3.0~rc10-2ubuntu3/debian/changelog
--- 1:3.3.0~rc10-2/debian/changelog	2011-07-06 14:45:41.000000000 +0100
+++ 1:3.3.0~rc10-2ubuntu3/debian/changelog	2011-07-06 14:40:09.000000000 +0100
@@ -1,3 +1,30 @@
+openoffice.org-dictionaries (1:3.3.0~rc10-2ubuntu3) oneiric; urgency=low
+
+  * hunspell-ro: fixed conflict with Thunderbird (LP: #773136)
+
+ -- Alexandru Cucu <alexandru.cucu@ubuntu.ro>  Mon, 04 Jul 2011 23:10:07 +0300
+
+openoffice.org-dictionaries (1:3.3.0~rc10-2ubuntu2) natty; urgency=low
+
+  * added versioned conflicts/replaces
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com>  Mon, 28 Mar 2011 15:45:51 +0200
+
+openoffice.org-dictionaries (1:3.3.0~rc10-2ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable. Remaining changes:
+   + debian/control:
+    - Add dependencies on language-support-writing-* so that pulling one
+      dictionary (by langpack for instance) doesn't pull OOo.
+    - Fix the unversioned thunderbird entry in Conflicts for the hunspell-*
+      packages.
+   + debian/*.links:
+    - Add missing symlinks between myspell/hunspell/mythes
+      These should be obsolete with OOo/LO 3.0.0 or higher. They should be
+      removed along with the others when debian does so.
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com>  Wed, 09 Mar 2011 18:47:23 +0100
+
 openoffice.org-dictionaries (1:3.3.0~rc10-2) unstable; urgency=low
 
   * upload to unstable
@@ -31,30 +58,66 @@ openoffice.org-dictionaries (1:3.3.0~rc9
 
  -- Rene Engelhard <rene@debian.org>  Sun, 09 Jan 2011 16:53:18 +0100
 
+openoffice.org-dictionaries (1:3.2.1-2ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable. Remaining changes:
+   + debian/control:
+    - Add dependencies on language-support-writing-* so that pulling one
+      dictionary (by langpack for instance) doesn't pull OOo.
+    - Fix the unversioned thunderbird entry in Conflicts for the hunspell-*
+      packages.
+    - Conflicts/Replaces: openoffice.org-thesaurus << 0.6 in -fr for BE
+   + debian/*.links:
+    - Add missing symlinks between myspell/hunspell/mythes
+
+ -- Didier Roche <didrocks@ubuntu.com>  Thu, 12 Aug 2010 12:56:53 +0200
+
 openoffice.org-dictionaries (1:3.2.1-2) unstable; urgency=high
 
-  * fix hunspell-fr install for new dict name in 3.2.1 (closes: #587908) 
+  * fix hunspell-fr install for new dict name in 3.2.1 (closes: #587908)
 
  -- Rene Engelhard <rene@debian.org>  Fri, 02 Jul 2010 16:40:30 +0200
 
 openoffice.org-dictionaries (1:3.2.1-1) unstable; urgency=high
 
   * OpenOffice.org 3.2.1
-  * use th_gen_idx.pl from libmythes-dev 
+  * use th_gen_idx.pl from libmythes-dev
   * register fr thesaurus and hyphenation (like hunspell-fr) also
     for BE, CA, CH, MC, LU (closes: #585979)
 
  -- Rene Engelhard <rene@debian.org>  Thu, 17 Jun 2010 00:43:24 +0200
 
+openoffice.org-dictionaries (1:3.2.0~rc2-5ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable. (Closes LP: #587706) Remaining changes:
+    - Add dependencies on language-support-writing-* packages.
+      Closes LP: #537609
+    - Fix the unversioned thunderbird entry in Conflicts for the hunspell-*
+      packages.
+    - define symlinks for the fr_FR dictionary too otherwise only the other
+      variants are listed in GNOME dialogs
+    - Refreshed: Add missing compat symlinks. Closes LP: #568760.
+    - openoffice.org-thesaurus-en-us claims to provide en-gb but did not have 
+      a symlink. Closes LP: #578744
+  * myspell-en-za fix in 1:3.2.0~rc2-5 closes LP: #467278.
+
+ -- Chris Cheney <ccheney@ubuntu.com>  Sat, 05 Jun 2010 18:20:00 -0500
+
 openoffice.org-dictionaries (1:3.2.0~rc2-5) unstable; urgency=medium
 
   * revert
     "make myspell-en-za depend on -en-gb , use en_GB.aff for en_ZA.aff",
    thanks Stefano Rivera (closes: #583795)
-  * add explicit debian/source/format
+  * add explicit debian/source/format 
 
  -- Rene Engelhard <rene@debian.org>  Mon, 31 May 2010 00:33:35 +0200
 
+openoffice.org-dictionaries (1:3.2.0~rc2-3ubuntu3) lucid; urgency=low
+
+  * Add missing compat symlinks. Closes LP: #568760
+
+ -- Chris Cheney <ccheney@ubuntu.com>  Fri, 23 Apr 2010 13:30:00 -0500
+
 openoffice.org-dictionaries (1:3.2.0~rc2-4) unstable; urgency=low
 
   * fix compat symlinks for openoffice.org-thesaurus-fr
@@ -62,6 +125,19 @@ openoffice.org-dictionaries (1:3.2.0~rc2
 
  -- Rene Engelhard <rene@debian.org>  Tue, 20 Apr 2010 11:50:40 +0200
 
+openoffice.org-dictionaries (1:3.2.0~rc2-3ubuntu2) lucid; urgency=low
+
+  * Add missing Conflicts/Replaces on the Ubuntu-only
+    openoffice.org-hyphenation (<< 0.5).  LP: #568514.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 23 Apr 2010 09:44:38 +0000
+
+openoffice.org-dictionaries (1:3.2.0~rc2-3ubuntu1) lucid; urgency=low
+
+  * Resync on Debian
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Mon, 19 Apr 2010 22:38:26 +0200
+
 openoffice.org-dictionaries (1:3.2.0~rc2-3) unstable; urgency=medium
 
   * merge from Ubuntu:
@@ -72,12 +148,47 @@ openoffice.org-dictionaries (1:3.2.0~rc2
 
  -- Rene Engelhard <rene@debian.org>  Mon, 19 Apr 2010 18:31:55 +0200
 
+openoffice.org-dictionaries (1:3.2.0~rc2-2ubuntu2) lucid; urgency=low
+
+  * debian/hunspell-fr.links:
+    - define symlinks for the fr_FR dictionary too otherwise only the 
+      other variants are listed in GNOME dialogs
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Tue, 13 Apr 2010 15:25:51 +0200
+
+openoffice.org-dictionaries (1:3.2.0~rc2-2ubuntu1) lucid; urgency=low
+
+  * Merge from debian testing.  Remaining changes:
+    - Add dependencies on language-support-writing-* packages.
+      Closes LP: #537609
+    - Mark hunspell-ro conflicting with myspell-ro.
+    - Fix the unversioned thunderbird entry in Conflicts for the hunspell-*
+      packages.
+
+ -- Chris Cheney <ccheney@ubuntu.com>  Mon, 22 Mar 2010 14:00:00 -0500
+
 openoffice.org-dictionaries (1:3.2.0~rc2-2) unstable; urgency=low
 
-  * version binary packages 3.2.0-x
+  * version binary packages 3.2.0-x 
 
  -- Rene Engelhard <rene@debian.org>  Thu, 11 Feb 2010 14:15:33 +0100
 
+openoffice.org-dictionaries (1:3.2.0~rc2-1ubuntu2) lucid; urgency=low
+
+  * Drop all language-support-writing-* except for language-support-writing-en.
+  * Mark hunspell-ro conflicting with myspell-ro. Closes LP: #517582
+
+ -- Chris Cheney <ccheney@ubuntu.com>  Fri, 19 Feb 2010 12:30:00 -0600
+
+openoffice.org-dictionaries (1:3.2.0~rc2-1ubuntu1) lucid; urgency=low
+
+  * Merge from debian testing.  Remaining changes:
+    - Add dependencies on language-support-writing-* packages.
+    - Fix the unversioned thunderbird entry in Conflicts for the
+      hunspell-* packages.
+
+ -- Chris Cheney <ccheney@ubuntu.com>  Mon, 01 Feb 2010 18:00:00 -0600
+
 openoffice.org-dictionaries (1:3.2.0~rc2-1) unstable; urgency=medium
 
   * OpenOffice.org 3.2.0 rc2 (OOO320_m9) 
@@ -135,6 +246,15 @@ openoffice.org-dictionaries (1:3.1.0~ooo
 
  -- Rene Engelhard <rene@debian.org>  Sun, 22 Mar 2009 11:46:45 +0100
 
+openoffice.org-dictionaries (1:3.0.1~rc1-8ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Add dependencies on language-support-writing-* packages.
+    - Fix the unversioned thunderbird entry in Conflicts for the
+      hunspell-* packages.
+
+ -- Chris Cheney <ccheney@ubuntu.com>  Mon, 13 Apr 2009 12:30:00 -0500
+
 openoffice.org-dictionaries (1:3.1.0~ooo310m5-1) experimental; urgency=low
 
   * new upstream snapshot
@@ -144,6 +264,19 @@ openoffice.org-dictionaries (1:3.1.0~ooo
 
  -- Rene Engelhard <rene@debian.org>  Thu, 12 Mar 2009 18:01:13 +0100
 
+openoffice.org-dictionaries (1:3.0.1~rc1-8) unstable; urgency=low
+
+  * add missing fr_MC symlink (closes: #523643) 
+
+ -- Rene Engelhard <rene@debian.org>  Sat, 11 Apr 2009 19:59:41 +0200
+
+openoffice.org-dictionaries (1:3.0.1~rc1-7) unstable; urgency=low
+
+  * provide hunspelll-dictionary-vi and not -fr at hunspell-vi
+    (closes: #520691)
+
+ -- Rene Engelhard <rene@debian.org>  Sun, 22 Mar 2009 11:46:45 +0100
+
 openoffice.org-dictionaries (1:3.0.1~rc1-6) unstable; urgency=low
 
   * guard update-openoffice-dicts call witn -x (closes: #518975) 
@@ -162,6 +295,15 @@ openoffice.org-dictionaries (1:3.0.1~rc1
 
  -- Rene Engelhard <rene@debian.org>  Mon, 02 Mar 2009 01:19:34 +0100
 
+openoffice.org-dictionaries (1:3.0.1~rc1-3ubuntu1) jaunty; urgency=low
+
+  * Merge from debian experimental, remaining changes:
+    - Add dependencies on language-support-writing-* packages.
+    - Fix the unversioned thunderbird entry in Conflicts for the
+      hunspell-* packages.
+
+ -- Chris Cheney <ccheney@ubuntu.com>  Fri, 20 Feb 2009 17:00:00 -0600
+
 openoffice.org-dictionaries (1:3.0.1~rc1-3) unstable; urgency=low
 
   * upload to unstable 
@@ -350,19 +492,6 @@ openoffice.org-dictionaries (1:2.0.0-1) 
 
  -- Rene Engelhard <rene@debian.org>  Sat, 22 Oct 2005 03:42:48 +0200
 
-openoffice.org2-dictionaries (1.9.121+cvs20050804-1) experimental; urgency=low
-
-  * update to cws_src680_thesaurus20, now based on WordNet 2.1 
-
- -- Rene Engelhard <rene@debian.org>  Thu,  4 Aug 2005 18:37:02 +0200
-
-openoffice.org2-dictionaries (1.9.109-1) experimental; urgency=low
-
-  * update for OOo2
-  * build openoffice.org2-thesaurus-en-us from here
-
- -- Rene Engelhard <rene@debian.org>  Wed, 15 Jun 2005 02:18:46 +0200
-
 openoffice.org-dictionaries (20050823-1) unstable; urgency=low
 
   * Remove the openoffice.org-hyphenation-* packages.
@@ -418,3 +547,16 @@ openoffice.org-dictionaries (20030617-1)
 
  -- Rene Engelhard <rene@debian.org>  Tue, 17 Jun 2003 19:33:47 +0200
 
+openoffice.org2-dictionaries (1.9.121+cvs20050804-1) experimental; urgency=low
+
+  * update to cws_src680_thesaurus20, now based on WordNet 2.1 
+
+ -- Rene Engelhard <rene@debian.org>  Thu,  4 Aug 2005 18:37:02 +0200
+
+openoffice.org2-dictionaries (1.9.109-1) experimental; urgency=low
+
+  * update for OOo2
+  * build openoffice.org2-thesaurus-en-us from here
+
+ -- Rene Engelhard <rene@debian.org>  Wed, 15 Jun 2005 02:18:46 +0200
+
diff -pruN 1:3.3.0~rc10-2/debian/control 1:3.3.0~rc10-2ubuntu3/debian/control
--- 1:3.3.0~rc10-2/debian/control	2011-07-06 14:45:41.000000000 +0100
+++ 1:3.3.0~rc10-2ubuntu3/debian/control	2011-07-06 14:40:09.000000000 +0100
@@ -1,8 +1,8 @@
 Source: openoffice.org-dictionaries
 Section: text
 Priority: optional
-Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
-Uploaders: Rene Engelhard <rene@debian.org>, Chris Halls <halls@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
 Build-Depends: debhelper (>> 4.0.0), dpatch
 Build-Depends-Indep: unzip, libmythes-dev
 Standards-Version: 3.7.2
@@ -10,10 +10,10 @@ Standards-Version: 3.7.2
 Package: mythes-en-us
 Architecture: all
 Section: text
-Depends: libreoffice-core | openoffice.org-core (>= 1.9), dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ${misc:Depends}
+Depends: libreoffice-core | openoffice.org-core (>= 1.9) | language-support-writing-en, dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ${misc:Depends}
 Provides: mythes-thesaurus, mythes-thesaurus-en, mythes-en-gb, openoffice.org-thesaurus-en-us
-Conflicts: openoffice.org (<< 1.9), openoffice.org-thesaurus-en-us
-Replaces: openoffice.org-thesaurus-en-us
+Conflicts: openoffice.org (<< 1.9), openoffice.org-thesaurus-en-us (<< 1:3.3.0-7)
+Replaces: openoffice.org-thesaurus-en-us (<< 1:3.3.0-7)
 Description: English Thesaurus for LibreOffice/OpenOffice.org
  Openoffice.org is a full-featured office productivity suite that provides a
  near drop-in replacement for Microsoft(R) Office.
@@ -23,10 +23,10 @@ Description: English Thesaurus for Libre
 Package: mythes-cs
 Architecture: all
 Section: text
-Depends: libreoffice-core | openoffice.org-core (>= 1.9), dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ${misc:Depends}
+Depends: libreoffice-core | openoffice.org-core (>= 1.9) | language-support-writing-cs, dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ${misc:Depends}
 Provides: mythes-thesaurus, mythes-thesaurus-cs, openoffice.org-thesaurus-cs
-Conflicts: openoffice.org (<< 1.9), openoffice.org-thesaurus-cs
-Replaces: openoffice.org-thesaurus-cs
+Conflicts: openoffice.org (<< 1.9), openoffice.org-thesaurus-cs (<< 1:3.3.0-7)
+Replaces: openoffice.org-thesaurus-cs (<< 1:3.3.0-7)
 Description: Czech Thesaurus for LibreOffice/OpenOffice.org
  Openoffice.org is a full-featured office productivity suite that provides a
  near drop-in replacement for Microsoft(R) Office.
@@ -36,10 +36,10 @@ Description: Czech Thesaurus for LibreOf
 Package: mythes-sk
 Architecture: all
 Section: text
-Depends: libreoffice-core | openoffice.org-core (>= 1.9), dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ${misc:Depends}
+Depends: libreoffice-core | openoffice.org-core (>= 1.9) | language-support-writing-sk, dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ${misc:Depends}
 Provides: mythes-thesaurus, mythes-thesaurus-sk, openoffice.org-thesaurus-sk
-Conflicts: openoffice.org (<< 1.9), openoffice.org-thesaurus-sk
-Replaces: openoffice.org-thesaurus-sk
+Conflicts: openoffice.org (<< 1.9), openoffice.org-thesaurus-sk (<< 1:3.3.0-7)
+Replaces: openoffice.org-thesaurus-sk (<< 1:3.3.0-7)
 Description: Slovak Thesaurus for LibreOffice/OpenOffice.org
  Openoffice.org is a full-featured office productivity suite that provides a
  near drop-in replacement for Microsoft(R) Office.
@@ -49,10 +49,10 @@ Description: Slovak Thesaurus for LibreO
 Package: mythes-ru
 Architecture: all
 Section: text
-Depends: libreoffice-core | openoffice.org-core (>= 1.9), dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ${misc:Depends}
+Depends: libreoffice-core | openoffice.org-core (>= 1.9) | language-support-writing-ru, dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ${misc:Depends}
 Provides: mythes-thesaurus, mythes-thesaurus-ru, openoffice.org-thesaurus-ru
-Conflicts: openoffice.org (<< 1.9), openoffice.org-thesaurus-ru
-Replaces: openoffice.org-thesaurus-ru
+Conflicts: openoffice.org (<< 1.9), openoffice.org-thesaurus-ru (<< 1:3.3.0-7)
+Replaces: openoffice.org-thesaurus-ru (<< 1:3.3.0-7)
 Description: Russian Thesaurus for LibreOffice/OpenOffice.org
  Openoffice.org is a full-featured office productivity suite that provides a
  near drop-in replacement for Microsoft(R) Office.
@@ -62,10 +62,10 @@ Description: Russian Thesaurus for Libre
 Package: mythes-ne
 Architecture: all
 Section: text
-Depends: libreoffice-core | openoffice.org-core (>= 1.9), dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ${misc:Depends}
+Depends: libreoffice-core | openoffice.org-core (>= 1.9) | language-support-writing-ne, dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ${misc:Depends}
 Provides: mythes-thesaurus, mythes-thesaurus-ne, openoffice.org-thesaurus-ne
-Conflicts: openoffice.org (<< 1.9), openoffice.org-thesaurus-ne
-Replaces: openoffice.org-thesaurus-ne
+Conflicts: openoffice.org (<< 1.9), openoffice.org-thesaurus-ne (<< 1:3.3.0-7)
+Replaces: openoffice.org-thesaurus-ne (<< 1:3.3.0-7)
 Description: Nepali Thesaurus for LibreOffice/OpenOffice.org
  Openoffice.org is a full-featured office productivity suite that provides a
  near drop-in replacement for Microsoft(R) Office.
@@ -75,10 +75,10 @@ Description: Nepali Thesaurus for LibreO
 Package: mythes-hu
 Architecture: all
 Section: text
-Depends: libreoffice-core | openoffice.org-core (>= 1.9), dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ${misc:Depends}
+Depends: libreoffice-core | openoffice.org-core (>= 1.9) | language-support-writing-hu, dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ${misc:Depends}
 Provides: mythes-thesaurus, mythes-thesaurus-hu, openoffice.org-thesaurus-hu
-Conflicts: openoffice.org (<< 1.9), openoffice.org-thesaurus-hu
-Replaces: openoffice.org-thesaurus-hu
+Conflicts: openoffice.org (<< 1.9), openoffice.org-thesaurus-hu (<< 1:3.3.0-7)
+Replaces: openoffice.org-thesaurus-hu (<< 1:3.3.0-7)
 Description: Hungarian Thesaurus for LibreOffice/OpenOffice.org
  Openoffice.org is a full-featured office productivity suite that provides a
  near drop-in replacement for Microsoft(R) Office.
@@ -88,10 +88,10 @@ Description: Hungarian Thesaurus for Lib
 Package: mythes-fr
 Architecture: all
 Section: text
-Depends: libreoffice-core | openoffice.org-core (>= 1.9), dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ${misc:Depends}
+Depends: libreoffice-core | openoffice.org-core (>= 1.9) | language-support-writing-fr, dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ${misc:Depends}
 Provides: mythes-thesaurus, mythes-thesaurus-fr, openoffice.org-thesaurus-fr
-Conflicts: openoffice.org (<< 1.9), openoffice.org-thesaurus-fr
-Replaces: openoffice.org-thesaurus-fr
+Conflicts: openoffice.org (<< 1.9), openoffice.org-thesaurus-fr (<< 1:3.3.0-7)
+Replaces: openoffice.org-thesaurus-fr (<< 1:3.3.0-7)
 Description: French Thesaurus for LibreOffice/OpenOffice.org
  Openoffice.org is a full-featured office productivity suite that provides a
  near drop-in replacement for Microsoft(R) Office.
@@ -101,10 +101,10 @@ Description: French Thesaurus for LibreO
 Package: mythes-ro
 Architecture: all
 Section: text
-Depends: libreoffice-core | openoffice.org-core (>= 1.9), dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ${misc:Depends}
+Depends: libreoffice-core | openoffice.org-core (>= 1.9) | language-support-writing-ro, dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ${misc:Depends}
 Provides: mythes-thesaurus, mythes-thesaurus-ro, openoffice.org-thesaurus-ro
-Conflicts: openoffice.org (<< 1.9), openoffice.org-thesaurus-ro
-Replaces: openoffice.org-thesaurus-ro
+Conflicts: openoffice.org (<< 1.9), openoffice.org-thesaurus-ro (<< 1:3.3.0-7)
+Replaces: openoffice.org-thesaurus-ro (<< 1:3.3.0-7)
 Description: Romanian Thesaurus for LibreOffice/OpenOffice.org
  Openoffice.org is a full-featured office productivity suite that provides a
  near drop-in replacement for Microsoft(R) Office.
@@ -114,10 +114,10 @@ Description: Romanian Thesaurus for Libr
 Package: mythes-ca
 Architecture: all
 Section: text
-Depends: libreoffice-core | openoffice.org-core (>= 1.9), dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ${misc:Depends}
+Depends: libreoffice-core | openoffice.org-core (>= 1.9) | language-support-writing-ca, dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ${misc:Depends}
 Provides: mythes-thesaurus, mythes-thesaurus-ca, openoffice.org-thesaurus-ca
-Conflicts: openoffice.org (<< 1.9), openoffice.org-thesaurus-ca
-Replaces: openoffice.org-thesaurus-ca
+Conflicts: openoffice.org (<< 1.9), openoffice.org-thesaurus-ca (<< 1:3.3.0-7)
+Replaces: openoffice.org-thesaurus-ca (<< 1:3.3.0-7)
 Description: Catalan Thesaurus for LibreOffice/OpenOffice.org
  Openoffice.org is a full-featured office productivity suite that provides a
  near drop-in replacement for Microsoft(R) Office.
@@ -151,6 +151,7 @@ Depends: dictionaries-common (>= 0.10) |
 Provides: myspell-dictionary, myspell-dictionary-en
 Description: English_southafrican dictionary for myspell
  This is the English_southafrican dictionary for use with the myspell
+ spellchecker which is currently used within LibreOffice/OpenOffice.org and the mozilla
  spellchecker.
 
 Package: myspell-af
@@ -201,7 +202,7 @@ Section: text
 Depends: dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ${misc:Depends}
 Provides: hunspell-dictionary, hunspell-dictionary-en
 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: English_canadian dictionary for hunspell
  This is the English_canadian dictionary for use with the hunspell spellchecker
 
@@ -211,7 +212,7 @@ Section: text
 Depends: dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ${misc:Depends}
 Provides: hunspell-dictionary, hunspell-dictionary-ne
 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: Nepali dictionary for hunspell
  This is the Nepali dictionary for use with the hunspell spellchecker
 
@@ -221,7 +222,7 @@ Section: text
 Depends: dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ${misc:Depends}
 Provides: hunspell-dictionary, hunspell-dictionary-da
 Suggests: hunspell, openoffice.org-hunspell | openoffice.org-core (>= 2.0.2)
-Conflicts: openoffice.org (<= 1.0.3-2), myspell-da, 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), myspell-da, 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: Danish dictionary for hunspell
  This is the Danish dictionary for use with the hunspell spellchecker
 
@@ -276,7 +277,7 @@ Section: text
 Depends: dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ${misc:Depends}
 Provides: hunspell-dictionary, hunspell-dictionary-fr
 Suggests: hunspell, openoffice.org-hunspell | openoffice.org-core (>= 2.0.2)
-Conflicts: myspell-fr, myspell-fr-gut, openoffice.org (<= 1.0.3-2), myspell-da, 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: myspell-fr, myspell-fr-gut, openoffice.org (<= 1.0.3-2), myspell-da, 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: French dictionary for hunspell
  This is the French dictionary for use with the hunspell spellchecker
 
@@ -286,7 +287,7 @@ Section: text
 Depends: dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ${misc:Depends}
 Provides: hunspell-dictionary, hunspell-dictionary-vi
 Suggests: hunspell, openoffice.org-hunspell | openoffice.org-core (>= 2.0.2)
-Conflicts: openoffice.org (<= 1.0.3-2), myspell-da, 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), myspell-da, 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: Vietnamese dictionary for hunspell
  This is the Vietnamese dictionary for use with the hunspell spellchecker
 
@@ -296,7 +297,7 @@ Section: text
 Depends: dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ${misc:Depends}
 Provides: hunspell-dictionary, hunspell-dictionary-hu, myspell-hu
 Suggests: hunspell, openoffice.org-hunspell | openoffice.org-core (>= 2.0.2)
-Conflicts: openoffice.org (<= 1.0.3-2), myspell-da, 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), myspell-hu
+Conflicts: openoffice.org (<= 1.0.3-2), myspell-da, 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), myspell-hu
 Replaces: myspell-hu
 Description: Hungarian dictionary for hunspell
  This is the Hungarian dictionary for use with the hunspell spellchecker
@@ -307,7 +308,7 @@ Section: text
 Depends: dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ${misc:Depends}
 Provides: hunspell-dictionary, hunspell-dictionary-sr
 Suggests: hunspell, openoffice.org-hunspell | openoffice.org-core (>= 2.0.2)
-Conflicts: openoffice.org (<= 1.0.3-2), myspell-da, 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), myspell-da, 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: Serbian (Cyrillic) dictionary for hunspell
  This is the Serbian dictionary for use with the hunspell spellchecker
 
@@ -317,7 +318,7 @@ Section: text
 Depends: dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ${misc:Depends}
 Provides: hunspell-dictionary, hunspell-dictionary-sh
 Suggests: hunspell, openoffice.org-hunspell | openoffice.org-core (>= 2.0.2)
-Conflicts: openoffice.org (<= 1.0.3-2), myspell-da, 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), myspell-da, 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: Serbian (Latin) dictionary for hunspell
  This is the Serbian dictionary for use with the hunspell spellchecker
 
@@ -327,7 +328,7 @@ Section: text
 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
 
@@ -337,8 +338,8 @@ Section: text
 Depends: dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ${misc:Depends}
 Recommends: libreoffice-writer | openoffice.org-writer
 Provides: hyphen-hyphenation-patterns, hyphen-hyphenation-patterns-sh, openoffice.org-hyphenation-sh
-Replaces: openoffice.org-hyphenation-sh
-Conflicts: openoffice.org-hyphenation-sh
+Replaces: openoffice.org-hyphenation-sh (<< 1:3.3.0-7)
+Conflicts: openoffice.org-hyphenation-sh (<< 1:3.3.0-7)
 Description: Serbian (Latin) hyphenation patterns for LibreOffice/OpenOffice.org
  This package contains the Serbian hyphenation patterns for 
  LibreOffice/OpenOffice.org
@@ -349,8 +350,8 @@ Section: text
 Depends: dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ${misc:Depends}
 Recommends: libreoffice-writer | openoffice.org-writer
 Provides: hyphen-hyphenation-patterns, hyphen-hyphenation-patterns-sr, openoffice.org-hyphenation-sr
-Replaces: openoffice.org-hyphenation-sr
-Conflicts: openoffice.org-hyphenation-sr
+Replaces: openoffice.org-hyphenation-sr (<< 1:3.3.0-7)
+Conflicts: openoffice.org-hyphenation-sr (<< 1:3.3.0-7)
 Description: Serbian (Cyrillic) hyphenation patterns for LibreOffice/OpenOffice.org
  This package contains the Serbian hyphenation patterns for
  LibreOffice/OpenOffice.org
@@ -361,8 +362,8 @@ Section: text
 Depends: dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ${misc:Depends}
 Recommends: libreoffice-writer | openoffice.org-writer
 Provides: hyphen-hyphenation-patterns, hyphen-hyphenation-patterns-de, openoffice.org-hyphenation-de
-Replaces: openoffice.org-hyphenation-de
-Conflicts: openoffice.org-hyphenation-de
+Replaces: openoffice.org-hyphenation-de (<< 1:3.3.0-7)
+Conflicts: openoffice.org-hyphenation-de (<< 1:3.3.0-7)
 Description: German hyphenation patterns for LibreOffice/OpenOffice.org
  This package contains the German hyphenation patterns for 
  LibreOffice/OpenOffice.org
@@ -373,8 +374,8 @@ Section: text
 Depends: dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ${misc:Depends}
 Recommends: libreoffice-writer | openoffice.org-writer
 Provides: hyphen-hyphenation-patterns, hyphen-hyphenation-patterns-hu, openoffice.org-hyphenation-hu
-Replaces: openoffice.org-hyphenation-hu
-Conflicts: openoffice.org-hyphenation-hu
+Replaces: openoffice.org-hyphenation-hu (<< 1:3.3.0-7)
+Conflicts: openoffice.org-hyphenation-hu (<< 1:3.3.0-7)
 Description: Hungarian hyphenation patterns for LibreOffice/OpenOffice.org
  This package contains the Hungarian hyphenation patterns for
  LibreOffice/OpenOffice.org
@@ -385,8 +386,8 @@ Section: text
 Depends: dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ${misc:Depends}
 Recommends: libreoffice-writer | openoffice.org-writer
 Provides: hyphen-hyphenation-patterns, hyphen-hyphenation-patterns-it, openoffice.org-hyphenation-it
-Replaces: openoffice.org-hyphenation-it
-Conflicts: openoffice.org-hyphenation-it
+Replaces: openoffice.org-hyphenation-it (<< 1:3.3.0-7)
+Conflicts: openoffice.org-hyphenation-it (<< 1:3.3.0-7)
 Description: Italian hyphenation patterns for LibreOffice/OpenOffice.org
  This package contains the Italian hyphenation patterns for
  LibreOffice/OpenOffice.org
@@ -397,8 +398,8 @@ Section: text
 Depends: dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ${misc:Depends}
 Recommends: libreoffice-writer | openoffice.org-writer
 Provides: hyphen-hyphenation-patterns, hyphen-hyphenation-patterns-sl, openoffice.org-hyphenation-sl
-Replaces: openoffice.org-hyphenation-sl
-Conflicts: openoffice.org-hyphenation-sl
+Replaces: openoffice.org-hyphenation-sl (<< 1:3.3.0-7)
+Conflicts: openoffice.org-hyphenation-sl (<< 1:3.3.0-7)
 Description: Slovenian hyphenation patterns for LibreOffice/OpenOffice.org
  This package contains the Slovenian hyphenation patterns for
  LibreOffice/OpenOffice.org
@@ -409,8 +410,8 @@ Section: text
 Depends: dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ${misc:Depends}
 Recommends: libreoffice-writer | openoffice.org-writer
 Provides: hyphen-hyphenation-patterns, hyphen-hyphenation-patterns-af, openoffice.org-hyphenation-af
-Replaces: openoffice.org-hyphenation-af
-Conflicts: openoffice.org-hyphenation-af
+Replaces: openoffice.org-hyphenation-af (<< 1:3.3.0-7)
+Conflicts: openoffice.org-hyphenation-af (<< 1:3.3.0-7)
 Description: Afrikaans hyphenation patterns for LibreOffice/OpenOffice.org
  This package contains the Afrikaans hyphenation patterns for
  LibreOffice/OpenOffice.org
@@ -421,8 +422,8 @@ Section: text
 Depends: dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ${misc:Depends}
 Recommends: libreoffice-writer | openoffice.org-writer
 Provides: hyphen-hyphenation-patterns, hyphen-hyphenation-patterns-zu, openoffice.org-hyphenation-ui
-Replaces: openoffice.org-hyphenation-zu
-Conflicts: openoffice.org-hyphenation-zu
+Replaces: openoffice.org-hyphenation-zu (<< 1:3.3.0-7)
+Conflicts: openoffice.org-hyphenation-zu (<< 1:3.3.0-7)
 Description: Zulu hyphenation patterns for LibreOffice/OpenOffice.org
  This package contains the Zulu hyphenation patterns for
  LibreOffice/OpenOffice.org
@@ -433,8 +434,8 @@ Section: text
 Depends: dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ${misc:Depends}
 Recommends: libreoffice-writer | openoffice.org-writer
 Provides: hyphen-hyphenation-patterns, hyphen-hyphenation-patterns-fr, openoffice.org-hyphenation-fr
-Replaces: openoffice.org-hyphenation-fr
-Conflicts: openoffice.org-hyphenation-fr
+Replaces: openoffice.org-hyphenation-fr (<< 1:3.3.0-7)
+Conflicts: openoffice.org-hyphenation-fr (<< 1:3.3.0-7)
 Description: French hyphenation patterns for LibreOffice/OpenOffice.org
  This package contains the French hyphenation patterns for
  LibreOffice/OpenOffice.org
@@ -445,8 +446,8 @@ Section: text
 Depends: dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ${misc:Depends}
 Recommends: libreoffice-writer | openoffice.org-writer
 Provides: hyphen-hyphenation-patterns, hyphen-hyphenation-patterns-ro, openoffice.org-hyphenation-ro
-Replaces: openoffice.org-hyphenation-ro
-Conflicts: openoffice.org-hyphenation-ro
+Replaces: openoffice.org-hyphenation-ro (<< 1:3.3.0-7)
+Conflicts: openoffice.org-hyphenation-ro (<< 1:3.3.0-7)
 Description: Romanian hyphenation patterns for LibreOffice/OpenOffice.org
  This package contains the Romanian hyphenation patterns for
  LibreOffice/OpenOffice.org
@@ -457,8 +458,8 @@ Section: text
 Depends: dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ${misc:Depends}
 Recommends: libreoffice-writer | openoffice.org-writer
 Provides: hyphen-hyphenation-patterns, hyphen-hyphenation-patterns-ca, openoffice.org-hyphenation-ca
-Replaces: openoffice.org-hyphenation-ca
-Conflicts: openoffice.org-hyphenation-ca
+Replaces: openoffice.org-hyphenation-ca (<< 1:3.3.0-7)
+Conflicts: openoffice.org-hyphenation-ca (<< 1:3.3.0-7)
 Description: Catalan hyphenation patterns for LibreOffice/OpenOffice.org
  This package contains the Catalan hyphenation patterns for
  LibreOffice/OpenOffice.org
diff -pruN 1:3.3.0~rc10-2/debian/hunspell-da.links 1:3.3.0~rc10-2ubuntu3/debian/hunspell-da.links
--- 1:3.3.0~rc10-2/debian/hunspell-da.links	1970-01-01 01:00:00.000000000 +0100
+++ 1:3.3.0~rc10-2ubuntu3/debian/hunspell-da.links	2011-07-06 14:40:09.000000000 +0100
@@ -0,0 +1,2 @@
+/usr/share/hunspell/da_DK.aff /usr/share/myspell/dicts/da_DK.aff
+/usr/share/hunspell/da_DK.dic /usr/share/myspell/dicts/da_DK.dic
diff -pruN 1:3.3.0~rc10-2/debian/hunspell-en-ca.links 1:3.3.0~rc10-2ubuntu3/debian/hunspell-en-ca.links
--- 1:3.3.0~rc10-2/debian/hunspell-en-ca.links	1970-01-01 01:00:00.000000000 +0100
+++ 1:3.3.0~rc10-2ubuntu3/debian/hunspell-en-ca.links	2011-07-06 14:40:09.000000000 +0100
@@ -0,0 +1,2 @@
+/usr/share/hunspell/en_CA.aff /usr/share/myspell/dicts/en_CA.aff
+/usr/share/hunspell/en_CA.dic /usr/share/myspell/dicts/en_CA.dic
diff -pruN 1:3.3.0~rc10-2/debian/hunspell-hu.links 1:3.3.0~rc10-2ubuntu3/debian/hunspell-hu.links
--- 1:3.3.0~rc10-2/debian/hunspell-hu.links	1970-01-01 01:00:00.000000000 +0100
+++ 1:3.3.0~rc10-2ubuntu3/debian/hunspell-hu.links	2011-07-06 14:40:09.000000000 +0100
@@ -0,0 +1,2 @@
+/usr/share/hunspell/hu_HU.aff /usr/share/myspell/dicts/hu_HU.aff
+/usr/share/hunspell/hu_HU.dic /usr/share/myspell/dicts/hu_HU.dic
diff -pruN 1:3.3.0~rc10-2/debian/hunspell-ne.links 1:3.3.0~rc10-2ubuntu3/debian/hunspell-ne.links
--- 1:3.3.0~rc10-2/debian/hunspell-ne.links	1970-01-01 01:00:00.000000000 +0100
+++ 1:3.3.0~rc10-2ubuntu3/debian/hunspell-ne.links	2011-07-06 14:40:09.000000000 +0100
@@ -0,0 +1,2 @@
+/usr/share/hunspell/ne_NP.aff /usr/share/myspell/dicts/ne_NP.aff
+/usr/share/hunspell/ne_NP.dic /usr/share/myspell/dicts/ne_NP.dic
diff -pruN 1:3.3.0~rc10-2/debian/myspell-af.links 1:3.3.0~rc10-2ubuntu3/debian/myspell-af.links
--- 1:3.3.0~rc10-2/debian/myspell-af.links	1970-01-01 01:00:00.000000000 +0100
+++ 1:3.3.0~rc10-2ubuntu3/debian/myspell-af.links	2011-07-06 14:40:09.000000000 +0100
@@ -0,0 +1,2 @@
+/usr/share/hunspell/af_ZA.aff /usr/share/myspell/dicts/af_ZA.aff
+/usr/share/hunspell/af_ZA.dic /usr/share/myspell/dicts/af_ZA.dic
