diff -pruN 1:3.9.1-19/debian/changelog 1:3.9.1-19ubuntu2/debian/changelog
--- 1:3.9.1-19/debian/changelog	2017-12-22 10:17:30.000000000 +0000
+++ 1:3.9.1-19ubuntu2/debian/changelog	2018-05-03 15:23:23.000000000 +0000
@@ -1,3 +1,16 @@
+llvm-toolchain-3.9 (1:3.9.1-19ubuntu2) cosmic; urgency=medium
+
+  * No-change rebuild for ncurses soname changes.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 03 May 2018 15:23:23 +0000
+
+llvm-toolchain-3.9 (1:3.9.1-19ubuntu1) bionic; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Drop python-lldb-3.9 from lldb-3.9 depends because it's in universe. 
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 26 Dec 2017 18:24:19 +0100
+
 llvm-toolchain-3.9 (1:3.9.1-19) unstable; urgency=medium
 
   * Standards-Version updated to 4.1.1
@@ -10,6 +23,13 @@ llvm-toolchain-3.9 (1:3.9.1-19) unstable
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 22 Dec 2017 11:17:30 +0100
 
+llvm-toolchain-3.9 (1:3.9.1-18ubuntu1) bionic; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Drop python-lldb-3.9 from lldb-3.9 depends because it's in universe. 
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 27 Oct 2017 08:09:56 +0200
+
 llvm-toolchain-3.9 (1:3.9.1-18) unstable; urgency=medium
 
   * Force the deactivation of ocaml until the transition is done
@@ -17,6 +37,13 @@ llvm-toolchain-3.9 (1:3.9.1-18) unstable
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 13 Oct 2017 23:42:29 +0200
 
+llvm-toolchain-3.9 (1:3.9.1-17ubuntu1) artful; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Drop python-lldb-3.9 from lldb-3.9 depends because it's in universe. 
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 02 Oct 2017 10:17:17 +0200
+
 llvm-toolchain-3.9 (1:3.9.1-17) unstable; urgency=medium
 
   * Remove the -Wl option to call gold instead of the normal linker
@@ -28,6 +55,39 @@ llvm-toolchain-3.9 (1:3.9.1-17) unstable
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 01 Oct 2017 15:23:30 +0200
 
+llvm-toolchain-3.9 (1:3.9.1-16ubuntu5) artful; urgency=medium
+
+  * Fixup previous upload, adding -NDEBUG
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 21 Sep 2017 15:46:34 +0200
+
+llvm-toolchain-3.9 (1:3.9.1-16ubuntu4) artful; urgency=medium
+
+  * Try to use NDEBUG, this seems to be the culprit for the amd64 build
+    failure (and related to clamav failure)
+    - g1 is needed to avoid debug builds > 1.2GB in size
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 21 Sep 2017 07:46:14 +0200
+
+llvm-toolchain-3.9 (1:3.9.1-16ubuntu3) artful; urgency=medium
+
+  * Enable opt_flags (-g1) for arm64 only
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 20 Sep 2017 22:25:38 +0200
+
+llvm-toolchain-3.9 (1:3.9.1-16ubuntu2) artful; urgency=medium
+
+  * Drop opt_flags, it seems to be breaking clamav (cfr lp: 1717574)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 20 Sep 2017 14:21:14 +0200
+
+llvm-toolchain-3.9 (1:3.9.1-16ubuntu1) artful; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Drop python-lldb-3.9 from lldb-3.9 depends because it's in universe. 
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 19 Sep 2017 12:02:43 +0200
+
 llvm-toolchain-3.9 (1:3.9.1-16) unstable; urgency=medium
 
   * Backport of an arm patch for rust.
@@ -51,12 +111,63 @@ llvm-toolchain-3.9 (1:3.9.1-15) unstable
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 03 Sep 2017 15:12:37 +0200
 
