From: Peter Michael Green <plugwash@raspbian.org>
Date: Tue, 3 Mar 2020 16:12:59 +0000 (+0000)
Subject: Manual merge of version 1.0.0~rc9+dfsg1-1+rpi1 and 1.0.0~rc10+dfsg1-1 to produce... 
X-Git-Tag: raspbian/1.0.0_rc10+dfsg1-1+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3e00dc0bb9107c2c897150bc50f49c354467a4bf;p=runc.git

Manual merge of version 1.0.0~rc9+dfsg1-1+rpi1 and 1.0.0~rc10+dfsg1-1 to produce 1.0.0~rc10+dfsg1-1+rpi1
---

bff41925721aafef1ce7353d4ca662ab207f9c92
diff --cc debian/changelog
index e11431e,fb96bf4..89c13e7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,12 +1,19 @@@
- runc (1.0.0~rc9+dfsg1-1+rpi1) bullseye-staging; urgency=medium
++runc (1.0.0~rc10+dfsg1-1+rpi1) bullseye-staging; urgency=medium
 +
++  [changes brought forward from 1.0.0~rc9+dfsg1-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 15 Oct 2019 17:37:31 +0000]
 +  * Disable testsuite.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 15 Oct 2019 17:37:31 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 03 Mar 2020 16:07:57 +0000
++
+ runc (1.0.0~rc10+dfsg1-1) unstable; urgency=medium
+ 
+   * New upstream release.
+     + fixed CVE-2019-19921.
+   * Un-vendored "golang-github-checkpoint-restore-go-criu-dev".
+   * Build-Depends += "golang-golang-x-tools".
+   * Standards-Version: 4.5.0.
+ 
+  -- Dmitry Smirnov <onlyjob@debian.org>  Sun, 26 Jan 2020 20:24:01 +1100
  
  runc (1.0.0~rc9+dfsg1-1) unstable; urgency=medium
  
diff --cc debian/rules
index 9e838a2,b4e4625..f1acd4b
--- a/debian/rules
+++ b/debian/rules
@@@ -39,8 -45,5 +45,5 @@@ override_dh_auto_build
  	dh_auto_build -- -tags "$(TAGS)" -ldflags "$(LDFLAGS)"
  
  override_dh_auto_test:
 -	DH_GOLANG_EXCLUDES="libcontainer/integration" \
 -        dh_auto_test -- -tags "$(TAGS)"
 +	#DH_GOLANG_EXCLUDES="libcontainer/integration" \
 +        #dh_auto_test -- -tags "$(TAGS)"
- 
- override_dh_dwz:
- 	: