Merge version 4:17.12.3-2+rpi1 and 4:18.08.1-1 to produce 4:18.08.1-1+rpi1

diff --cc debian/changelog
index 97e83b598c1c7eec6b6e69ef389d21bcbb68afd1,b57f0f7601e0746b0ae082539524cb84b5164ce1..4ffcd86ab489f702a64cdfe3f5f9a2d1bc169732
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,29 +1,36 @@@
- libkf5libkleo (4:17.12.3-2+rpi1) buster-staging; urgency=medium
++libkf5libkleo (4:18.08.1-1+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 4:17.08.3-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 18 Jan 2018 16:40:34 +0000]
 +  * Update symbols file for Raspbian.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 07 May 2018 16:15:28 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 16 Oct 2018 01:19:50 +0000
++
+ libkf5libkleo (4:18.08.1-1) unstable; urgency=medium
+ 
+   * Team upload.
+ 
+   [ Sandro Knauß ]
+   * Bump Standards-Version to 4.2.1 (No changes needed).
+   * Update symbols from buildds for 4:18.07.90
+   * New upstream release (18.08.1).
+   * Follow stable releases in KDE again.
+   * Update build-deps and deps with the info from cmake.
+ 
+  -- Sandro Knauß <hefee@debian.org>  Tue, 02 Oct 2018 23:17:49 +0200
+ 
+ libkf5libkleo (4:18.07.90-1) experimental; urgency=medium
+ 
+   * Team upload.
+ 
+   [ Sandro Knauß ]
+   * Update watch file to match unstable releases, too.
+   * New upstream release (18.07.90).
+   * Bump Standards-Version to 4.2.0 (No changes needed).
+   * Update build-deps and deps with the info from cmake.
+   * Update symbols from build for 18.07.90.
+   * Update copyright file for new upstream.
+ 
+  -- Sandro Knauß <hefee@debian.org>  Fri, 17 Aug 2018 18:17:04 +0200
  
  libkf5libkleo (4:17.12.3-2) unstable; urgency=medium
  

diff --cc debian/libkf5libkleo5.symbols
index 89c881c96538f2820a3b5093ae41a66255654605,74e370da092222f016741df750b5af37f6c3e73c..4c7979a139626db6d05e2834bdb46679a8f6687c
--- 1/debian/libkf5libkleo5.symbols
--- 2/debian/libkf5libkleo5.symbols
+++ b/debian/libkf5libkleo5.symbols
@@@ -925,13 -993,21 +993,21 @@@ libKF5Libkleo.so.5 libkf5libkleo5 #MINV
   (arch=armel riscv64)_ZTIN9__gnu_cxx26__concurrence_unlock_errorE@Base 4:17.12.3
   (arch=armel riscv64)_ZTIN9__gnu_cxx7__mutexE@Base 4:17.12.3
   (arch=armel riscv64)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 4:17.12.3
 - (arch=!armel !riscv64)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 4:17.08.0
 + (optional=disappearedinraspbian)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 4:17.08.0