+llvm-toolchain-3.9 (1:3.9.1-13ubuntu7) artful; urgency=medium
+
+  * Build with -g1 instead of -g on s390x as well.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 15 Sep 2017 20:57:29 +0200
+
+llvm-toolchain-3.9 (1:3.9.1-13ubuntu6) artful; urgency=medium
+
+  * Try to build with -g1 instead of -g on amd64 as well.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 15 Sep 2017 07:25:22 +0200
+
+llvm-toolchain-3.9 (1:3.9.1-13ubuntu5) artful; urgency=medium
+
+  * build using gold on arm64 and s390x. For backports, arm64 might still
+    need the BFD linker, and building with only one or two processes in
+    parallel.
+  * On arm64 and ppc64el, build with -g1 instead of -g.
+  * Set CMAKE_CXX_FLAGS_RELWITHDEBINFO and pass opt_flags.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 10 Sep 2017 11:06:24 +0200
+
+llvm-toolchain-3.9 (1:3.9.1-13ubuntu4) artful; urgency=medium
+
+  * Fix sanitizer build failure with glibc-2.26.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 08 Sep 2017 15:34:29 +0200
+
+llvm-toolchain-3.9 (1:3.9.1-13ubuntu2) artful; urgency=medium
+
+  * Link with --no-keep-files-mapped --no-map-whole-files when using
+    gold.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 08 Sep 2017 13:05:29 +0100
+
+llvm-toolchain-3.9 (1:3.9.1-13ubuntu1) artful; urgency=medium
+
+  * Merge from Debian unstable.  Remaining changes:
+    - libllvm3.9-dbg, libllvm3.9: Add breaks/replaces for the 16.04 backport.
+    - Drop python-lldb-3.9 from lldb-3.9 depends because it's in universe. 
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 01 Sep 2017 13:08:04 +0200
+
 llvm-toolchain-3.9 (1:3.9.1-13) unstable; urgency=medium
 
   * Fix the previous declaration, incorrect gcc comparison
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 01 Sep 2017 09:00:10 +0200
 
+llvm-toolchain-3.9 (1:3.9.1-12ubuntu1) artful; urgency=medium
+
+  * Merge from Debian unstable.  Remaining changes:
+    - libllvm3.9-dbg, libllvm3.9: Add breaks/replaces for the 16.04 backport.
+    - Drop python-lldb-3.9 from lldb-3.9 depends because it's in universe. 
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 31 Aug 2017 22:27:12 +0200
+
 llvm-toolchain-3.9 (1:3.9.1-12) unstable; urgency=medium
 
   * Fix the FTBFS because of -gsplit-dwarf:
@@ -65,6 +176,14 @@ llvm-toolchain-3.9 (1:3.9.1-12) unstable
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 31 Aug 2017 18:49:20 +0200
 
+llvm-toolchain-3.9 (1:3.9.1-11ubuntu1) artful; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - libllvm3.9-dbg, libllvm3.9: Add breaks/replaces for the 16.04 backport.
+    - Drop python-lldb-3.9 from lldb-3.9 depends because it's in universe.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sun, 27 Aug 2017 18:39:23 +0200
+
 llvm-toolchain-3.9 (1:3.9.1-11) unstable; urgency=medium
 
   [ Sylvestre Ledru ]
@@ -84,6 +203,20 @@ llvm-toolchain-3.9 (1:3.9.1-11) unstable
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 18 Jun 2017 19:12:15 +0200
 
+llvm-toolchain-3.9 (1:3.9.1-10ubuntu2) artful; urgency=high
+
+  * No change rebuild against ocaml 4.04.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 03 Jul 2017 15:21:11 +0100
+
+llvm-toolchain-3.9 (1:3.9.1-10ubuntu1) artful; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - libllvm3.9-dbg, libllvm3.9: Add breaks/replaces for the 16.04 backport.
+    - Drop python-lldb-3.9 from lldb-3.9 depends because it's in universe.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 19 Jun 2017 22:48:39 +0200
+
 llvm-toolchain-3.9 (1:3.9.1-10) unstable; urgency=medium
 
   * Now that strech has been released, upload in unstable!
@@ -101,6 +234,14 @@ llvm-toolchain-3.9 (1:3.9.1-10~exp1) exp
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 12 Jun 2017 17:38:06 +0200
 
+llvm-toolchain-3.9 (1:3.9.1-9ubuntu1) artful; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - libllvm3.9-dbg, libllvm3.9: Add breaks/replaces for the 16.04 backport.
+    - Drop python-lldb-3.9 from lldb-3.9 depends because it's in universe.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 05 Jun 2017 08:44:32 +0200
+
 llvm-toolchain-3.9 (1:3.9.1-9) unstable; urgency=medium
 
   * debian/patches/fix-R_AARCH64_MOVW_UABS_G3-relocation.patch:
@@ -111,6 +252,14 @@ llvm-toolchain-3.9 (1:3.9.1-9) unstable;
 
  -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 02 Jun 2017 15:14:18 +0200
 
+llvm-toolchain-3.9 (1:3.9.1-8ubuntu1) artful; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - libllvm3.9-dbg, libllvm3.9: Add breaks/replaces for the 16.04 backport.
+    - Drop python-lldb-3.9 from lldb-3.9 depends because it's in universe.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 26 Apr 2017 10:35:06 +0200
+
 llvm-toolchain-3.9 (1:3.9.1-8) unstable; urgency=medium
 
   * Really fix "use versioned symbols" for llvm
@@ -118,6 +267,14 @@ llvm-toolchain-3.9 (1:3.9.1-8) unstable;
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 25 Apr 2017 15:10:10 +0200
 
+llvm-toolchain-3.9 (1:3.9.1-7ubuntu1) artful; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - libllvm3.9-dbg, libllvm3.9: Add breaks/replaces for the 16.04 backport.
+    - Drop python-lldb-3.9 from lldb-3.9 depends because it's in universe.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sat, 22 Apr 2017 14:45:54 +0200
+
 llvm-toolchain-3.9 (1:3.9.1-7) unstable; urgency=medium
 
   * Limit the archs where the ocaml binding is built
@@ -151,12 +308,46 @@ llvm-toolchain-3.9 (1:3.9.1-6~exp1) expe
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 19 Mar 2017 10:12:03 +0100
 
+llvm-toolchain-3.9 (1:3.9.1-5ubuntu1) zesty; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - libllvm3.9-dbg, libllvm3.9: Add breaks/replaces for the 16.04 backport.
+    - Drop python-lldb-3.9 from lldb-3.9 depends because it's in universe.
+    - Don't build the Fuzzer library on powerpc.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 13 Mar 2017 17:53:22 +0100
+
 llvm-toolchain-3.9 (1:3.9.1-5) unstable; urgency=medium
 
   * Fix the incorrect symlink to scan-build-py (Closes: #856869)
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 12 Mar 2017 10:01:10 +0100
 
+llvm-toolchain-3.9 (1:3.9.1-4ubuntu4) zesty; urgency=medium
+
+  * libllvm3.9-dbg, libllvm3.9: Add breaks/replaces for the 16.04 backport.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 02 Mar 2017 20:13:51 +0100
+
+llvm-toolchain-3.9 (1:3.9.1-4ubuntu3) zesty; urgency=medium
+
+  * Actually drop the python-lldb-3.9 dependency this time.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Fri, 10 Feb 2017 11:38:09 +0200
+
+llvm-toolchain-3.9 (1:3.9.1-4ubuntu2) zesty; urgency=medium
+
+  * Drop python-lldb-3.9 from lldb-3.9 depends because it's in universe.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Thu, 09 Feb 2017 20:37:08 +0200
+
+llvm-toolchain-3.9 (1:3.9.1-4ubuntu1) zesty; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Don't build the Fuzzer library on powerpc.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 01 Feb 2017 15:45:29 +0100
+
 llvm-toolchain-3.9 (1:3.9.1-4) unstable; urgency=medium
 
   * d/p/amdgpu-regression.diff Fix a regression impacting mesa
@@ -174,6 +365,13 @@ llvm-toolchain-3.9 (1:3.9.1-3) unstable;
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 14 Jan 2017 11:46:16 +0100
 
+llvm-toolchain-3.9 (1:3.9.1-2ubuntu1) zesty; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Don't build the Fuzzer library on powerpc.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 11 Jan 2017 21:28:03 +0100
+
 llvm-toolchain-3.9 (1:3.9.1-2) unstable; urgency=medium
 
   * debian/orig-tar.sh: less verbose
@@ -185,6 +383,13 @@ llvm-toolchain-3.9 (1:3.9.1-2) unstable;
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 17 Dec 2016 17:55:44 +0100
 
+llvm-toolchain-3.9 (1:3.9.1-1ubuntu1) zesty; urgency=medium
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Don't build the Fuzzer library on powerpc.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 15 Dec 2016 09:27:51 +0100
+
 llvm-toolchain-3.9 (1:3.9.1-1) unstable; urgency=medium
 
   * New stable release
@@ -206,6 +411,13 @@ llvm-toolchain-3.9 (1:3.9.1~+rc2-1~exp1)
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 02 Dec 2016 16:19:14 +0100
 
+llvm-toolchain-3.9 (1:3.9-6ubuntu1) zesty; urgency=medium
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Don't build the Fuzzer library on powerpc.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 25 Nov 2016 17:49:22 +0100
+
 llvm-toolchain-3.9 (1:3.9-6) unstable; urgency=medium
 
   * Fix segfaults in the memory sanitizers (Closes: #842642)
@@ -214,6 +426,13 @@ llvm-toolchain-3.9 (1:3.9-6) unstable; u
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 11 Nov 2016 17:01:38 +0100
 
+llvm-toolchain-3.9 (1:3.9-5ubuntu1) zesty; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Don't build the Fuzzer library on powerpc.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 10 Nov 2016 16:19:57 +0100
+
 llvm-toolchain-3.9 (1:3.9-5) unstable; urgency=medium
 
   * d/p/0011-SimplifyCFG-Hoisting-invalidates-metadata.patch: Also apply bug 29163
@@ -272,6 +491,14 @@ llvm-toolchain-3.9 (1:3.9-2) unstable; u
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 02 Sep 2016 13:11:56 +0200
 
+llvm-toolchain-3.9 (1:3.9-1ubuntu1) yakkety; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Don't build python-lldb on architectures where lldb is not built.
+    - Don't build the Fuzzer library on powerpc.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 02 Sep 2016 09:57:25 +0200
+
 llvm-toolchain-3.9 (1:3.9-1) unstable; urgency=medium
 
   * New stable release
@@ -281,6 +508,13 @@ llvm-toolchain-3.9 (1:3.9-1) unstable; u
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 01 Sep 2016 12:05:33 +0200
 
+llvm-toolchain-3.9 (1:3.9~+rc3-1ubuntu2) yakkety; urgency=medium
+
+  * Don't build python-lldb on architectures where lldb is not built.
+  * Don't build the Fuzzer library on powerpc.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 30 Aug 2016 10:19:05 +0200
+
 llvm-toolchain-3.9 (1:3.9~+rc3-1) unstable; urgency=medium
 
   * Upload in unstable
diff -pruN 1:3.9.1-19/debian/control 1:3.9.1-19ubuntu2/debian/control
--- 1:3.9.1-19/debian/control	2017-12-22 10:17:30.000000000 +0000
+++ 1:3.9.1-19ubuntu2/debian/control	2017-12-22 22:26:40.000000000 +0000
@@ -460,7 +460,6 @@ Package: lldb-3.9
 Architecture: amd64 armel armhf i386  kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe sh4 x32 mips mipsel arm64
 # ia64 mips mipsel hurd powerpc ppc64 ppc64el sparc64  s390x  have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.9 (= ${binary:Version}), llvm-3.9-dev,
- python-lldb-3.9
 Conflicts: lldb-3.4, lldb-3.5
 Pre-Depends: ${misc:Pre-Depends}
 Description: Next generation, high-performance debugger
