Merge version 5.46.0-2+rpi1 and 5.46.0-3 to produce 5.46.0-3+rpi1

diff --cc debian/changelog
index a6185f61fafe15a8a0703720d22e20143979b7fb,e8bfca2f995893b685c7055468e977f958e54258..6887d2080905288531e0dd3f0ad758d102bca33f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,14 +1,21 @@@
- kwallet-kf5 (5.46.0-2+rpi1) buster-staging; urgency=medium
++kwallet-kf5 (5.46.0-3+rpi1) buster-staging; urgency=medium
 +
++  [changes brought forward from 5.46.0-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 02 Jun 2018 23:58:11 +0000]
 +  * Update symbols file for Raspbian.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 02 Jun 2018 23:58:11 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 20 Jun 2018 21:17:34 +0000
++
+ kwallet-kf5 (5.46.0-3) unstable; urgency=medium
+ 
+   * Team upload.
+   * Update symbols files from logs of buildds.
+   * Remove unused 'testsuite' autopkgtest.
+   * Remove unused debian/meta stuff.
+   * Remove unused debian/not-installed file.
+   * Remove the unused ${shlibs:Depends} substvar from libkf5wallet-data, and
+     libkf5wallet-doc.
+ 
+  -- Pino Toscano <pino@debian.org>  Sun, 03 Jun 2018 20:12:41 +0200
  
  kwallet-kf5 (5.46.0-2) unstable; urgency=medium
  

diff --cc debian/libkwalletbackend5-5.symbols
index 08f732a16817b9480fb2fd497bf02e30dc1bc9f9,ab24991e717d8b66f0c9dd1200d78ad22e7356c8..fb411932f6babf92b70cb5469784df35b624c916
--- 1/debian/libkwalletbackend5-5.symbols
--- 2/debian/libkwalletbackend5-5.symbols
+++ b/debian/libkwalletbackend5-5.symbols
@@@ -93,24 -93,24 +93,24 @@@ libkwalletbackend5.so.5 libkwalletbacke
   _ZTI10QByteArray@Base 4.96.0
   _ZTI11BlockCipher@Base 5.27.0
   _ZTI8BlowFish@Base 4.96.0
-  (optional=gccinternal|arch=!amd64 !arm64 !armhf !i386 !m68k !mips !mips64el !mipsel !powerpc !ppc64 !ppc64el !s390x)_ZTIN9__gnu_cxx7__mutexE@Base 5.36.0
-  (optional=gccinternal|arch=!amd64 !arm64 !armhf !i386 !m68k !mips !mips64el !mipsel !powerpc !ppc64 !ppc64el !s390x)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 5.36.0
+  (optional=gccinternal|arch=!alpha !amd64 !arm64 !armhf !i386 !m68k !mips !mips64el !mipsel !powerpc !ppc64 !ppc64el !s390x !x32)_ZTIN9__gnu_cxx7__mutexE@Base 5.36.0
+  (optional=gccinternal|arch=!alpha !amd64 !arm64 !armhf !i386 !m68k !mips !mips64el !mipsel !powerpc !ppc64 !ppc64el !s390x !x32)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 5.36.0
 - (arch=!armel !riscv64)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 5.46.0
 + (optional=notarmelandprobabllynotraspbian)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 5.46.0
-  (optional=gccinternal|arch=!amd64 !arm64 !armhf !i386 !m68k !mips !mips64el !mipsel !powerpc !ppc64 !ppc64el !s390x)_ZTISt15_Sp_counted_ptrIPN5GpgME7ContextELN9__gnu_cxx12_Lock_policyE1EE@Base 5.36.0
+  (optional=gccinternal|arch=!alpha !amd64 !arm64 !armhf !i386 !m68k !mips !mips64el !mipsel !powerpc !ppc64 !ppc64el !s390x !x32)_ZTISt15_Sp_counted_ptrIPN5GpgME7ContextELN9__gnu_cxx12_Lock_policyE1EE@Base 5.36.0
 - (arch=!armel !riscv64)_ZTISt15_Sp_counted_ptrIPN5GpgME7ContextELN9__gnu_cxx12_Lock_policyE2EE@Base 5.46.0
 + (optional=notarmelandprobabllynotraspbian)_ZTISt15_Sp_counted_ptrIPN5GpgME7ContextELN9__gnu_cxx12_Lock_policyE2EE@Base 5.46.0
