diff -pruN 1:3.16.1-1/debian/changelog 1:3.16.1-1ubuntu1/debian/changelog
--- 1:3.16.1-1/debian/changelog	2020-06-28 17:49:18.000000000 +0000
+++ 1:3.16.1-1ubuntu1/debian/changelog	2020-07-09 12:16:53.000000000 +0000
@@ -1,3 +1,27 @@
+valgrind (1:3.16.1-1ubuntu1) groovy; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Lower over-inflated valgrind-dbg Recommends to Suggests instead.
+    - Don't strip vgpreload* on ARM; this results in unusable stack traces
+      without valgrind-dbg.
+    - Configure with --enable-only64bit on AArch64.
+    - Enable parallel builds.
+    - debian/patches/armv7-illegal-opcode.patch: fix a crash due to an
+      unhandled thumb instruction on armhf.
+    - debian/rules: use dh_missing --fail-missing to we don't overlook not
+      install files
+
+  * Dropped changes, applied upstream or in Debian:
+    - Don't look for debug alt file in debug image if it is already found.
+    - Drop MPI 1 support to fix FTBFS with openmpi 4.0
+    - debian/patches/usrmerge_support.patch: make valgrind aware of usrmerge;
+    - Bug 416301 - s390x: Support "compare and signal" instructions.
+    - Prevent valgrind trying to use unrecognised z14/z15 instructions.
+    - debian/valgrind.install: include /usr/libexec/valgrind which ships
+      the dh_view tools.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Thu, 09 Jul 2020 13:16:53 +0100
+
 valgrind (1:3.16.1-1) unstable; urgency=medium
 
   * New upstream release
@@ -18,6 +42,80 @@ valgrind (1:3.16.1-1) unstable; urgency=
 
  -- Alessandro Ghedini <ghedo@debian.org>  Sun, 28 Jun 2020 18:49:18 +0100
 
