Merge version 13~preview2-7+rpi1 and 13.0.0+r11-1 to produce 13.0.0+r11-1+rpi1

diff --cc debian/changelog
index d3573e6c3589af359df068d5bac9e5d593d5ca31,67f9cef7aaf14a8f8bba60926b43a2d396b1a6f5..bf1c5dd35ac7d7a142596dcbbb47032dcd697b63
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,12 +1,22 @@@
- android-platform-external-boringssl (13~preview2-7+rpi1) bookworm-staging; urgency=medium
++android-platform-external-boringssl (13.0.0+r11-1+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 10.0.0+r36-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 19 Jan 2021 16:01:40 +0000]
 +  * Mark asm as armv6 to avoid setting off armv7 contamination checker.
 +  * set __ARM_MAX_ARCH__ to 6.
 +  * disable HWAES define.
 +  * disable GHASH_ASM_ARM define.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 14 Jul 2022 13:55:23 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 02 Nov 2022 00:05:30 +0000
++
+ android-platform-external-boringssl (13.0.0+r11-1) unstable; urgency=medium
+ 
+   * New upstream release 13.0.0+r11
+   * debian/patches: Remove backport patch.
+   * debian/copyright: Update file list.
+   * debian/sources.mk: Update by script.
+   * debian/control: Add myself as uploader.
+ 
+  -- Roger Shimizu <rosh@debian.org>  Sat, 29 Oct 2022 01:58:01 -0700
  
  android-platform-external-boringssl (13~preview2-7) unstable; urgency=medium
  

diff --cc debian/patches/series
index 889511d5791095283939db1118c9becaf4f60779,8cbc36665d7362d69620ac9e6cbc12f4089c0587..2429b36d276e60ade695954e229577d5aaf58a1f
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,2 +1,3 @@@
  01-Add-new-Arch-ia64-riscv64-sh4-x32.patch
  02-sources-mk.patch
- Sync-to-81502beeddc5f116d44d0898c.patch
 +armv6.patch