Manual merge of version 5.212.0~alpha2-9+rpi1 and 5.212.0~alpha2-15 to produce 5...

diff --cc debian/changelog
index 2c6899014bb0a46b296c1bb8456db9f1011a5b20,15513ef195df70db7342d37914b29a8a90bae03d..776734aff62aaffa9e7f83b74fa90891740c342d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,44 +1,55 @@@
- qtwebkit-opensource-src (5.212.0~alpha2-9+rpi1) buster-staging; urgency=medium
++qtwebkit-opensource-src (5.212.0~alpha2-15+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 5.212.0~alpha2-5+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 09 Dec 2017 00:03:30 +0000]
 +  * Update symbols file for raspbian.
 +  * Fix clean target.
 +  [changes introduced in 5.212.0~alpha2-6+rpi1] by Peter Michael Green
 +  * Try unsuccessfully to hack offlineasm to prevent generation of movw/movt
 +  * Disable JIT
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 17 Apr 2018 03:45:32 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Fri, 17 Aug 2018 00:17:15 +0000
++
+ qtwebkit-opensource-src (5.212.0~alpha2-15) unstable; urgency=medium
+ 
+   * Build with -fpermissive to (hopefully) solve the i386 FTBFS.
+   * Update symbols from build logs.
+ 
+  -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 26 Jul 2018 19:14:49 -0500
+ 
+ qtwebkit-opensource-src (5.212.0~alpha2-14) unstable; urgency=medium
+ 
+   * Update symbols files with buildds' logs.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>  Wed, 25 Jul 2018 23:33:17 -0300
+ 
+ qtwebkit-opensource-src (5.212.0~alpha2-13) unstable; urgency=medium
+ 
+   * Upload to Sid.
+ 
+  -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 25 Jul 2018 04:49:30 -0500
+ 
+ qtwebkit-opensource-src (5.212.0~alpha2-12) experimental; urgency=medium
+ 
+   * Remove the dbgsym migration section of debian/rules; it isn't needed
+     anymore.
+ 
+  -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 23 Jun 2018 20:30:20 -0500
+ 
+ qtwebkit-opensource-src (5.212.0~alpha2-11) experimental; urgency=medium
+ 
+   * Bump build dependencies to 5.11.1.
+ 
+  -- Simon Quigley <tsimonq2@ubuntu.com>  Tue, 19 Jun 2018 20:20:58 -0500
+ 
+ qtwebkit-opensource-src (5.212.0~alpha2-10) experimental; urgency=medium
+ 
+   * Add my name to Uploaders.
+   * Bump build dependencies to 5.11.0.
+   * Fix insecure-copyright-format-uri.
+   * Bump Standards-version to 4.1.4, no changes needed.
+   * Bump debhelper compat to 11, no changes needed.
+ 
+  -- Simon Quigley <tsimonq2@ubuntu.com>  Mon, 18 Jun 2018 23:26:42 -0400
  
  qtwebkit-opensource-src (5.212.0~alpha2-9) unstable; urgency=medium
  

diff --cc debian/libqt5webkit5.symbols
index 5faa84da1f65caf719ef4dfa2b29a8bbbc942bc8,329a77930d1a08742184f84c3423f47a2434496d..5ffba3de84288d7ed02f40db5dbf0a0cf659cf81
--- 1/debian/libqt5webkit5.symbols
--- 2/debian/libqt5webkit5.symbols
+++ b/debian/libqt5webkit5.symbols
@@@ -2385,8 -2387,9 +2387,11 @@@ libQt5WebKit.so.5 libqt5webkit5 #MINVER
   _ZTV25QQuickWebViewExperimental@Base 5.0.2
   _ZTV25QWebNotificationPresenter@Base 5.212.0~alpha2
   (arch=alpha amd64 arm64 armel armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc powerpcspe ppc64 sh4 x32)_ZTVNSt6thread11_State_implINS_8_InvokerISt5tupleIJPFvPN7bmalloc9AsyncTaskINS3_4HeapEMS5_FvvEEEES9_EEEEEE@Base 5.212.0~alpha2
+  (arch=armel)_ZTVSt23_Sp_counted_ptr_inplaceISt5mutexSaIS0_ELN9__gnu_cxx12_Lock_policyE1EE@Base 5.212.0~alpha2
+  (arch=amd64 arm64 mips)_ZTVSt23_Sp_counted_ptr_inplaceISt5mutexSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE@Base 5.212.0~alpha2
+  (arch=amd64 arm64 armel mips)_ZZNSt19_Sp_make_shared_tag5_S_tiEvE5__tag@Base 5.212.0~alpha2
 + (optional=appeardinraspbian)_ZTVSt19_Sp_counted_deleterIPSt5mutexNSt12__shared_ptrIS0_LN9__gnu_cxx12_Lock_policyE1EE8_DeleterISaIS0_EEES7_LS4_1EE@Base 5.212.0~alpha2
 + (optional=disappeardinraspbian)_ZTVSt19_Sp_counted_deleterIPSt5mutexNSt12__shared_ptrIS0_LN9__gnu_cxx12_Lock_policyE2EE8_DeleterISaIS0_EEES7_LS4_2EE@Base 5.212.0~alpha2
   _ZZZN21QWebIconImageProvider10identifierEvENKUlvE_clEvE15qstring_literal@Base 5.2.0
   _ZlsR11QDataStreamRK11QWebHistory@Base 5.0.2
   _ZrsR11QDataStreamR11QWebHistory@Base 5.0.2

diff --cc debian/rules
index dd344a80601c5e6585d3e58906d02c0e337f02dd,82a2dd09e019b5ff7f356151060d5317fe2d4471..1248a7a6856e89c01c6455c457ff68dc0005ed9b
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -77,10 -79,3 +79,7 @@@ endi
  
  override_dh_auto_test-indep:
        # Do not attempt to run anything to make build-indep work
- override_dh_strip:
-       dh_strip --dbgsym-migration='libqt5webkit5-dbg (<< 5.212.0~alpha2-1~)'
- 
 +
 +override_dh_auto_clean:
 +      rm -f `find . -name '*.pyc'`
 +      dh_auto_clean