From: Peter Michael Green <plugwash@raspbian.org>
Date: Tue, 14 Nov 2017 02:06:20 +0000 (+0000)
Subject: Manual merge of version 1.20.0+dfsg1-1+rpi1 and 1.21.0+dfsg1-3 to produce 1.21.0... 
X-Git-Tag: archive/raspbian/1.21.0+dfsg1-3+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a759d174843b2f6b5a27ecec7a366a3197f2c713;p=rustc.git

Manual merge of version 1.20.0+dfsg1-1+rpi1 and 1.21.0+dfsg1-3 to produce 1.21.0+dfsg1-3+rpi1
---

a759d174843b2f6b5a27ecec7a366a3197f2c713
diff --cc debian/changelog
index 9e1a8fad0f,051f3de354..0f26e7f94a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,46 +1,56 @@@
- rustc (1.20.0+dfsg1-1+rpi1) buster-staging; urgency=medium
++rustc (1.21.0+dfsg1-3+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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 02 Nov 2017 21:52:10 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Mon, 13 Nov 2017 23:20:20 +0000
 +
- rustc (1.20.0+dfsg1-1) experimental; urgency=medium
+ rustc (1.21.0+dfsg1-3) unstable; urgency=medium
+ 
+   * Add/fix detection for sparc64, thanks to John Paul Adrian Glaubitz.
+   * Workaround FTBFS when building docs. (Closes: #880262)
+ 
+  -- Ximin Luo <infinity0@debian.org>  Mon, 06 Nov 2017 10:03:32 +0100
+ 
+ rustc (1.21.0+dfsg1-2) unstable; urgency=medium
+ 
+   * Upload to unstable.
+   * Fix bootstrapping using 1.21.0, which is more strict about redundant &mut
+     previously used in u-output-failed-commands.patch.
+   * Only allow up to 5 test failures.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Wed, 25 Oct 2017 20:27:30 +0200
+ 
+ rustc (1.21.0+dfsg1-1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Fix the "install" target for cross-compilations; cross-compiling with
+     sbuild --host=$foreign-arch should work again.
+   * Update to latest Standards-Version; changes:
+     - Priority changed to optional from extra.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Tue, 17 Oct 2017 00:42:54 +0200
+ 
+ rustc (1.20.0+dfsg1-3) unstable; urgency=medium
+ 
+   * Disable jemalloc to fix FTBFS with 1.21 on armhf.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Wed, 25 Oct 2017 12:01:19 +0200
+ 
+ rustc (1.20.0+dfsg1-2) unstable; urgency=medium
+ 
+   * Update changelog entry for 1.20.0+dfsg1-1 to reflect that it was actually
+     and accidentally uploaded to unstable. No harm, no foul.
+   * We are no longer failing the build when tests fail, see NEWS or
+     README.Debian for details.
+   * Bump LLVM requirement to fix some failing tests.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Sat, 21 Oct 2017 14:20:17 +0200
+ 
+ rustc (1.20.0+dfsg1-1) unstable; urgency=medium
  
    * New upstream release.
  
diff --cc debian/rules
index 34c226c31a,a63718bcd8..b5fd879cc2
--- a/debian/rules
+++ b/debian/rules
@@@ -242,8 -238,20 +238,21 @@@ override_dh_auto_test-arch
  		test "$$(stat -c %s "$$x")" -lt 6000000; \
  	done
  ifeq (, $(filter nocheck,$(DEB_BUILD_PROFILES)))
 -ifeq (, $(filter nocheck,$(DEB_BUILD_OPTIONS)))
 +ifeq (testsuitedisabled, $(filter nocheck,$(DEB_BUILD_OPTIONS)))
- 	$(call RUN_TESTS,$(RUSTBUILD_TEST) --no-fail-fast $(RUSTBUILD_FLAGS) $(RUSTBUILD_TEST_FLAGS))
+ 	$(RUSTBUILD_TEST) --no-fail-fast $(RUSTBUILD_FLAGS) $(RUSTBUILD_TEST_FLAGS) | tee $(TEST_LOG)
+ 	test -f $(TEST_LOG)
+ 	echo "Summary of specific test failures:"; \
+ 	$(FAILED_TESTS); \
+ 	num_failures=$$($(FAILED_TESTS) | wc -l); \
+ 	echo -n "$${num_failures} tests failed, $(FAILURES_ALLOWED) maximum allowed. "; \
+ 	if test "$${num_failures}" -le $(FAILURES_ALLOWED); then \
+ 	  echo "Continuing..."; \
+ 	else \
+ 	  echo "Aborting the build."; \
+ 	  echo "Check the logs further above for details."; \
+ 	  false; \
+ 	fi
++>>>>>>> debpsuedomerge
  # don't continue if RUSTBUILD_TEST_FLAGS is non-empty
  	test -z "$(RUSTBUILD_TEST_FLAGS)"
  endif