+valgrind (1:3.15.0-1ubuntu9) focal; urgency=medium
+
+  * Prevent valgrind trying to use unrecognised z14/z15 instructions. LP:
+    #1866211
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Fri, 03 Apr 2020 11:34:19 +0100
+
+valgrind (1:3.15.0-1ubuntu8) focal; urgency=medium
+
+  * No-change rebuild for glibc 2.31.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 06 Mar 2020 14:39:58 +0100
+
+valgrind (1:3.15.0-1ubuntu7) focal; urgency=medium
+
+  * Cherry pick upstream commit Bug 416301 - s390x: Support
+    "compare and signal" instructions (LP: #1862183)
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Thu, 06 Feb 2020 15:49:24 +0100
+
+valgrind (1:3.15.0-1ubuntu6) focal; urgency=medium
+
+  * debian/valgrind.install:
+    - include /usr/libexec/valgrind which ships the dh_view tools
+      (lp: #1856067)
+  * debian/rules:
+    - use dh_missing --fail-missing to we don't overlook not install files
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Thu, 12 Dec 2019 16:18:01 +0100
+
+valgrind (1:3.15.0-1ubuntu5) focal; urgency=medium
+
+  * Drop MPI 1 support to fix FTBFS with openmpi 4.0
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Thu, 28 Nov 2019 19:35:25 +0100
+
+valgrind (1:3.15.0-1ubuntu4) focal; urgency=medium
+
+  * Don't look for debug alt file in debug image if it is already found
+    (LP: #1848211)
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Wed, 27 Nov 2019 13:52:54 +0100
+
+valgrind (1:3.15.0-1ubuntu3) eoan; urgency=medium
+
+  * No-change upload with strops.h and sys/strops.h removed in glibc.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 05 Sep 2019 11:14:57 +0000
+
+valgrind (1:3.15.0-1ubuntu2) eoan; urgency=medium
+
+  * debian/patches/armv7-illegal-opcode.patch: fix a crash due to an
+    unhandled thumb instruction on armhf.  Closes LP: #1837068.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 01 Aug 2019 08:22:37 -0700
+
+valgrind (1:3.15.0-1ubuntu1) eoan; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Lower over-inflated valgrind-dbg Recommends to Suggests instead.
+    - Don't strip vgpreload* on ARM; this results in unusable stack traces
+      without valgrind-dbg.
+    - Configure with --enable-only64bit on AArch64.
+    - Enable parallel builds.
+    - debian/patches/usrmerge_support.patch: make valgrind aware of usrmerge;
+      if we can't find the debug files under the full objpath (including /usr),
+      also try the alternative path by stripping out /usr.
+  * Dropped changes, which had been cherry-picked from upstream:
+    - Cherrypick s390x/z13 fixes from valgrind master (3.15)
+    - s390x Fix vector facility bit.
+    - ppc64el fix POWER 3.0 addex instruction.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 15 Jul 2019 22:09:50 -0700
+
 valgrind (1:3.15.0-1) unstable; urgency=medium
 
   * New upstream release
@@ -37,6 +135,23 @@ valgrind (1:3.15.0-1) unstable; urgency=
 
  -- Alessandro Ghedini <ghedo@debian.org>  Sun, 14 Jul 2019 11:23:29 +0100
 
+valgrind (1:3.14.0-3ubuntu1) eoan; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Lower over-inflated valgrind-dbg Recommends to Suggests instead.
+    - Don't strip vgpreload* on ARM; this results in unusable stack traces
+      without valgrind-dbg.
+    - Configure with --enable-only64bit on AArch64.
+    - Enable parallel builds.
+    - debian/patches/usrmerge_support.patch: make valgrind aware of usrmerge;
+      if we can't find the debug files under the full objpath (including /usr),
+      also try the alternative path by stripping out /usr.
+    - Cherrypick s390x/z13 fixes from valgrind master (3.15)
+    - s390x Fix vector facility bit.
+    - ppc64el fix POWER 3.0 addex instruction.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 22 Apr 2019 11:25:18 -0700
+
 valgrind (1:3.14.0-3) unstable; urgency=medium
 
   * Add suppressions for helgrind+drd false positives with glibc 2.28.
@@ -47,6 +162,49 @@ valgrind (1:3.14.0-3) unstable; urgency=
 
  -- Alessandro Ghedini <ghedo@debian.org>  Sat, 09 Feb 2019 19:14:13 +0000
 
+valgrind (1:3.14.0-2ubuntu6) disco; urgency=medium
+
+  * No-change rebuild against glibc 2.29 to update suppressions.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sun, 24 Feb 2019 05:52:20 +0000
+
+valgrind (1:3.14.0-2ubuntu5) disco; urgency=medium
+
+  * ppc64el fix POWER 3.0 addex instruction. LP: #1811071
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 28 Jan 2019 16:29:37 +0000
+
+valgrind (1:3.14.0-2ubuntu4) disco; urgency=medium
+
+  * s390x Fix vector facility bit.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 21 Jan 2019 17:13:06 +0000
+
+valgrind (1:3.14.0-2ubuntu3) disco; urgency=medium
+
+  * Cherrypick s390x/z13 fixes from valgrind master (3.15) LP: #1799696
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Wed, 16 Jan 2019 12:16:53 +0000
+
+valgrind (1:3.14.0-2ubuntu2) disco; urgency=medium
+
+  * debian/patches/usrmerge_support.patch: make valgrind aware of usrmerge;
+    if we can't find the debug files under the full objpath (including /usr),
+    also try the alternative path by stripping out /usr. (LP: #1808508)
+
+ -- Mathieu Trudel-Lapierre <cyphermox@ubuntu.com>  Thu, 10 Jan 2019 12:06:54 -0500
+
+valgrind (1:3.14.0-2ubuntu1) disco; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Lower over-inflated valgrind-dbg Recommends to Suggests instead.
+    - Don't strip vgpreload* on ARM; this results in unusable stack traces
+      without valgrind-dbg.
+    - Configure with --enable-only64bit on AArch64.
+    - Enable parallel builds.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 18 Dec 2018 05:03:28 +0100
+
 valgrind (1:3.14.0-2) unstable; urgency=medium
 
   * Fix path in dh_shlibdeps argument on non-x86 arches (Closes: #913822)
@@ -67,6 +225,14 @@ valgrind (1:3.14.0-1) unstable; urgency=
 
  -- Alessandro Ghedini <ghedo@debian.org>  Thu, 15 Nov 2018 00:21:43 +0000
 
+valgrind (1:3.14.0-0ubuntu3) disco; urgency=medium
+
+  * New upstream release.
+  * Remove patches applied upstream.
+  * Bump debhelper to compat level 9.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 05 Nov 2018 08:25:13 +0100
+
 valgrind (1:3.13.0-2.1) unstable; urgency=high
 
   * Non-maintainer upload.
@@ -75,6 +241,49 @@ valgrind (1:3.13.0-2.1) unstable; urgenc
 
  -- Ansgar Burchardt <ansgar@debian.org>  Wed, 18 Jul 2018 23:21:57 +0200
 
+valgrind (1:3.13.0-2ubuntu6) cosmic; urgency=medium
+
+  * No-change rebuild against glibc 2.28 to update suppressions.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 27 Aug 2018 13:14:33 -0700
+
+valgrind (1:3.13.0-2ubuntu5) cosmic; urgency=medium
+
+  * Backport fix for ld -z separate-code.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 17 Jul 2018 15:36:54 +0200
+
+valgrind (1:3.13.0-2ubuntu4) cosmic; urgency=medium
+
+  * Apply post 3.13 PPC64 related patches. LP: #1781128.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 12 Jul 2018 09:40:44 +0200
+
+valgrind (1:3.13.0-2ubuntu3) cosmic; urgency=medium
+
+  * No-change rebuild for dune openmpi soname change.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 13 May 2018 17:05:08 +0000
+
+valgrind (1:3.13.0-2ubuntu2) bionic; urgency=medium
+
+  * No-change rebuild against glibc 2.27 to update suppressions.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 27 Feb 2018 22:52:04 -0800
+
+valgrind (1:3.13.0-2ubuntu1) bionic; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Lower over-inflated valgrind-dbg Recommends to Suggests instead.
+    - Don't strip vgpreload* on ARM; this results in unusable stack traces
+      without valgrind-dbg.
+    - Configure with --enable-only64bit on AArch64.
+  * Dropped patches applied in Debian:
+    - Fix typo, syscall param epoll_pwait(sigmask) points to unaddressable
+      byte(s). LP 1726711.
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Wed, 24 Jan 2018 20:55:02 +0100
+
 valgrind (1:3.13.0-2) unstable; urgency=medium
 
   * Fix handling command line option --xml-socket (Closes: #870419)
@@ -89,6 +298,31 @@ valgrind (1:3.13.0-2) unstable; urgency=
 
  -- Alessandro Ghedini <ghedo@debian.org>  Tue, 23 Jan 2018 23:09:13 +0000
 
+valgrind (1:3.13.0-1ubuntu3) artful-proposed; urgency=medium
+
+  * SRU: Fix typo, syscall param epoll_pwait(sigmask) points to unaddressable
+    byte(s). LP: #1726711.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 24 Oct 2017 11:56:21 +0200
+
+valgrind (1:3.13.0-1ubuntu2) artful; urgency=medium
+
+  * No-change rebuild against glibc 2.26 to update suppressions.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 11 Sep 2017 16:42:57 -0700
+
+valgrind (1:3.13.0-1ubuntu1) artful; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - Lower over-inflated valgrind-dbg Recommends to Suggests instead.
+    - Don't strip vgpreload* on ARM; this results in unusable stack traces
+      without valgrind-dbg.
+    - Configure with --enable-only64bit on AArch64.
+  * Dropped patches included in new version:
+    - debian/patches/CVE-2016-4491.patch
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Wed, 23 Aug 2017 11:16:48 -0400
+
 valgrind (1:3.13.0-1) unstable; urgency=medium
 
   * New upstream release
@@ -101,6 +335,25 @@ valgrind (1:3.13.0-1) unstable; urgency=
 
  -- Alessandro Ghedini <ghedo@debian.org>  Mon, 24 Jul 2017 00:41:05 +0100
 
+valgrind (1:3.12.0-1.1ubuntu2) artful; urgency=medium
+
+  * SECURITY UPDATE: denial of service via infinite recursion
+    - debian/patches/CVE-2016-4491.patch: limit recursion in
+      coregrind/m_demangle/cp-demangle.c, coregrind/m_demangle/demangle.h.
+    - CVE-2016-4491
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Wed, 21 Jun 2017 13:43:20 -0400
+
+valgrind (1:3.12.0-1.1ubuntu1) artful; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Lower over-inflated valgrind-dbg Recommends to Suggests instead.
+    - Don't strip vgpreload* on ARM; this results in unusable stack traces
+      without valgrind-dbg.
+    - Configure with --enable-only64bit on AArch64.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 27 Apr 2017 22:41:55 -0700
+
 valgrind (1:3.12.0-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -109,6 +362,18 @@ valgrind (1:3.12.0-1.1) unstable; urgenc
 
  -- Adrian Bunk <bunk@debian.org>  Thu, 02 Feb 2017 22:27:56 +0200
 
+valgrind (1:3.12.0-1ubuntu1) zesty; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Lower over-inflated valgrind-dbg Recommends to Suggests instead.
+    - Don't strip vgpreload* on ARM; this results in unusable stack traces
+      without valgrind-dbg.
+    - Configure with --enable-only64bit on AArch64.
+  * Dropped changes, included upstream:
+    - Cherry-pick upstream patch to fix assertions on arm.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sun, 13 Nov 2016 10:09:58 -0800
+
 valgrind (1:3.12.0-1) unstable; urgency=medium
 
   * New upstream release
@@ -118,6 +383,31 @@ valgrind (1:3.12.0-1) unstable; urgency=
 
  -- Alessandro Ghedini <ghedo@debian.org>  Thu, 03 Nov 2016 01:53:11 +0000
 
+valgrind (1:3.12.0~svn20160714-1ubuntu3) zesty; urgency=medium
+
+  * No-change rebuild against libopenmpi2
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sat, 22 Oct 2016 01:59:45 +0000
+
+valgrind (1:3.12.0~svn20160714-1ubuntu2) yakkety; urgency=medium
+
+  * Cherry-pick upstream patch to fix assertions on arm. LP: #1612429
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Thu, 11 Aug 2016 23:18:04 +0100
+
+valgrind (1:3.12.0~svn20160714-1ubuntu1) yakkety; urgency=medium
+
+  * Merge with Debian (LP: #1567219) remaining changes:
+    - Lower over-inflated valgrind-dbg Recommends to Suggests instead.
+    - Don't strip vgpreload* on ARM; this results in unusable stack traces
+      without valgrind-dbg.
+    - Configure with --enable-only64bit on AArch64.
+
+  * Reintroduce universe/valgrind-mpi package, as archive reorg is done.
+  * Drop s390x patches, applied upstream.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Thu, 11 Aug 2016 14:10:25 +0100
+
 valgrind (1:3.12.0~svn20160714-1) unstable; urgency=medium
 
   * New upstream snapshot release
@@ -132,6 +422,51 @@ valgrind (1:3.12.0~svn20160714-1) unstab
 
  -- Alessandro Ghedini <ghedo@debian.org>  Fri, 15 Jul 2016 00:15:43 +0100
 
+valgrind (1:3.11.0-1ubuntu5) yakkety; urgency=medium
+
+  * No change rebuild to fix miscompilation on s390x. LP: #1572613
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Tue, 26 Apr 2016 13:14:26 +0100
+
+valgrind (1:3.11.0-1ubuntu4) xenial; urgency=medium
+
+  * Add additional fix required for popcnt support. LP: #1569391.
+
+ -- dann frazier <dannf@ubuntu.com>  Tue, 12 Apr 2016 10:40:46 -0500
+
+valgrind (1:3.11.0-1ubuntu3) xenial; urgency=medium
+
+  * Fixes for s390x, LP: #1563420:
+    - 15_s390x-HWCAP-mask.patch: Suppress advertising features
+      in HWCAP that are unsupported by valgrind.
+    - 16_s390x_popcnt-insn.patch: Add support for popcnt instruction.
+    - 17_s390x-splitout-socketcalls.patch: Support individual socket
+      syscalls, which were split out from socketcall in Linux 4.3.
+  * 18_s390x-support-RISBGN-insn.patch: Fix issue with binaries
+    compiled for zEC12 or higher, such as Ubuntu's dynamic loader.
+    LP: #1556765.
+  * Add smoke test for autopkgtest.
+
+ -- dann frazier <dannf@ubuntu.com>  Fri, 01 Apr 2016 19:16:07 +0000
+
+valgrind (1:3.11.0-1ubuntu2) xenial; urgency=medium
+
+  * Rebuild for glibc-2.23. LP: #1435261.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 22 Mar 2016 16:06:17 +0100
+
+valgrind (1:3.11.0-1ubuntu1) wily; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Remove valgrind-mpi package from Ubuntu and any references to it, as
+      mpi-default-dev is in universe for the time being.
+    - Lower over-inflated valgrind-dbg Recommends to Suggests instead.
+    - Don't strip vgpreload* on ARM; this results in unusable stack traces
+      without valgrind-dbg.
+    - Configure with --enable-only64bit on AArch64.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 30 Sep 2015 13:06:33 +0200
+
 valgrind (1:3.11.0-1) unstable; urgency=medium
 
   * New upstream release (Closes: #800013)
@@ -172,6 +507,33 @@ valgrind (1:3.10.1-2) unstable; urgency=
 
  -- Alessandro Ghedini <ghedo@debian.org>  Sat, 25 Apr 2015 13:10:13 +0200
 
+valgrind (1:3.10.1-1ubuntu3) wily; urgency=medium
+
+  * Build with GCC fixing PR target/65456. LP: #1434222.
+  * Fix DCACHEBSIZE and HWCAP2 issues. LP: #1428002.
+  * Fix bash command completion to respect end of options argument (--).
+    LP: #840467.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 15 Jul 2015 09:48:13 +0200
+
+valgrind (1:3.10.1-1ubuntu2) vivid; urgency=medium
+
+  * Build for glibc-2.21. LP: #1435261.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 26 Mar 2015 22:10:58 +0100
+
+valgrind (1:3.10.1-1ubuntu1) vivid; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Remove valgrind-mpi package from Ubuntu and any references to it, as
+      mpi-default-dev is in universe for the time being.
+    - Lower over-inflated valgrind-dbg Recommends to Suggests instead.
+    - Don't strip vgpreload* on ARM; this results in unusable stack traces
+      without valgrind-dbg.
+    - Configure with --enable-only64bit on AArch64.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 26 Feb 2015 09:25:34 +0100
+
 valgrind (1:3.10.1-1) unstable; urgency=medium
 
   * New upstream release
@@ -216,6 +578,31 @@ valgrind (1:3.10.0-1) unstable; urgency=
 
  -- Alessandro Ghedini <ghedo@debian.org>  Sun, 21 Sep 2014 12:04:17 +0200
 
+valgrind (1:3.10.0-0ubuntu1) utopic; urgency=medium
+
+  * Upstream release 3.10.0.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 12 Sep 2014 14:53:34 +0200
+
+valgrind (1:3.10.0~BETA2-0ubuntu1) utopic; urgency=medium
+
+  * Upstream release 3.10.0 BETA2. LP: #1355530.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 09 Sep 2014 03:25:01 +0200
+
+valgrind (1:3.10~20140411-0ubuntu1) trusty; urgency=medium
+
+  * Upstream snapshot from 20140411. LP: #1300070.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 11 Apr 2014 13:07:13 +0200
+
+valgrind (1:3.10~20140329-0ubuntu1) trusty; urgency=medium
+
+  * Upstream snapshot from 20140329.
+  * Build for AArch64.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 29 Mar 2014 12:02:06 +0100
+
 valgrind (1:3.9.0-7) unstable; urgency=medium
 
   * Remove index() Debian-specific suppressions (not needed anymore)
@@ -242,6 +629,30 @@ valgrind (1:3.9.0-5) unstable; urgency=m
 
  -- Alessandro Ghedini <ghedo@debian.org>  Sun, 23 Feb 2014 20:04:38 +0100
 
+valgrind (1:3.9.0-4ubuntu4) trusty; urgency=medium
+
+  * Build using dh-autoreconf.
+  * Build for ppc64el.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 28 Mar 2014 20:29:02 +0100
+
+valgrind (1:3.9.0-4ubuntu3) trusty; urgency=medium
+
+  * Add support for glibc-2.19.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 25 Feb 2014 16:56:18 +0100
+
+valgrind (1:3.9.0-4ubuntu1) trusty; urgency=low
+
+  * Merge with Debian; remaining changes:
+    - Remove valgrind-mpi package from Ubuntu and any references to it, as
+      mpi-default-dev is in universe for the time being.
+    - Lower over-inflated valgrind-dbg Recommends to Suggests instead.
+    - Don't strip vgpreload* on ARM; this results in unusable stack traces
+      without valgrind-dbg.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 08 Jan 2014 08:21:30 +0100
+
 valgrind (1:3.9.0-4) unstable; urgency=medium
 
   * Add Breaks+Replaces: valgrind-dev on valgrind
@@ -292,6 +703,28 @@ valgrind (1:3.8.1-6) unstable; urgency=l
 
  -- Alessandro Ghedini <ghedo@debian.org>  Thu, 31 Oct 2013 11:34:53 +0100
 
+valgrind (1:3.8.1-5ubuntu2) trusty; urgency=medium
+
+  * Build for glibc-2.18.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 24 Dec 2013 09:47:10 +0100
+
+valgrind (1:3.8.1-5ubuntu1) trusty; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Allow specification of an extra directory in which to look for
+      debuginfo objects.
+    - Remove valgrind-mpi package from Ubuntu and any references to it, as
+      mpi-default-dev is in universe for the time being.
+    - Lower over-inflated valgrind-dbg Recommends to Suggests instead.
+    - Don't strip vgpreload* on ARM; this results in unusable stack traces
+      without valgrind-dbg.
+    - Apply patch from https://bugs.kde.org/show_bug.cgi?id=308717,
+      implementing fixed-point VCVT.F64.[SU]32 on ARM.  This instruction
+      shows up quite frequently in desktop components.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 28 Oct 2013 13:42:46 -0700
+
 valgrind (1:3.8.1-5) unstable; urgency=low
 
   * Enable build on x32 architecture (Closes: #718368)
@@ -299,6 +732,22 @@ valgrind (1:3.8.1-5) unstable; urgency=l
 
  -- Alessandro Ghedini <ghedo@debian.org>  Tue, 24 Sep 2013 13:01:22 +0200
 
+valgrind (1:3.8.1-4ubuntu1) saucy; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Allow specification of an extra directory in which to look for
+      debuginfo objects.
+    - Remove valgrind-mpi package from Ubuntu and any references to it, as
+      mpi-default-dev is in universe for the time being.
+    - Lower over-inflated valgrind-dbg Recommends to Suggests instead.
+    - Don't strip vgpreload* on ARM; this results in unusable stack traces
+      without valgrind-dbg.
+    - Apply patch from https://bugs.kde.org/show_bug.cgi?id=308717,
+      implementing fixed-point VCVT.F64.[SU]32 on ARM.  This instruction
+      shows up quite frequently in desktop components.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Sun, 02 Jun 2013 21:03:30 +0100
+
 valgrind (1:3.8.1-4) unstable; urgency=low
 
   * Build with -mips2 on mipsel.
@@ -307,6 +756,25 @@ valgrind (1:3.8.1-4) unstable; urgency=l
 
  -- Alessandro Ghedini <ghedo@debian.org>  Sat, 01 Jun 2013 15:51:47 +0200
 
+valgrind (1:3.8.1-3ubuntu1) saucy; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Allow specification of an extra directory in which to look for
+      debuginfo objects.
+    - Remove valgrind-mpi package from Ubuntu and any references to it, as
+      mpi-default-dev is in universe for the time being.
+    - Lower over-inflated valgrind-dbg Recommends to Suggests instead.
+    - Don't strip vgpreload* on ARM; this results in unusable stack traces
+      without valgrind-dbg.
+    - Apply patch from https://bugs.kde.org/show_bug.cgi?id=308717,
+      implementing fixed-point VCVT.F64.[SU]32 on ARM.  This instruction
+      shows up quite frequently in desktop components.
+  * Drop remaining ppc64 patches; we no longer care about this in Ubuntu,
+    and valgrind seems to build fine on Debian ppc64.
+  * Renumber Ubuntu patches to make future merges easier.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 30 May 2013 11:09:43 +0100
+
 valgrind (1:3.8.1-3) unstable; urgency=low
 
   * Add 11_glibc-2.17.patch to fix FTBFS with glibc 2.17 (Closes: #707438)
@@ -333,6 +801,55 @@ valgrind (1:3.8.1-2) unstable; urgency=l
 
  -- Alessandro Ghedini <ghedo@debian.org>  Wed, 20 Feb 2013 11:21:07 +0100
 
+valgrind (1:3.8.1-1ubuntu5) raring; urgency=low
+
+  * Apply patch from https://bugs.kde.org/show_bug.cgi?id=308717,
+    implementing fixed-point VCVT.F64.[SU]32 on ARM.  This instruction shows
+    up quite frequently in desktop components.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 29 Jan 2013 15:41:11 +0000
+
+valgrind (1:3.8.1-1ubuntu4) raring; urgency=low
+
+  * Backport from upstream:
+    - Accept glibc 2.17 as valid.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 29 Jan 2013 13:36:30 +0000
+
+valgrind (1:3.8.1-1ubuntu3) raring; urgency=low
+
+  * Don't strip vgpreload* on ARM; this results in unusable stack traces.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 29 Jan 2013 11:37:18 +0000
+
+valgrind (1:3.8.1-1ubuntu2) raring; urgency=low
+
+  * Drop the dh-autoreconf delta, we no longer need this for Ubuntu.
+  * Lower over-inflated valgrind-dbg Recommends to Suggests instead.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Sun, 16 Dec 2012 07:53:19 -0700
+
+valgrind (1:3.8.1-1ubuntu1) raring; urgency=low
+
+  [ Alex Chiang ]
+  * Merge from Debian unstable.
+    - Drop all Ubuntu patches, as they have been applied upstream or are
+      carried in Debian with similar names.
+    - Drop documentation on creating snapshots in debian/copyright, doesn't
+      seem necessary anymore.
+    Remaining changes:
+    - Use dh-autoreconf instead of autotools-dev.
+    - Add ppc64 support:
+      . Build-dep on gcc-multilib and libc6-dev-powerpc on ppc64
+  * 10_extra-debuginfo-path.patch: allows specification of an extra directory
+    in which to look for debuginfo objects.
+
+  [ Adam Conrad ]
+  * Remove valgrind-mpi package from Ubuntu and any references to it, as
+    mpi-default-dev is in universe for the time being (Reverts: #565139)
+
+ -- Alex Chiang <achiang@canonical.com>  Tue, 11 Dec 2012 22:56:07 -0800
+
 valgrind (1:3.8.1-1) unstable; urgency=low
 
   * New upstream release
@@ -444,6 +961,42 @@ valgrind (1:3.7.0-1) unstable; urgency=l
 
  -- Pierre Habouzit <madcoder@debian.org>  Wed, 21 Dec 2011 16:28:29 +0100
 
+valgrind (1:3.7.0-0ubuntu4) quantal; urgency=low
+
+  * fix-buffer-overflows.patch: fix overflows in vgdb
+  * 05_fix-callgrind_control.patch: fix valgrind process name (LP: #1036283)
+  * fix-VEX-PCMPxSTRx.patch: fix strstr handling (LP: #1027977)
+
+ -- Julian Taylor <jtaylor@ubuntu.com>  Fri, 05 Oct 2012 20:16:28 +0200
+
+valgrind (1:3.7.0-0ubuntu3) precise; urgency=low
+
+  * Add uinput ioctl wrappers to fix false positive errors. (LP: #958095)
+    - Add 0011-uinput-ioctls.patch.
+
+ -- Chase Douglas <chase.douglas@ubuntu.com>  Sat, 17 Mar 2012 12:29:21 -0700
+
+valgrind (1:3.7.0-0ubuntu2) precise; urgency=low
+
+  * Allow glibc 2.15 in the configure checks. (LP: #934127)
+    - Add 0009-glibc-215.patch, cherry-picked from upstream.
+    - Add 0010-automake-1.11.2.patch by Gregorio Guidi.
+    - Use dh-autoreconf instead of autotools-dev.
+
+ -- Felix Geyer <debfx@ubuntu.com>  Fri, 17 Feb 2012 15:06:23 +0200
+
+valgrind (1:3.7.0-0ubuntu1) precise; urgency=low
+
+  * New upstream release
+  * Drop patches that are applied upstream or no longer relevant:
+        0003-prevent-gcc-4.6-warnings-with-valgrind.h.patch
+        0005-catch-manpages-errors.patch
+        0007-implement-extra-dwarf-ops-gcc-461.patch
+        0008-configure-support-linux-3.patch
+  * debian/rules: No longer pass -marm, it now builds in Thumb mode on ARM.
+
+ -- Jani Monoses <jani@ubuntu.com>  Fri, 06 Jan 2012 19:01:30 +0200
+
 valgrind (1:3.6.99svn12003-1) experimental; urgency=low
 
   * Package a pre 3.7.0 snapshot (up to r12003 on 20110828).
@@ -469,6 +1022,34 @@ valgrind (1:3.6.99svn11761-1) experiment
 
  -- Pierre Habouzit <madcoder@debian.org>  Tue, 17 May 2011 08:47:28 +0200
 
+valgrind (1:3.6.1-6ubuntu2) precise; urgency=low
+
+  * No-change rebuild to drop spurious libsfgcc1 dependency on armhf.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Fri, 02 Dec 2011 17:29:15 -0700
+
+valgrind (1:3.6.1-6ubuntu1) precise; urgency=low
+
+  * Drop lpia support.
+  * Drop 60_thumb-sigill-fixes dpatch; we're building in ARM mode and Thumb
+    support was implemented upstream differently.
+  * Merge with Debian testing/unstable:
+    - Drop all Ubuntu dpatches, added in Debian as regular patches.
+    - Use DEB_HOST_ARCH_CPU instead of DEB_HOST_GNU_CPU to check the host CPU
+      for consistency with armv7 checks in rules.
+    - Drop noopt rules snippet; should be fixed with new dh-based rules.
+    Remaining changes:
+    - Add ppc64 support:
+      . Build-dep on gcc-multilib and libc6-dev-powerpc on ppc64
+      . Add ppc64 to valgrind's Architecture list.
+    - Update documentation on creating snapshots in debian/copyright and add
+      debian/valgrind-docs-build.diff to help creating these (works around an
+      issue with building the docs during make dist).
+    - Pass -marm in CFLAGS when DEB_HOST_GNU_CPU is arm, but add note that
+      this is fixed upstream and point at KDE #247978.
+
+ -- Loïc Minier <loic.minier@ubuntu.com>  Mon, 17 Oct 2011 14:41:02 +0200
+
 valgrind (1:3.6.1-6) unstable; urgency=low
 
   * Upload with maintainer's consent.
@@ -547,6 +1128,138 @@ valgrind (1:3.6.1-1) unstable; urgency=l
 
  -- Pierre Habouzit <madcoder@debian.org>  Mon, 09 May 2011 22:55:27 +0200
 
+valgrind (1:3.6.1-0ubuntu3) oneiric; urgency=low
+
+  * New dpatch, 71_linux-3-support, fixes FTBFS on 3.x kernels (as checked
+    with `uname -r` during build, so doesn't yet affect Ubuntu buildds); from
+    SVN r11796 and r11797; LP: #868004.  Refresh autoconf patch.
+  * Rename files and update series to use *.dpatch consistently.
+
+ -- Loïc Minier <loic.minier@ubuntu.com>  Wed, 05 Oct 2011 12:09:53 +0200
+
+valgrind (1:3.6.1-0ubuntu2) oneiric; urgency=low
+
+  * New dpatch 70_gcc-4.6.1-dwarf-ops_svn-r11856, cherry-picked from SVN
+    r11856; adds support for some DWARF ops that GCC 4.6.1 seems to use
+    (KDE #275284).
+  * Sort patches by patch number in 00list.
+
+ -- Loïc Minier <loic.minier@linaro.org>  Tue, 05 Jul 2011 12:07:20 +0200
+
+valgrind (1:3.6.1-0ubuntu1) natty; urgency=low
+
+  * New upstream release
+    - support for glibc 2.13, fixes FTBFS on all archs.
+  * debian/patches/70_thumb2_fix.dpatch: Drop, included upstream.
+  * debian/patches/02_version.dpatch: 
+  * debian/patches/99_autoreconf.dpatch: Update.
+
+ -- Jani Monoses <jani@ubuntu.com>  Sun, 27 Feb 2011 20:24:35 +0200
+
+valgrind (1:3.6.0-0ubuntu3) natty; urgency=low
+
+  * Build on ppc64.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 21 Feb 2011 19:49:23 +0000
+
+valgrind (1:3.6.0-0ubuntu2) natty; urgency=low
+
+  * debian/patches/70_thumb2_fix.dpatch: Fix unhandled instruction
+    case which prevents running valgrind on Thumb2 armel binaries
+    linked to system libraries.
+
+ -- Jani Monoses <jani@ubuntu.com>  Sat, 22 Jan 2011 00:23:11 +0200
+
+valgrind (1:3.6.0-0ubuntu1) natty; urgency=low
+
+  * New upstream release
+    * Refresh 02_version.dpatch, 99_autoreconf.dpatch.
+    * Drop 91_build_with_fno_stack_protector.dpatch, integrated upstream.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 07 Dec 2010 19:32:50 +0000
+
+valgrind (1:3.6.0~svn20100724-0ubuntu2) maverick; urgency=low
+
+  * Remove BUILD_ALL_DOCS=no snippet from rules; this isn't needed anymore as
+    texlive-base got fixed.
+  * Pass CFLAGS to configure, and also to make due to KDE #247980 -- the make
+    part really needs to be reverted as it requires duplicating the upstream
+    flags right now.
+  * Honor noopt in DEB_BUILD_OPTIONS by passing -O0 in CFLAGS when noopt is
+    present.
+  * Pass -marm in CFLAGS when DEB_HOST_GNU_CPU is arm; works around new FTBFS
+    on armel.
+
+ -- Loïc Minier <loic.minier@ubuntu.com>  Sun, 15 Aug 2010 19:55:28 +0200
+
+valgrind (1:3.6.0~svn20100724-0ubuntu1) maverick; urgency=low
+
+  * New upstream snapshot.
+    - Supports GLIB 2.12; LP: #602132.
+    - Drop dpatch 01_pcm-ioctl; fixed upstream slighlty differently; see
+      KDE #227325.
+    - Drop dpatch 01_more-vg-n-threads; merged upstream.
+    - Drop dpatch 80_splice_backport; merged upstream.
+    - Update dpatch 99-autoreconf.
+    - Update documentation on creating snapshots in debian/copyright and add
+      debian/valgrind-docs-build.diff to help creating these (works around an
+      issue with building the docs during make dist).
+
+ -- Loïc Minier <lool@dooz.org>  Sun, 15 Aug 2010 10:54:00 +0200
+
+valgrind (1:3.6.0~svn20100212-0ubuntu5) lucid; urgency=low
+
+  * No-change rebuild to get the package picked up for building on armel.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 27 Apr 2010 16:04:59 +0100
+
+valgrind (1:3.6.0~svn20100212-0ubuntu4) lucid; urgency=low
+
+  * New dpatch, 60_thumb-sigill-fixes, from upstream KDE #231108, fixes
+    SIGILLs on startup when build in Thumb mode.  This allows valgrind-ing
+    simple ARM-mode binaries, but supporting Thumb-mode binaries requires much
+    larger changes; LP: #537458.
+
+ -- Loïc Minier <loic.minier@ubuntu.com>  Fri, 26 Mar 2010 14:47:17 +0100
+
+valgrind (1:3.6.0~svn20100212-0ubuntu3) lucid; urgency=low
+
+  * New dpatch, 80_splice_backport, backport of splice() support from r11055;
+    LP: #537688.
+
+ -- Loïc Minier <loic.minier@ubuntu.com>  Sat, 13 Mar 2010 10:36:14 +0100
+
+valgrind (1:3.6.0~svn20100212-0ubuntu2) lucid; urgency=low
+
+  * Fix typo in 02_version dpatch: default.supp instead of debian.supp.
+  * Only distclean if there's a Makefile.
+  * Clean debian.supp.
+  * Fix dependencies in rules to be -j safe and to patch before configure;
+    also, use $(DPATCH_STAMPFN) dep instead of patch as the latter is PHONY
+  * Forwarded manpage update proposal upstream in KDE #226609 and disabled
+    patch 01_manpage since it fails to unapply due to upstream removing the
+    manpage in distclean.
+  * Configure with --disable-maintainer-mode.
+  * Bump debhelper build-dep to >= 5.
+
+ -- Loïc Minier <loic.minier@ubuntu.com>  Fri, 12 Feb 2010 22:34:11 +0100
+
+valgrind (1:3.6.0~svn20100212-0ubuntu1) lucid; urgency=low
+
+  * New upstream SVN snapshot from r11040 (and VEX r1959).
+    - Document in copyright that this snapshot tarball was created with "make
+      BUILD_ALL_DOCS=no dist" in svn://svn.valgrind.org/valgrind/trunk while
+      Debian #566591 affects the PDF build.
+    - Also add BUILD_ALL_DOCS=no to rules for the same reason.
+    - Update patch 02_version to apply to configure.in instead of configure
+      and to only patch the version, bug contact, and DEFAULT_SUPP.
+    - Drop patch 92_glibc-2.11-support, in upstream tarball.
+    - Update patch 99_autoreconf.
+    - Add armel to binary package architecture, lots of recent upstream
+      development toward an ARM port recently!  :-)
+
+ -- Loïc Minier <loic.minier@ubuntu.com>  Fri, 12 Feb 2010 18:34:15 +0100
+
 valgrind (1:3.6.0~svn11254+nmu1) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -607,6 +1320,24 @@ valgrind (1:3.5.0+3.6.0svn20100608-1) ex
 
  -- Andrés Roldán <aroldan@debian.org>  Tue, 08 Jun 2010 17:25:27 +0000
 
+valgrind (1:3.5.0-3ubuntu2) lucid; urgency=low
+
+  * New patches, 92_glibc-2.11-support, cherry-picked from upstream r10941;
+    adds glibc 2.11 support, and 99_autoreconf.
+
+ -- Loïc Minier <loic.minier@ubuntu.com>  Fri, 12 Feb 2010 12:44:53 +0100
+
+valgrind (1:3.5.0-3ubuntu1) lucid; urgency=low
+
+  * Merge from Debian testing.  Remaining changes:
+    - Refresh 91_build_with_fno_stack_protector.dpatch.
+    - Add lpia to Architecture.
+    - Drop completely bogus or'ed build-dep on gcc-4.3 on amd64
+  * Dropped changes, superseded in Debian:
+    - Move libc6-dbg to Recommends
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sat, 05 Dec 2009 01:06:45 +0000
+
 valgrind (1:3.5.0-3) unstable; urgency=low
 
   * Rebuilt againts libc6 2.10.1.
@@ -617,6 +1348,23 @@ valgrind (1:3.5.0-3) unstable; urgency=l
 
  -- Andrés Roldán <aroldan@debian.org>  Tue, 17 Nov 2009 15:12:26 +0000
 
+valgrind (1:3.5.0-2ubuntu2) karmic; urgency=low
+
+  * Drop completely bogus or'ed build-dep on gcc-4.3 on amd64 - if the
+    package in the archive builds for biarch, we shouldn't allow non-multilib
+    gcc as an alternative, this would just result in a package misbuild.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 08 Oct 2009 01:28:53 +0000
+
+valgrind (1:3.5.0-2ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Refresh 91_build_with_fno_stack_protector.dpatch.
+    - Add lpia to Architecture.
+  * Move libc6-dbg to Recommends (LP: #423485).
+
+ -- Kees Cook <kees@ubuntu.com>  Fri, 02 Oct 2009 15:51:36 -0700
+
 valgrind (1:3.5.0-2) unstable; urgency=low
 
   * debian/control:
@@ -648,6 +1396,20 @@ valgrind (1:3.5.0-1) unstable; urgency=l
 
  -- Andrés Roldán <aroldan@debian.org>  Wed, 09 Sep 2009 16:26:29 +0000
 
+valgrind (1:3.4.1-1ubuntu2) karmic; urgency=low
+
+  * Rebuild to include suppressions for libc6 2.10.x (LP: #423485).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 04 Sep 2009 15:12:18 +0100
+
+valgrind (1:3.4.1-1ubuntu1) jaunty; urgency=low
+
+  * Merge with Debian; remaining changes:
+    - Add 91_build_with_fno_stack_protector.dpatch.
+    - Add lpia to Architecture.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 05 Mar 2009 18:27:01 +0100
+
 valgrind (1:3.4.1-1) unstable; urgency=low
 
   * New upstream release.
@@ -676,6 +1438,14 @@ valgrind (1:3.3.1-3) unstable; urgency=l
 
  -- Andrés Roldán <aroldan@debian.org>  Wed, 03 Dec 2008 16:42:11 +0000
 
+valgrind (1:3.3.1-2ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+   - Add 91_build_with_fno_stack_protector.dpatch
+   - Add lpia to Architecture
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 19 Jun 2008 09:57:35 +0200
+
 valgrind (1:3.3.1-2) unstable; urgency=low
 
   * debian/rules:
@@ -697,6 +1467,14 @@ valgrind (1:3.3.1-1) unstable; urgency=l
 
  -- Andrés Roldán <aroldan@debian.org>  Wed, 11 Jun 2008 23:10:08 +0000
 
+valgrind (1:3.3.0-1ubuntu1) hardy; urgency=low
+
+  * Merge with Debian, remaining changes:
+   - Add 91_build_with_fno_stack_protector.dpatch
+   - Add lpia to Architecture
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 06 Jan 2008 11:28:10 +0000
+
 valgrind (1:3.3.0-1) unstable; urgency=low
 
   * New upstream release. (Closes: #455855)
@@ -713,6 +1491,32 @@ valgrind (1:3.3.0-1) unstable; urgency=l
 
  -- Andrés Roldán <aroldan@debian.org>  Wed, 12 Dec 2007 20:39:58 +0000
 
+valgrind (1:3.2.3-3ubuntu2) hardy; urgency=low
+
+  * Fix FTBS with new libc6 2.7 not recognized by valgrind's
+    configure script (backported from svn)
+    - add debian/patches/92_valgrind-libc6-2.7.dpatch
+    - add debian/patches/99_update_configure.dpatch
+    - update debian/patches/00list
+
+ -- Fabien Tassin <fta@sofaraway.org>  Mon, 10 Dec 2007 20:54:23 +0100
+
+valgrind (1:3.2.3-3ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Build package for lpia
+    - Build using -fno-stack-protector
+  * Drop 21_amd64_kde148447_NEW_nop_codes.dpatch merged
+    into 01_amd64-nops.dpatch
+    - update debian/patches/00list
+  * Bump Standards-Version to 3.7.2
+    - update debian/control
+  * Drop DH_COMPAT=3 from rules and add compat=5
+    - update debian/rules
+    - add debian/compat
+
+ -- Fabien Tassin <fta@sofaraway.org>  Tue, 06 Dec 2007 19:11:43 +0100
+
 valgrind (1:3.2.3-3) unstable; urgency=low
 
   * debian/FAQ.txt:
@@ -727,6 +1531,27 @@ valgrind (1:3.2.3-3) unstable; urgency=l
 
  -- Andrés Roldán <aroldan@debian.org>  Thu, 23 Aug 2007 22:41:13 +0000
 
+valgrind (1:3.2.3-2ubuntu3) gutsy; urgency=low
+
+  * debian/patches/21_amd64_kde148447_NEW_nop_codes.dpatch:
+    - import patch from http://bugs.kde.org/show_bug.cgi?id=148447#c16 to fix
+      LP: #148465.
+
+ -- Alexander Sack <asac@ubuntu.com>  Sat, 06 Oct 2007 02:27:32 +0200
+
+valgrind (1:3.2.3-2ubuntu2) gutsy; urgency=low
+
+  * Build package for lpia.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 24 Aug 2007 19:26:18 +0200
+
+valgrind (1:3.2.3-2ubuntu1) gutsy; urgency=low
+
+  * Merge with Debian; remaining changes:
+    - Build using -fno-stack-protector.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 23 Aug 2007 20:14:42 +0200
+
 valgrind (1:3.2.3-2) unstable; urgency=low
 
   * debian/patches/03_valgrind-libc6-2.6.dpatch:
@@ -738,6 +1563,20 @@ valgrind (1:3.2.3-2) unstable; urgency=l
 
  -- Andrés Roldán <aroldan@debian.org>  Fri, 17 Aug 2007 13:18:21 +0000
 
+valgrind (1:3.2.3-1ubuntu2) gutsy; urgency=low
+
+  * No-change upload to work around a soyuz bug and build on lpia.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Fri, 10 Aug 2007 01:32:33 +1000
+
+valgrind (1:3.2.3-1ubuntu1) gutsy; urgency=low
+
+  * Merge with Debian; remaining changes:
+    - Build using -fno-stack-protector.
+    - Build-depend on gcc-multilib.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 24 May 2007 13:27:02 +0200
+
 valgrind (1:3.2.3-1) unstable; urgency=low
 
   * New upstream version
@@ -751,12 +1590,56 @@ valgrind (1:3.2.3-1) unstable; urgency=l
 
  -- Andrés Roldán <aroldan@debian.org>  Thu,  1 Feb 2007 20:41:46 +0000
 
+valgrind (1:3.2.1-1ubuntu2) feisty; urgency=low
+
+  * Rebuild for changes in the amd64 toolchain.
+  * Set Ubuntu maintainer address.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon,  5 Mar 2007 01:27:22 +0000
+
+valgrind (1:3.2.1-1ubuntu1) feisty; urgency=low
+
+  * Sync with Debian:
+    + debian/control:
+      - Drop build dependency on ia32-libs-dev
+    + debian/patches/91_build_with_fno_stack_protector.dpatch:
+      - Build with -fno-stack-protector to fix FTBFS
+  * debian/glibc-2.5.supp,
+    debian/rules:
+    + Add suppresion file from SVN for glibc 2.5
+
+ -- Sebastian Dröge <slomo@ubuntu.com>  Thu, 16 Nov 2006 17:56:30 +0100
+
 valgrind (1:3.2.1-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Andrés Roldán <aroldan@debian.org>  Thu,  5 Oct 2006 15:28:35 +0000
 
+valgrind (1:3.2.0-2ubuntu3) edgy; urgency=low
+
+  * debian/patches/90_from_svn_fix_cfsi_len_assertion.dpatch:
+    - updated the limit, some applications were still not happy with the 
+      previous one
+
+ -- Sebastien Bacher <seb128@canonical.com>  Thu, 12 Oct 2006 00:29:01 +0200
+
+valgrind (1:3.2.0-2ubuntu2) edgy; urgency=low
+
+  * debian/patches/90_from_svn_fix_cfsi_len_assertion.dpatch:
+    - patch from SVN, fix cfsi->len assertion on amd64 (Ubuntu: #60589)
+  * debian/patches/91_build_with_fno_stack_protector.dpatch:
+    - add -fno-stack-protector to CFLAGS to fix the build
+
+ -- Sebastien Bacher <seb128@canonical.com>  Fri,  6 Oct 2006 00:40:18 +0200
+
+valgrind (1:3.2.0-2ubuntu1) edgy; urgency=low
+
+  * Sync with Debian:
+    + Drop build dependency on ia32-libs-dev
+
+ -- Sebastian Dröge <slomo@ubuntu.com>  Mon, 26 Jun 2006 00:17:17 +0200
+
 valgrind (1:3.2.0-2) unstable; urgency=low
 
   * New upstream release. (Closes: #373578)
@@ -1686,3 +2569,4 @@ valgrind (0.0.20020224-1) unstable; urge
   * Initial Release (closes: #135718)
 
  -- Cyrille Chepelov <cyrille@chepelov.org>  Mon, 25 Feb 2002 20:16:46 +0100
+
diff -pruN 1:3.16.1-1/debian/control 1:3.16.1-1ubuntu1/debian/control
--- 1:3.16.1-1/debian/control	2020-06-28 17:49:18.000000000 +0000
+++ 1:3.16.1-1ubuntu1/debian/control	2020-07-09 12:16:00.000000000 +0000
@@ -1,7 +1,8 @@
 Source: valgrind
 Section: devel
 Priority: optional
-Maintainer: Alessandro Ghedini <ghedo@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Alessandro Ghedini <ghedo@debian.org>
 Build-Depends: debhelper-compat (= 13),
  gdb,
  gcc-multilib [amd64],
@@ -20,8 +21,8 @@ Homepage: http://www.valgrind.org/
 Package: valgrind
 Architecture: amd64 arm64 armhf i386 mips mipsel mips64 mips64el powerpc ppc64 ppc64el s390x x32
 Depends: ${misc:Depends}, ${shlibs:Depends}, libc6-dbg
-Suggests: valgrind-mpi, kcachegrind, alleyoop, valkyrie (>> 1.3.0)
-Recommends: valgrind-dbg, gdb
+Suggests: valgrind-dbg, valgrind-mpi, kcachegrind, alleyoop, valkyrie (>> 1.3.0)
+Recommends: gdb
 Breaks: valgrind-dev
 Replaces: valgrind-dev
 Description: instrumentation framework for building dynamic analysis tools
diff -pruN 1:3.16.1-1/debian/patches/armv7-illegal-opcode.patch 1:3.16.1-1ubuntu1/debian/patches/armv7-illegal-opcode.patch
--- 1:3.16.1-1/debian/patches/armv7-illegal-opcode.patch	1970-01-01 00:00:00.000000000 +0000
+++ 1:3.16.1-1ubuntu1/debian/patches/armv7-illegal-opcode.patch	2020-02-06 14:49:24.000000000 +0000
@@ -0,0 +1,34 @@
+From 1dbb2bc02eb157c4d561bb36236bfc7006d59f0b Mon Sep 17 00:00:00 2001
+From: Philippe De Muyter <phdm@macqel.be>
+Date: Sat, 30 Sep 2017 10:23:35 +0200
+Subject: [PATCH] VEX/priv/guest_arm_toIR.c: fix 0xEBAD 0x1CCA (sub.w r12, sp,
+ r10, lsl #7)
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1837068
+Origin: https://bugs.kde.org/show_bug.cgi?id=385262
+
+disInstr(thumb): unhandled instruction: 0xEBAD 0x1CCA
+==10358==  Illegal opcode at address 0x5900DA3
+==10358==    at 0x5900DA2: bsaes_cbc_encrypt (bsaes-armv7.S:1084)
+(gdb) x /i $pc
+=> 0x5900da2 <bsaes_cbc_encrypt+34>:    sub.w   r12, sp, r10, lsl #7
+---
+ VEX/priv/guest_arm_toIR.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: valgrind-3.15.0/VEX/priv/guest_arm_toIR.c
+===================================================================
+--- valgrind-3.15.0.orig/VEX/priv/guest_arm_toIR.c
++++ valgrind-3.15.0/VEX/priv/guest_arm_toIR.c
+@@ -21186,10 +21186,10 @@
+           && rD != 15 && rN == 13 && imm5 <= 31 && how == 0) {
+          valid = True;
+       }
+-      /* also allow "sub.w reg, sp, reg   lsl #N for N=0 .. 5
++      /* also allow "sub.w reg, sp, reg   lsl #N for N=0 .. 7
+          (T1) "SUB (SP minus register) */
+       if (!valid && INSN0(8,5) == BITS4(1,1,0,1) // sub
+-          && rD != 15 && rN == 13 && imm5 <= 5 && how == 0) {
++          && rD != 15 && rN == 13 && imm5 <= 7 && how == 0) {
+          valid = True;
+       }
+       if (valid) {
diff -pruN 1:3.16.1-1/debian/patches/series 1:3.16.1-1ubuntu1/debian/patches/series
--- 1:3.16.1-1/debian/patches/series	2020-06-28 17:49:18.000000000 +0000
+++ 1:3.16.1-1ubuntu1/debian/patches/series	2020-07-09 12:11:42.000000000 +0000
@@ -8,3 +8,4 @@
 12_drop-MPI-1-support.patch
 13_fix-path-to-vgdb.patch
 14_fix-debuginfo-section-duplicates-a-section-in-the-main-ELF-file.patch
+armv7-illegal-opcode.patch
diff -pruN 1:3.16.1-1/debian/rules 1:3.16.1-1ubuntu1/debian/rules
--- 1:3.16.1-1/debian/rules	2020-06-28 17:49:18.000000000 +0000
+++ 1:3.16.1-1ubuntu1/debian/rules	2020-06-28 21:15:12.000000000 +0000
@@ -10,17 +10,28 @@ CFLAGS  += $(shell dpkg-buildflags --get
 CFLAGS  += "-I/usr/include/$(DEB_HOST_MULTIARCH)"   # fixes #676029
 LDFLAGS  = $(shell dpkg-buildflags --get LDFLAGS)
 
+ifeq ($(DEB_HOST_ARCH_CPU),arm)
+	DH_STRIP_OPTS := -X vgpreload
+else
+	DH_STRIP_OPTS :=
+endif
+
+CONFARGS = --enable-tls
+ifeq ($(DEB_HOST_ARCH_CPU),arm64)
+  CONFARGS += --enable-only64bit
+endif
+
 %:
-	dh $@ --with=autoreconf
+	dh $@ --parallel --with=autoreconf
 
 override_dh_auto_configure:
-	dh_auto_configure -- --enable-tls CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
+	dh_auto_configure -- $(CONFARGS) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
 
 override_dh_auto_test:
 	: # do nothing for now
 
 override_dh_auto_build:
-	dh_auto_build
+	dh_auto_build --parallel
 	$(MAKE) -C docs FAQ.txt
 	$(MAKE) -C docs html-docs
 	$(MAKE) -C docs man-pages
@@ -29,7 +40,7 @@ override_dh_shlibdeps:
 	dh_shlibdeps -Xdebian/valgrind/usr/lib/$(DEB_HOST_MULTIARCH)/valgrind/getoff-x86-linux # fixes #762386
 
 override_dh_strip:
-	dh_strip --dbg-package=valgrind-dbg
+	dh_strip --dbg-package=valgrind-dbg $(DH_STRIP_OPTS)
 
 override_dh_dwz:
 	: # do nothing for now
@@ -44,3 +55,6 @@ override_dh_install:
 
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS
+	
+override_dh_missing:
+	dh_missing --fail-missing