+  (arch=armel)_ZTISt15_Sp_counted_ptrIPN4Kleo11KeyResolver7PrivateELN9__gnu_cxx12_Lock_policyE1EE@Base 4:18.07.90
+  (arch=!armel)_ZTISt15_Sp_counted_ptrIPN4Kleo11KeyResolver7PrivateELN9__gnu_cxx12_Lock_policyE2EE@Base 4:18.07.90
+  (arch=armel)_ZTISt15_Sp_counted_ptrIPN4Kleo16DefaultKeyFilterELN9__gnu_cxx12_Lock_policyE1EE@Base 4:18.07.90
+  (arch=!armel)_ZTISt15_Sp_counted_ptrIPN4Kleo16DefaultKeyFilterELN9__gnu_cxx12_Lock_policyE2EE@Base 4:18.07.90
+  (arch=armel)_ZTISt15_Sp_counted_ptrIPN4Kleo20NewKeyApprovalDialog7PrivateELN9__gnu_cxx12_Lock_policyE1EE@Base 4:18.07.90
+  (arch=!armel)_ZTISt15_Sp_counted_ptrIPN4Kleo20NewKeyApprovalDialog7PrivateELN9__gnu_cxx12_Lock_policyE2EE@Base 4:18.07.90
+  (arch=armel)_ZTISt15_Sp_counted_ptrIPN4Kleo20NewKeyApprovalDialogELN9__gnu_cxx12_Lock_policyE1EE@Base 4:18.07.90
+  (arch=!armel)_ZTISt15_Sp_counted_ptrIPN4Kleo20NewKeyApprovalDialogELN9__gnu_cxx12_Lock_policyE2EE@Base 4:18.07.90
   (arch=armel riscv64)_ZTISt15_Sp_counted_ptrIPN4Kleo21KConfigBasedKeyFilterELN9__gnu_cxx12_Lock_policyE1EE@Base 4:17.12.3
 - (arch=!armel !riscv64)_ZTISt15_Sp_counted_ptrIPN4Kleo21KConfigBasedKeyFilterELN9__gnu_cxx12_Lock_policyE2EE@Base 4:17.08.0
 + (optional=disappearedinraspbian)_ZTISt15_Sp_counted_ptrIPN4Kleo21KConfigBasedKeyFilterELN9__gnu_cxx12_Lock_policyE2EE@Base 4:17.08.0
   (arch=armel riscv64)_ZTISt15_Sp_counted_ptrIPN4Kleo8KeyCacheELN9__gnu_cxx12_Lock_policyE1EE@Base 4:17.12.3
 - (arch=!armel !riscv64)_ZTISt15_Sp_counted_ptrIPN4Kleo8KeyCacheELN9__gnu_cxx12_Lock_policyE2EE@Base 4:17.08.0
 + (optional=disappearedinraspbian)_ZTISt15_Sp_counted_ptrIPN4Kleo8KeyCacheELN9__gnu_cxx12_Lock_policyE2EE@Base 4:17.08.0
   (arch=armel riscv64)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 4:17.12.3
 - (arch=!armel !riscv64)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 4:17.08.0
 + (optional=disappearedinraspbian)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 4:17.08.0
   _ZTS16KDHorizontalLine@Base 4:15.12
   _ZTSN4Kleo11KeyListView14ColumnStrategyE@Base 4:15.12
   _ZTSN4Kleo11KeyListView15DisplayStrategyE@Base 4:15.12
@@@ -972,13 -1050,21 +1050,21 @@@
   (arch=armel riscv64)_ZTSN9__gnu_cxx26__concurrence_unlock_errorE@Base 4:17.12.3
   (arch=armel riscv64)_ZTSN9__gnu_cxx7__mutexE@Base 4:17.12.3
   (arch=armel riscv64)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 4:17.12.3
 - (arch=!armel !riscv64)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 4:17.08.0
 + (optional=disappearedinraspbian)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 4:17.08.0
+  (arch=armel)_ZTSSt15_Sp_counted_ptrIPN4Kleo11KeyResolver7PrivateELN9__gnu_cxx12_Lock_policyE1EE@Base 4:18.07.90
+  (arch=!armel)_ZTSSt15_Sp_counted_ptrIPN4Kleo11KeyResolver7PrivateELN9__gnu_cxx12_Lock_policyE2EE@Base 4:18.07.90
+  (arch=armel)_ZTSSt15_Sp_counted_ptrIPN4Kleo16DefaultKeyFilterELN9__gnu_cxx12_Lock_policyE1EE@Base 4:18.07.90
+  (arch=!armel)_ZTSSt15_Sp_counted_ptrIPN4Kleo16DefaultKeyFilterELN9__gnu_cxx12_Lock_policyE2EE@Base 4:18.07.90
+  (arch=armel)_ZTSSt15_Sp_counted_ptrIPN4Kleo20NewKeyApprovalDialog7PrivateELN9__gnu_cxx12_Lock_policyE1EE@Base 4:18.07.90
+  (arch=!armel)_ZTSSt15_Sp_counted_ptrIPN4Kleo20NewKeyApprovalDialog7PrivateELN9__gnu_cxx12_Lock_policyE2EE@Base 4:18.07.90
+  (arch=armel)_ZTSSt15_Sp_counted_ptrIPN4Kleo20NewKeyApprovalDialogELN9__gnu_cxx12_Lock_policyE1EE@Base 4:18.07.90
+  (arch=!armel)_ZTSSt15_Sp_counted_ptrIPN4Kleo20NewKeyApprovalDialogELN9__gnu_cxx12_Lock_policyE2EE@Base 4:18.07.90
   (arch=armel riscv64)_ZTSSt15_Sp_counted_ptrIPN4Kleo21KConfigBasedKeyFilterELN9__gnu_cxx12_Lock_policyE1EE@Base 4:17.12.3
 - (arch=!armel !riscv64)_ZTSSt15_Sp_counted_ptrIPN4Kleo21KConfigBasedKeyFilterELN9__gnu_cxx12_Lock_policyE2EE@Base 4:17.08.0
 + (optional=disappearedinraspbian)_ZTSSt15_Sp_counted_ptrIPN4Kleo21KConfigBasedKeyFilterELN9__gnu_cxx12_Lock_policyE2EE@Base 4:17.08.0
   (arch=armel riscv64)_ZTSSt15_Sp_counted_ptrIPN4Kleo8KeyCacheELN9__gnu_cxx12_Lock_policyE1EE@Base 4:17.12.3
 - (arch=!armel !riscv64)_ZTSSt15_Sp_counted_ptrIPN4Kleo8KeyCacheELN9__gnu_cxx12_Lock_policyE2EE@Base 4:17.08.0
 + (optional=disappearedinraspbian)_ZTSSt15_Sp_counted_ptrIPN4Kleo8KeyCacheELN9__gnu_cxx12_Lock_policyE2EE@Base 4:17.08.0
   (arch=armel riscv64)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 4:17.12.3
 - (arch=!armel !riscv64)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 4:17.08.0
 + (optional=disappearedinraspbian)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 4:17.08.0
   _ZTV16KDHorizontalLine@Base 4:15.12
   _ZTVN4Kleo11KeyListView14ColumnStrategyE@Base 4:15.12
   _ZTVN4Kleo11KeyListView15DisplayStrategyE@Base 4:15.12
@@@ -1016,10 -1104,31 +1104,31 @@@
   _ZTVN5boost9exceptionE@Base 4:15.12
   (arch=armel riscv64)_ZTVN9__gnu_cxx24__concurrence_lock_errorE@Base 4:17.12.3
   (arch=armel riscv64)_ZTVN9__gnu_cxx26__concurrence_unlock_errorE@Base 4:17.12.3
+  (arch=armel)_ZTVSt15_Sp_counted_ptrIPN4Kleo11KeyResolver7PrivateELN9__gnu_cxx12_Lock_policyE1EE@Base 4:18.07.90
+  (arch=!armel)_ZTVSt15_Sp_counted_ptrIPN4Kleo11KeyResolver7PrivateELN9__gnu_cxx12_Lock_policyE2EE@Base 4:18.07.90
+  (arch=armel)_ZTVSt15_Sp_counted_ptrIPN4Kleo16DefaultKeyFilterELN9__gnu_cxx12_Lock_policyE1EE@Base 4:18.07.90
+  (arch=!armel)_ZTVSt15_Sp_counted_ptrIPN4Kleo16DefaultKeyFilterELN9__gnu_cxx12_Lock_policyE2EE@Base 4:18.07.90
+  (arch=armel)_ZTVSt15_Sp_counted_ptrIPN4Kleo20NewKeyApprovalDialog7PrivateELN9__gnu_cxx12_Lock_policyE1EE@Base 4:18.07.90
+  (arch=!armel)_ZTVSt15_Sp_counted_ptrIPN4Kleo20NewKeyApprovalDialog7PrivateELN9__gnu_cxx12_Lock_policyE2EE@Base 4:18.07.90
+  (arch=armel)_ZTVSt15_Sp_counted_ptrIPN4Kleo20NewKeyApprovalDialogELN9__gnu_cxx12_Lock_policyE1EE@Base 4:18.07.90
+  (arch=!armel)_ZTVSt15_Sp_counted_ptrIPN4Kleo20NewKeyApprovalDialogELN9__gnu_cxx12_Lock_policyE2EE@Base 4:18.07.90
   (arch=armel riscv64)_ZTVSt15_Sp_counted_ptrIPN4Kleo21KConfigBasedKeyFilterELN9__gnu_cxx12_Lock_policyE1EE@Base 4:17.12.3
 - (arch=!armel !riscv64)_ZTVSt15_Sp_counted_ptrIPN4Kleo21KConfigBasedKeyFilterELN9__gnu_cxx12_Lock_policyE2EE@Base 4:17.08.0
 + (optional=disappearedinraspbian)_ZTVSt15_Sp_counted_ptrIPN4Kleo21KConfigBasedKeyFilterELN9__gnu_cxx12_Lock_policyE2EE@Base 4:17.08.0
   (arch=armel riscv64)_ZTVSt15_Sp_counted_ptrIPN4Kleo8KeyCacheELN9__gnu_cxx12_Lock_policyE1EE@Base 4:17.12.3
 - (arch=!armel !riscv64)_ZTVSt15_Sp_counted_ptrIPN4Kleo8KeyCacheELN9__gnu_cxx12_Lock_policyE2EE@Base 4:17.08.0
 + (optional=disappearedinraspbian)_ZTVSt15_Sp_counted_ptrIPN4Kleo8KeyCacheELN9__gnu_cxx12_Lock_policyE2EE@Base 4:17.08.0
