Manual merge of version 1.0.0~rc9+dfsg1-1+rpi1 and 1.0.0~rc10+dfsg1-1 to produce... bullseye-staging archive/raspbian/1.0.0_rc10+dfsg1-1+rpi1 raspbian/1.0.0_rc10+dfsg1-1+rpi1
authorPeter Michael Green <plugwash@raspbian.org>
Tue, 3 Mar 2020 16:12:59 +0000 (16:12 +0000)
committerPeter Michael Green <plugwash@raspbian.org>
Tue, 3 Mar 2020 16:12:59 +0000 (16:12 +0000)
1  2 
debian/changelog
debian/rules

index e11431ed0415de85085c395415ea577e2f493ff7,fb96bf47b7140c23588f783e85ce8570880da5d4..89c13e7403281fa6aaddc8b53e7a114215a70835
@@@ -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 9e838a23b197cfe448c4c9478fd0aa77903e8491,b4e46258264bb2d674a215d18a56d2ad1ad9d2ed..f1acd4bc99b9170ac2aa3ae8547ecb763d61023c
@@@ -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:
-       :