Manual merge of 1.18.0+dfsg1-4+rpi1 with 1.19.0+dfsg3-4 to produce 1.19.0+dfsg3-4...

diff --cc debian/changelog
index d198f85f42def52cb66989b02b655a6cdac85c3d,6c5e4940371a6fa61b5902f801ad8c6d9ca1b8b1..00290f270e7f51210995ddc3df8f212a855f5dc9
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,29 -1,12 +1,39 @@@
 -rustc (1.18.0+dfsg1-4+rpi1) buster-staging; urgency=medium
++rustc (1.19.0+dfsg3-4+rpi1) buster-staging; urgency=medium
+ 
+   [changes brought forward from 1.15.1+dfsg1-1~exp3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 15 Mar 2017 10:16:18 +0000]
+   * Fix clean target.
+   * Build for armv6.
+   [changes introduced in 1.18.0+dfsg1-4+rpi1 by Peter Michael Green]
+   * Disable testsuite.
+ 
 - -- Peter Michael Green <plugwash@raspbian.org>  Wed, 09 Aug 2017 02:49:55 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 02 Nov 2017 12:17:13 +0000
++
 +rustc (1.19.0+dfsg3-4) unstable; urgency=medium
 +
 +  * Bump LLVM requirement to pull in a fix for a FTBFS on ppc64el.
 +
 + -- Ximin Luo <infinity0@debian.org>  Sun, 15 Oct 2017 21:31:03 +0200
 +
 +rustc (1.19.0+dfsg3-3) unstable; urgency=medium
 +
 +  * Fix a trailing whitespace for tidy.
 +
 + -- Ximin Luo <infinity0@debian.org>  Tue, 19 Sep 2017 16:09:41 +0200
 +
 +rustc (1.19.0+dfsg3-2) unstable; urgency=medium
 +
 +  * Upload to unstable.
 +  * Add a patch to print extra information when tests fail.
 +
 + -- Ximin Luo <infinity0@debian.org>  Tue, 19 Sep 2017 12:32:03 +0200
 +
 +rustc (1.19.0+dfsg3-1) experimental; urgency=medium
 +
 +  * New upstream release.
 +  * Upgrade to LLVM 4.0. (Closes: #873421)
 +  * rust-src: install Debian patches as well
 +
 + -- Ximin Luo <infinity0@debian.org>  Fri, 15 Sep 2017 04:02:09 +0200
  
  rustc (1.18.0+dfsg1-4) unstable; urgency=medium
  

diff --cc debian/rules
index cd1d28c448beca975e4d78cce3073e6ec76fab09,13caaeb80f00a499fcc4ab95e4add2e628ef6e80..ea7dcd7a303b7bc59982d452eb079d18aa2cd3b6
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -240,9 -185,8 +240,9 @@@ override_dh_auto_test-arch
                objdump -p "$$x" | grep -q "NEEDED.*LLVM"; \
                test "$$(stat -c %s "$$x")" -lt 6000000; \
        done
- ifeq (, $(filter nocheck,$(DEB_BUILD_OPTIONS)))
 +ifeq (, $(filter nocheck,$(DEB_BUILD_PROFILES)))
 -      $(call RUN_TESTS,RUST_BACKTRACE=1 $(RUSTBUILD) test --no-fail-fast $(RUSTBUILD_FLAGS) $(RUSTBUILD_TEST_FLAGS))
+ ifeq (testsuitedisabled, $(filter nocheck,$(DEB_BUILD_OPTIONS)))
 +      $(call RUN_TESTS,$(RUSTBUILD_TEST) --no-fail-fast $(RUSTBUILD_FLAGS) $(RUSTBUILD_TEST_FLAGS))
  # don't continue if RUSTBUILD_TEST_FLAGS is non-empty
        test -z "$(RUSTBUILD_TEST_FLAGS)"
  endif