+  _ZZN4Kleo20NewKeyApprovalDialog7Private14updateOkButtonEvE10origOkText@Base 4:18.07.90
+  _ZZZN4Kleo11KeyResolver7Private12addRecpientsERK11QStringListbENKUlvE_clEvE15qstring_literal@Base 4:18.07.90
+  _ZZZN4Kleo11KeyResolver7Private22isAcceptableSigningKeyERKN5GpgME3KeyEENKUlvE_clEvE15qstring_literal@Base 4:18.07.90
+  _ZZZN4Kleo11KeyResolver7Private25isAcceptableEncryptionKeyERKN5GpgME3KeyERK7QStringENKUlvE_clEvE15qstring_literal@Base 4:18.07.90
+  _ZZZN4Kleo20NewKeyApprovalDialog7Private14updateOkButtonEvENKUlvE0_clEvE15qstring_literal@Base 4:18.07.90
+  _ZZZN4Kleo20NewKeyApprovalDialog7Private14updateOkButtonEvENKUlvE1_clEvE15qstring_literal@Base 4:18.07.90
+  _ZZZN4Kleo20NewKeyApprovalDialog7Private14updateOkButtonEvENKUlvE2_clEvE15qstring_literal@Base 4:18.07.90
+  _ZZZN4Kleo20NewKeyApprovalDialog7Private14updateOkButtonEvENKUlvE_clEvE15qstring_literal@Base 4:18.07.90
+  (optional=templinst)_ZZZN4Kleo20NewKeyApprovalDialog7Private17addEncryptionAddrERK7QStringRKSt6vectorIN5GpgME3KeyESaIS7_EEP11QGridLayoutENKUlvE0_clEvE15qstring_literal@Base 4:18.07.90
+  (optional=templinst)_ZZZN4Kleo20NewKeyApprovalDialog7Private17addEncryptionAddrERK7QStringRKSt6vectorIN5GpgME3KeyESaIS7_EEP11QGridLayoutENKUlvE_clEvE15qstring_literal@Base 4:18.07.90
+  _ZZZN4Kleo8KeyCache7Private16updateGroupCacheEvENKUlvE0_clEvE15qstring_literal@Base 4:18.07.90
+  _ZZZN4Kleo8KeyCache7Private16updateGroupCacheEvENKUlvE1_clEvE15qstring_literal@Base 4:18.07.90
+  _ZZZN4Kleo8KeyCache7Private16updateGroupCacheEvENKUlvE_clEvE15qstring_literal@Base 4:18.07.90
   (c++)"non-virtual thunk to KDHorizontalLine::~KDHorizontalLine()@Base" 4:15.12
   (c++)"non-virtual thunk to Kleo::AbstractKeyListModel::indexes(std::vector<GpgME::Key, std::allocator<GpgME::Key> > const&) const@Base" 4:17.08.0
   (c++)"non-virtual thunk to Kleo::AbstractKeyListModel::key(QModelIndex const&) const@Base" 4:17.08.0