diff -u ding-1.6/debian/control ding-1.6/debian/control
--- ding-1.6/debian/control
+++ ding-1.6/debian/control
@@ -3,14 +3,14 @@
 Priority: optional
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: Roland Rosenfeld <roland@debian.org>
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Build-Depends: debhelper (>= 5), dpatch
 Build-Depends-Indep: man-db, bsdmainutils, dictfmt (>= 1.10.1), dictzip
 Homepage: http://www-user.tu-chemnitz.de/~fri/ding/
 
 Package: ding
 Architecture: all
-Depends: tk8.4 | wish
+Depends: tk8.4 | wish, ${misc:Depends}
 Recommends: trans-de-en (>= 1.4) | translation-dictionary
 Conflicts: trans-de-en (<< 1.4)
 Suggests: agrep, ispell, ingerman, ibritish, dict
@@ -33,6 +33,7 @@
 
 Package: trans-de-en
 Architecture: all
+Depends: ${misc:Depends}
 Provides: translation-dictionary
 Suggests: ding
 Description: A German-English translation dictionary
@@ -46,6 +47,7 @@
 
 Package: dict-de-en
 Architecture: all
+Depends: ${misc:Depends}
 Suggests: dictd | serpento | dict-server, dict | opendict | kdict
 Conflicts: dictd (<< 1.10.1)
 Provides: dictd-dictionary
diff -u ding-1.6/debian/changelog ding-1.6/debian/changelog
--- ding-1.6/debian/changelog
+++ ding-1.6/debian/changelog
@@ -1,3 +1,21 @@
+ding (1.6-2ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable.  Remaining changes:
+    - debian/patches/09_dont_set_locale.dpatch: 
+       The explicit definition of LC_TYPE to de_DE.UTF8 causes
+       problems if the Linux installation uses another locale setting.
+
+ -- Roy Jamison <xteejyx@googlemail.com>  Tue, 15 Jun 2010 14:57:40 +0100
+
+ding (1.6-2) unstable; urgency=low
+
+  * 09_wronghash: Remove superfluous # from dictionary (Closes: #459351).
+  * 10_management: Fix typo in "Management" (Closes: #538050).
+  * Add ${misc:Depends} dependency to all packages.
+  * Upgrade to Standards-Version 3.8.4 (no changes).
+
+ -- Roland Rosenfeld <roland@debian.org>  Fri, 11 Jun 2010 16:35:30 +0200
+
 ding (1.6-1ubuntu1) lucid; urgency=low
 
   * Merge from Debian testing, remaining changes:
diff -u ding-1.6/debian/patches/00list ding-1.6/debian/patches/00list
--- ding-1.6/debian/patches/00list
+++ ding-1.6/debian/patches/00list
@@ -8,0 +9,3 @@
+09_wronghash
+10_management
+
only in patch2:
unchanged:
--- ding-1.6.orig/debian/patches/09_wronghash.dpatch
+++ ding-1.6/debian/patches/09_wronghash.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 09_wronghash.dpatch by Roland Rosenfeld <roland@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Remove superfluous # from dictionary (Closes: #459351)
+
+@DPATCH@
+diff -urNad ding~/de-en.txt ding/de-en.txt
+--- ding~/de-en.txt
++++ ding/de-en.txt
+@@ -30176,7 +30176,7 @@
+ Gerinnungsstoff {m} :: clotting substance
+ Gerippe {n} | Gerippe {pl} :: skeleton; scrag | skeletons; scrags
+ Gerippe {n} :: scrags
+-Gerippe {f} [ugs.]; dünner Mensch :: bag of bones#
++Gerippe {f} [ugs.]; dünner Mensch :: bag of bones
+ Geripplinie {f} | Geripplinien {pl} :: skeleton line | skeleton lines
+ Gerissenheit {f} :: quirkiness
+ Germane {m}; Teutone {m} | Germanen {pl}; Teutonen {pl} :: Germanic; Teuton | the Germanic people; Teutons
only in patch2:
unchanged:
--- ding-1.6.orig/debian/patches/10_management.dpatch
+++ ding-1.6/debian/patches/10_management.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_management.dpatch by Roland Rosenfeld <roland@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix typo in "Management" (Closes: #538050)
+
+@DPATCH@
+diff -urNad ding~/de-en.txt ding/de-en.txt
+--- ding~/de-en.txt
++++ ding/de-en.txt
+@@ -155509,7 +155509,7 @@
+ Arbeitsschutzbekleidung {f} [685.31+621.332] [techn.] :: protective work clothing
+ Arbeitsschutzsoftware [654.2+004] [comp.] [techn.] :: software for occupational safety
+ Arbeitssicherheitsleistungen {pl} [650.23] [econ.] :: work security services
+-Arbeitssicherheitsmanagment [650.20] [econ.] :: work safety management
++Arbeitssicherheitsmanagement [650.20] [econ.] :: work safety management
+ Arbeitsspindel [techn.] :: working-spindle
+ Arbeitsstationen {pl} [techn.] :: work Stations
+ Arbeitsstiftungen {pl} [techn.] :: work donations