diff -pruN 1.7-1/debian/changelog 1.7-1ubuntu1/debian/changelog
--- 1.7-1/debian/changelog	2011-06-13 23:25:48.000000000 +0100
+++ 1.7-1ubuntu1/debian/changelog	2011-06-13 23:18:45.000000000 +0100
@@ -1,3 +1,12 @@
+ding (1.7-1ubuntu1) oneiric; 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.
+
+ -- Fabrice Coutadeur <fabricesp@ubuntu.com>  Mon, 13 Jun 2011 20:25:40 +0200
+
 ding (1.7-1) unstable; urgency=low
 
   * New upstream version 1.7.
@@ -11,6 +20,15 @@ ding (1.7-1) unstable; urgency=low
 
  -- Roland Rosenfeld <roland@debian.org>  Wed, 02 Mar 2011 22:28:21 +0100
 
+ding (1.6-2ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable (LP: #594627).  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).
@@ -20,6 +38,16 @@ ding (1.6-2) unstable; urgency=low
 
  -- 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:
+    - The explicit definition of LC_TYPE to de_DE.UTF8 causes
+      problems if the Linux installation uses another locale
+      setting.
+  * Converted Ubuntu change to patch: 09_dont_set_locale.dpatch.
+
+ -- Ilya Barygin <barygin@gmail.com>  Fri, 08 Jan 2010 21:46:38 +0300
+
 ding (1.6-1) unstable; urgency=low
 
   * New upstream version 1.6.
@@ -33,6 +61,22 @@ ding (1.6-1) unstable; urgency=low
 
  -- Roland Rosenfeld <roland@debian.org>  Sun, 06 Dec 2009 14:54:01 +0100
 
+ding (1.5-3ubuntu2) intrepid; urgency=low
+
+  * Modify Maintainer value to match the DebianMaintainerField
+    specification. (LP: #230350)
+
+ -- Andrea Colangelo <warp10@ubuntu.com>  Wed, 21 May 2008 10:53:23 +0200
+
+ding (1.5-3ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes: (LP: #228859)
+   + The explicit definition of LC_TYPE to de_DE.UTF8 causes
+      problems if the Linux installation uses another locale
+      setting.
+
+ -- Emanuele Gentili <emgent@emanuele-gentili.com>  Sat, 10 May 2008 02:33:56 +0200
+
 ding (1.5-3) unstable; urgency=low
 
   * Upgrade to Standards-Version 3.7.3:
@@ -43,6 +87,16 @@ ding (1.5-3) unstable; urgency=low
 
  -- Roland Rosenfeld <roland@debian.org>  Sun, 23 Dec 2007 19:01:03 +0100
 
+ding (1.5-2ubuntu1) hardy; urgency=low
+
+  [ Oliver Sauder ]
+  
+  * The explicit definition of LC_TYPE to de_DE.UTF8 causes 
+    problems if the Linux installation uses another locale 
+    setting (LP: #174596).
+
+ -- Morten Kjeldgaard <mok@bioxray.au.dk>  Thu, 10 Apr 2008 15:26:00 +0200
+
 ding (1.5-2) unstable; urgency=low
 
   * dict-de-en now provides dictd-dictionary (see: #413575).
diff -pruN 1.7-1/debian/control 1.7-1ubuntu1/debian/control
--- 1.7-1/debian/control	2011-06-13 23:25:48.000000000 +0100
+++ 1.7-1ubuntu1/debian/control	2011-06-13 23:18:45.000000000 +0100
@@ -1,7 +1,8 @@
 Source: ding
 Section: text
 Priority: optional
-Maintainer: Roland Rosenfeld <roland@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Roland Rosenfeld <roland@debian.org>
 Standards-Version: 3.9.1
 Build-Depends: debhelper (>= 5), dpatch
 Build-Depends-Indep: man-db, bsdmainutils, dictfmt (>= 1.10.1), dictzip
diff -pruN 1.7-1/debian/patches/09_dont_set_locale.dpatch 1.7-1ubuntu1/debian/patches/09_dont_set_locale.dpatch
--- 1.7-1/debian/patches/09_dont_set_locale.dpatch	1970-01-01 01:00:00.000000000 +0100
+++ 1.7-1ubuntu1/debian/patches/09_dont_set_locale.dpatch	2011-06-13 23:18:45.000000000 +0100
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 09_dont_set_locale.dpatch by Ilya Barygin <barygin@gmail.com>
+##
+## Description: Don't set LC_CTYPE to de_DE.UTF-8. For people who use 
+##  different locales, this causes ding to not accept letter ä in input.
+## Bug-Ubuntu: https://launchpad.net/bugs/174596
+## Bug-Debian: http://bugs.debian.org/492458
+## Author: Oliver Sauder <os@esite.ch>
+
+@DPATCH@
+diff -urNad ding~/ding ding/ding
+--- ding~/ding	2010-01-08 21:23:16.000000000 +0300
++++ ding/ding	2010-01-08 21:24:21.000000000 +0300
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ # the next line restarts using wish \
+-LC_CTYPE=de_DE.UTF-8; export LC_CTYPE; exec wish "$0" "$@"
++exec wish "$0" "$@"
+ 
+ # This is "ding", 
+ #  * A dictionary lookup program,