diff -Nru mercurial-3.7.3/debian/changelog mercurial-3.7.3/debian/changelog
--- mercurial-3.7.3/debian/changelog	2016-03-30 07:20:11.000000000 +0000
+++ mercurial-3.7.3/debian/changelog	2016-04-06 12:53:39.000000000 +0000
@@ -1,3 +1,11 @@
+mercurial (3.7.3-1ubuntu1) xenial; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/patches/fix_tz_ftbfs.patch: fix test failure caused by
+      timezone parsing oddity with newer glibc.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 06 Apr 2016 14:53:10 +0200
+
 mercurial (3.7.3-1) unstable; urgency=medium
 
   * New security upstream release fixes CVE-2016-3068, CVE-2016-3069
@@ -35,6 +43,21 @@
 
  -- Javi Merino <vicho@debian.org>  Thu, 11 Feb 2016 22:43:27 +0000
 
+mercurial (3.6.2-1ubuntu2) xenial; urgency=medium
+
+  * debian/tests/mercurial-git: Redirect stderr of git clone and git push
+    to stdout, to fix failure.
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Thu, 17 Dec 2015 10:40:57 +0300
+
+mercurial (3.6.2-1ubuntu1) xenial; urgency=medium
+
+  * Merge with Debian unstable, remaining change:
+    - debian/patches/fix_tz_ftbfs.patch: fix test failure caused by
+      timezone parsing oddity with newer glibc.
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Wed, 16 Dec 2015 18:49:21 +0300
+
 mercurial (3.6.2-1) unstable; urgency=medium
 
   * New upstream release
@@ -53,6 +76,14 @@
 
  -- Javi Merino <vicho@debian.org>  Thu, 26 Nov 2015 08:30:18 +0000
 
+mercurial (3.6-1ubuntu1) xenial; urgency=medium
+
+  * Merge from Debian. Remaining changes:
+    - debian/patches/fix_tz_ftbfs.patch: fix test failure caused by
+      timezone parsing oddity with newer glibc.
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Fri, 20 Nov 2015 10:24:36 -0500
+
 mercurial (3.6-1) unstable; urgency=medium
 
   * New upstream release
@@ -123,6 +154,20 @@
 
  -- Javi Merino <vicho@debian.org>  Wed, 08 Jul 2015 22:31:18 +0100
 
+mercurial (3.4-1ubuntu2) wily; urgency=medium
+
+  * debian/rules: don't fail in override_dh_auto_test if there is nothing
+    to rename.
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Wed, 17 Jun 2015 16:32:06 -0400
+
+mercurial (3.4-1ubuntu1) wily; urgency=medium
+
+  * debian/patches/fix_tz_ftbfs.patch: fix test failure caused by timezone
+    parsing oddity with newer glibc.
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Wed, 17 Jun 2015 09:11:53 -0400
+
 mercurial (3.4-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru mercurial-3.7.3/debian/control mercurial-3.7.3/debian/control
--- mercurial-3.7.3/debian/control	2016-03-02 19:39:08.000000000 +0000
+++ mercurial-3.7.3/debian/control	2016-03-30 16:12:19.000000000 +0000
@@ -1,7 +1,8 @@
 Source: mercurial
 Section: vcs
 Priority: optional
-Maintainer: Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org>
 Uploaders: Vincent Danjean <vdanjean@debian.org>,
  Javi Merino <vicho@debian.org>,
  Tristan Seligmann <mithrandi@debian.org>
diff -Nru mercurial-3.7.3/debian/patches/fix_tz_ftbfs.patch mercurial-3.7.3/debian/patches/fix_tz_ftbfs.patch
--- mercurial-3.7.3/debian/patches/fix_tz_ftbfs.patch	1970-01-01 00:00:00.000000000 +0000
+++ mercurial-3.7.3/debian/patches/fix_tz_ftbfs.patch	2015-12-16 15:51:29.000000000 +0000
@@ -0,0 +1,16 @@
+Description: fix test failure caused by timezone parsing oddity with newer glibc
+Author: Marc Deslauriers <marc.deslauriers@canonical.com>
+
+Index: mercurial-3.4/tests/test-parse-date.t
+===================================================================
+--- mercurial-3.4.orig/tests/test-parse-date.t	2015-05-01 17:48:50.000000000 -0400
++++ mercurial-3.4/tests/test-parse-date.t	2015-06-17 09:11:38.987230619 -0400
+@@ -28,7 +28,7 @@
+ 
+ Check with local timezone other than GMT and with DST
+ 
+-  $ TZ="PST+8PDT"
++  $ TZ="PST8PDT"
+   $ export TZ
+ 
+ PST=UTC-8 / PDT=UTC-7
diff -Nru mercurial-3.7.3/debian/patches/series mercurial-3.7.3/debian/patches/series
--- mercurial-3.7.3/debian/patches/series	2015-10-04 11:50:25.000000000 +0000
+++ mercurial-3.7.3/debian/patches/series	2016-03-30 16:12:20.000000000 +0000
@@ -5,3 +5,4 @@
 deb_specific__disable_libdir_replacement.patch
 for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch
 deb_specific__fix_fhs_paths.patch
+fix_tz_ftbfs.patch