-  (optional=gccinternal|arch=!amd64 !arm64 !armhf !i386 !m68k !mips !mips64el !mipsel !powerpc !ppc64 !ppc64el !s390x)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 5.36.0
+  (optional=gccinternal|arch=!alpha !amd64 !arm64 !armhf !i386 !m68k !mips !mips64el !mipsel !powerpc !ppc64 !ppc64el !s390x !x32)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 5.36.0
 - (arch=!armel !riscv64)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 5.46.0
 + (optional=notarmelandprobabllynotraspbian)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 5.46.0
   _ZTS10QByteArray@Base 4.96.0
   _ZTS11BlockCipher@Base 5.27.0
   _ZTS8BlowFish@Base 4.96.0
-  (optional=gccinternal|arch=!amd64 !arm64 !armhf !i386 !m68k !mips !mips64el !mipsel !powerpc !ppc64 !ppc64el !s390x)_ZTSN9__gnu_cxx7__mutexE@Base 5.36.0
-  (optional=gccinternal|arch=!amd64 !arm64 !armhf !i386 !m68k !mips !mips64el !mipsel !powerpc !ppc64 !ppc64el !s390x)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 5.36.0
+  (optional=gccinternal|arch=!alpha !amd64 !arm64 !armhf !i386 !m68k !mips !mips64el !mipsel !powerpc !ppc64 !ppc64el !s390x !x32)_ZTSN9__gnu_cxx7__mutexE@Base 5.36.0
+  (optional=gccinternal|arch=!alpha !amd64 !arm64 !armhf !i386 !m68k !mips !mips64el !mipsel !powerpc !ppc64 !ppc64el !s390x !x32)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 5.36.0
 - (arch=!armel !riscv64)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 5.46.0
 + (optional=notarmelandprobabllynotraspbian)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 5.46.0
-  (optional=gccinternal|arch=!amd64 !arm64 !armhf !i386 !m68k !mips !mips64el !mipsel !powerpc !ppc64 !ppc64el !s390x)_ZTSSt15_Sp_counted_ptrIPN5GpgME7ContextELN9__gnu_cxx12_Lock_policyE1EE@Base 5.36.0
+  (optional=gccinternal|arch=!alpha !amd64 !arm64 !armhf !i386 !m68k !mips !mips64el !mipsel !powerpc !ppc64 !ppc64el !s390x !x32)_ZTSSt15_Sp_counted_ptrIPN5GpgME7ContextELN9__gnu_cxx12_Lock_policyE1EE@Base 5.36.0
 - (arch=!armel !riscv64)_ZTSSt15_Sp_counted_ptrIPN5GpgME7ContextELN9__gnu_cxx12_Lock_policyE2EE@Base 5.46.0
 + (optional=notarmelandprobabllynotraspbian)_ZTSSt15_Sp_counted_ptrIPN5GpgME7ContextELN9__gnu_cxx12_Lock_policyE2EE@Base 5.46.0
-  (optional=gccinternal|arch=!amd64 !arm64 !armhf !i386 !m68k !mips !mips64el !mipsel !powerpc !ppc64 !ppc64el !s390x)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 5.36.0
+  (optional=gccinternal|arch=!alpha !amd64 !arm64 !armhf !i386 !m68k !mips !mips64el !mipsel !powerpc !ppc64 !ppc64el !s390x !x32)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 5.36.0
 - (arch=!armel !riscv64)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 5.46.0
 + (optional=notarmelandprobabllynotraspbian)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 5.46.0
   _ZTV11BlockCipher@Base 5.27.0
   _ZTV8BlowFish@Base 4.96.0
-  (optional=gccinternal|arch=!amd64 !arm64 !armhf !i386 !m68k !mips !mips64el !mipsel !powerpc !ppc64 !ppc64el !s390x)_ZTVSt15_Sp_counted_ptrIPN5GpgME7ContextELN9__gnu_cxx12_Lock_policyE1EE@Base 5.36.0
+  (optional=gccinternal|arch=!alpha !amd64 !arm64 !armhf !i386 !m68k !mips !mips64el !mipsel !powerpc !ppc64 !ppc64el !s390x !x32)_ZTVSt15_Sp_counted_ptrIPN5GpgME7ContextELN9__gnu_cxx12_Lock_policyE1EE@Base 5.36.0
 - (arch=!armel !riscv64)_ZTVSt15_Sp_counted_ptrIPN5GpgME7ContextELN9__gnu_cxx12_Lock_policyE2EE@Base 5.46.0
 + (optional=notarmelandprobabllynotraspbian)_ZTVSt15_Sp_counted_ptrIPN5GpgME7ContextELN9__gnu_cxx12_Lock_policyE2EE@Base 5.46.0