Merge version 2.5.2-1+rpi1 and 2.5.2-2 to produce 2.5.2-2+rpi1

diff --cc debian/changelog
index 2987f605a41fb0c80cb70d9d7ec868db972244e2,0497f8574e446a776b56fcddda0eb104b9cba1ff..849209f18e306184c9e21ddba8d1392bddca3cfe
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,9 +1,19 @@@
- volk (2.5.2-1+rpi1) bookworm-staging; urgency=medium
++volk (2.5.2-2+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 1.1-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 20 Sep 2015 20:30:19 +0000]
 +  * Disable neon.
 +
 +  [changes introduced in 2.1.0-2+rpi1 by Peter Michael Green]
 +  * Add bulid-depends-indep on texlive-latex-extra.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 13 Sep 2022 03:28:13 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 31 Oct 2022 03:43:55 +0000
++
+ volk (2.5.2-2) unstable; urgency=medium
+ 
+   * revert changes to kernels/volk/volk_8u_x2_encodeframepolar_8u.h
+     made by make-acc-happy patch since version 1.3-1 (Closes: #1021856)
+ 
+  -- A. Maitland Bottoms <bottoms@debian.org>  Sat, 15 Oct 2022 23:41:48 -0400
  
  volk (2.5.2-1) unstable; urgency=medium