diff -u mc-4.6.1/debian/control mc-4.6.1/debian/control
--- mc-4.6.1/debian/control
+++ mc-4.6.1/debian/control
@@ -1,9 +1,10 @@
 Source: mc
 Section: utils
 Priority: optional
-Maintainer: Debian QA Group <packages@qa.debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian QA Group <packages@qa.debian.org>
 Build-Depends: debhelper (>> 4.0.0), libglib2.0-dev, libgpmg1-dev |not+linux-gnu, gettext, libslang2-dev
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
 
 Package: mc
 Architecture: any
diff -u mc-4.6.1/debian/rules mc-4.6.1/debian/rules
--- mc-4.6.1/debian/rules
+++ mc-4.6.1/debian/rules
@@ -330,8 +330,6 @@
 DEB_ALL_PACKAGES ?= $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)
 DEB_SOURCE_PACKAGE ?= $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
 
-export DH_COMPAT=4
-
 DEB_VERSION ?= $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
 
 DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
diff -u mc-4.6.1/debian/changelog mc-4.6.1/debian/changelog
--- mc-4.6.1/debian/changelog
+++ mc-4.6.1/debian/changelog
@@ -1,3 +1,14 @@
+mc (1:4.6.1-8ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable (LP: #175641). Remaining Ubuntu changes:
+    - debian/patches/61_bash3.2_compat.patch
+    - debian/patches/62_nl.po.patch:
+      Fixed dutch shortcut for "&Using shell patterns" (LP: #5462)
+  * debian/control: Standards-Version 3.7.3
+  * debian/rules: "export DH_COMPAT=4" => debian/compat
+
+ -- dAniel hAhler <ubuntu@thequod.de>  Tue, 11 Dec 2007 19:07:24 +0100
+
 mc (1:4.6.1-8) unstable; urgency=low
 
   * Orphaning package: Stefano has been nearly MIA during the last 3 years.
@@ -7,6 +18,20 @@
 
  -- Ludovic Drolez <ldrolez@debian.org>  Mon, 10 Dec 2007 19:50:47 +0100
 
+mc (1:4.6.1-7ubuntu2) gutsy; urgency=low
+
+  * Fixed dutch shortcut for "&Using shell patterns"
+    62_nl.po.patch (LP: #5462)
+
+ -- dAniel hAhler <ubuntu@thequod.de>  Wed, 22 Aug 2007 01:19:05 +0200
+
+mc (1:4.6.1-7ubuntu1) feisty; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/patches/: Add 61_bash3.2_compat.patch
+
+ -- Michael Bienia <geser@ubuntu.com>  Tue,  3 Apr 2007 14:56:33 +0200
+
 mc (1:4.6.1-7) unstable; urgency=medium
 
   * Fixed Anton Pak's recode patch which can cause a segfault. 
@@ -18,6 +43,14 @@
 
  -- Ludovic Drolez <ldrolez@debian.org>  Mon,  2 Apr 2007 8:44:35 +0200
 
+mc (1:4.6.1-6ubuntu1) feisty; urgency=low
+
+  * debian/patches/: Add 61_bash3.2_compat.patch from
+    http://bugs.gentoo.org/show_bug.cgi?id=153925 (Closes: LP #81621,
+    LP #85615).
+
+ -- Daniel T Chen <crimsun@ubuntu.com>  Sat, 17 Feb 2007 21:26:54 -0500
+
 mc (1:4.6.1-6) unstable; urgency=medium
 
   * debian/rules modified to fix a FTBFS during the 2nd build. Closes: #384302
only in patch2:
unchanged:
--- mc-4.6.1.orig/debian/compat
+++ mc-4.6.1/debian/compat
@@ -0,0 +1 @@
+4
only in patch2:
unchanged:
--- mc-4.6.1.orig/debian/patches/61_bash3.2_compat.patch
+++ mc-4.6.1/debian/patches/61_bash3.2_compat.patch
@@ -0,0 +1,33 @@
+--- /src/subshell.c.000	2006-05-08 23:11:48.000000000 +0200
++++ /src/subshell.c	2006-10-28 15:40:46.000000000 +0200
+@@ -745,29 +745,13 @@ subshell_name_quote (const char *s)
+     memcpy (d, cmd_start, len);
+     d += len;
+ 
+-    /*
+-     * Print every character in octal format with the leading backslash.
+-     * tcsh and zsh may require 4-digit octals, bash < 2.05b doesn't like them.
+-     */
+-    if (subshell_type == BASH) {
+ 	for (; *s; s++) {
+-	    /* Must quote numbers, so that they are not glued to octals */
+ 	    if (isalpha ((unsigned char) *s)) {
+ 		*d++ = (unsigned char) *s;
+ 	    } else {
+-		sprintf (d, "\\%03o", (unsigned char) *s);
+-		d += 4;
+-	    }
+-	}
+-    } else {
+-	for (; *s; s++) {
+-	    if (isalnum ((unsigned char) *s)) {
+-		*d++ = (unsigned char) *s;
+-	    } else {
+ 		sprintf (d, "\\0%03o", (unsigned char) *s);
+ 		d += 5;
+ 	    }
+-	}
+     }
+ 
+     memcpy (d, common_end, sizeof (common_end));
+
only in patch2:
unchanged:
--- mc-4.6.1.orig/debian/patches/62_nl.po.patch
+++ mc-4.6.1/debian/patches/62_nl.po.patch
@@ -0,0 +1,13 @@
+Nur in mc-4.6.1/debian/patches: 62_nl.po.patch.
+diff -ru mc-4.6.1.orig/po/nl.po mc-4.6.1/po/nl.po
+--- mc-4.6.1.orig/po/nl.po	2005-07-23 18:53:29.000000000 +0200
++++ mc-4.6.1/po/nl.po	2007-08-22 01:17:42.955087382 +0200
+@@ -2138,7 +2138,7 @@
+ 
+ #: src/filegui.c:738
+ msgid "&Using shell patterns"
+-msgstr "Shell &Patroon gebruiken"
++msgstr "Shell Patroon gebr&Uiken"
+ 
+ #: src/filegui.c:759
+ msgid "&Background"