diff -u igerman98-20091006/debian/changelog igerman98-20091006/debian/changelog
--- igerman98-20091006/debian/changelog
+++ igerman98-20091006/debian/changelog
@@ -1,3 +1,12 @@
+igerman98 (20091006-4.2ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable (LP: #697660), remaining changes:
+    - debian/control: make Conflicts on thunderbird versioned, so
+      hunspell-de-de can be used with our Thunderbird packages.
+      (Forwarded to Debian #507048)
+
+ -- Lorenzo De Liso <blackz@ubuntu.com>  Wed, 05 Jan 2011 11:35:32 +0100
+
 igerman98 (20091006-4.2) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -9,6 +18,15 @@
 
  -- Agustin Martin Domingo <agmartin@debian.org>  Mon, 20 Dec 2010 12:12:10 +0100
 
+igerman98 (20091006-4.1ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable.  Remaining changes:
+    - debian/control: make Conflicts on thunderbird versioned, so
+      hunspell-de-de can be used with our Thunderbird packages.
+      (Forwarded to Debian #507048)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Mon, 31 May 2010 11:30:20 +0200
+
 igerman98 (20091006-4.1) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -498,0 +517 @@
+
diff -u igerman98-20091006/debian/control igerman98-20091006/debian/control
--- igerman98-20091006/debian/control
+++ igerman98-20091006/debian/control
@@ -1,7 +1,8 @@
 Source: igerman98
 Section: text
 Priority: optional
-Maintainer: Roland Rosenfeld <roland@debian.org>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Roland Rosenfeld <roland@debian.org>
 Uploaders: Rene Engelhard <rene@debian.org>
 Standards-Version: 3.8.3
 Build-Depends-Indep: ispell (>= 3.1.20-12.1), hunspell, aspell (>= 0.60.5-2),
@@ -119,7 +120,7 @@
 Suggests: hunspell, openoffice.org-hunspell | openoffice.org-core (>= 2.0.2)
 Replaces: openoffice.org-spellcheck-de-at, myspell-de-at
 Provides: hunspell-dictionary, hunspell-dictionary-de, openoffice.org-spellcheck-de-at
-Conflicts: openoffice.org (<= 1.0.3-2), openoffice.org-spellcheck-de-at, myspell-de-at, 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), libxul0d (= 1.8.0.11-3)
+Conflicts: openoffice.org (<= 1.0.3-2), openoffice.org-spellcheck-de-at, myspell-de-at, 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), libxul0d (= 1.8.0.11-3)
 Description: Austrian (German) dictionary for hunspell
  This is the German (Austria) dictionary (de-AT-1996) for use with the
  hunspell spellchecker which is currently used within OpenOffice.org2
@@ -131,7 +132,7 @@
 Suggests: hunspell, openoffice.org-hunspell | openoffice.org-core (>= 2.0.2)
 Replaces: openoffice.org-spellcheck-de-ch, myspell-de-ch
 Provides: hunspell-dictionary, hunspell-dictionary-de, openoffice.org-spellcheck-de-ch
-Conflicts: openoffice.org (<= 1.0.3-2), openoffice.org-spellcheck-de-ch, myspell-de-ch, 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), libxul0d (= 1.8.0.11-3)
+Conflicts: openoffice.org (<= 1.0.3-2), openoffice.org-spellcheck-de-ch, myspell-de-ch, 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), libxul0d (= 1.8.0.11-3)
 Description: Swiss (German) dictionary for hunspell
  This is the German (Switzerland, Liechtenstein) dictionary (de-CH-1996)
  for use with the hunspell spellchecker which is currently used within
@@ -143,7 +144,7 @@
 Suggests: hunspell, openoffice.org-hunspell | openoffice.org-core (>= 2.0.2)
 Replaces: openoffice.org-spellcheck-de-de, myspell-de-de
 Provides: hunspell-dictionary, hunspell-dictionary-de, openoffice.org-spellcheck-de-de
-Conflicts: openoffice.org (<= 1.0.3-2), openoffice.org-spellcheck-de-de, myspell-de-de, 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), openoffice.org-spellcheck-de-de, myspell-de-de, 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: German dictionary for hunspell
  This is the German (Belgium, Germany, Luxemburg) dictionary (de-DE-1996)
  for use with the hunspell spellchecker which is currently used within