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

diff --cc debian/changelog
index 345eee0fd1cd881d58c6db402a528d06a2c84e2d,dd714446dbe5932f7d4cc66924b2a725c50c5cdc..a3d8453b652240610973bf8b2ec0d4a96819442c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- libgpiod (1.5.1-1+rpi1) bullseye-staging; urgency=medium
++libgpiod (1.5.1-2+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 1.2-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 14 Mar 2019 19:53:16 +0000]
 +  * Update symbols file for raspbian.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Fri, 17 Jul 2020 10:34:03 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 24 Aug 2020 15:44:07 +0000
++
+ libgpiod (1.5.1-2) unstable; urgency=medium
+ 
+   * Fix symbol mismatches - Thanks to Gianfranco Costamagna
+     <locutusofborg@debian.org> (Closes:#966654, #966964)
+ 
+  -- SZ Lin (林上智) <szlin@debian.org>  Fri, 14 Aug 2020 14:41:33 +0800
  
  libgpiod (1.5.1-1) unstable; urgency=medium
  

diff --cc debian/libgpiod2.symbols
index 58b273efa329669c385a208515dfac9d5a80f37e,0a2052b703543e53fc3584bfeda3de12aa52a85d..bdb254e36f65bd8130af1063f0c7c357e7364819
--- 1/debian/libgpiod2.symbols
--- 2/debian/libgpiod2.symbols
+++ b/debian/libgpiod2.symbols
@@@ -99,6 -99,8 +99,7 @@@ libgpiod.so.2 libgpiod2 #MINVER
   gpiod_line_update@Base 1.1
   gpiod_version_string@Base 1.1
  libgpiodcxx.so.1 libgpiod2 #MINVER#
 - (c++|optional)"std::_Function_base::~_Function_base()@Base" 1.5.1
+  (c++|optional)"std::_Function_base::~_Function_base()@Base" 1.5.1
   (c++)"gpiod::line_request::FLAG_ACTIVE_LOW@Base" 1.1
   (c++)"gpiod::line_request::FLAG_OPEN_DRAIN@Base" 1.1
   (c++)"gpiod::line_request::FLAG_OPEN_SOURCE@Base" 1.1
@@@ -192,23 -207,26 +193,23 @@@
   (c++)"gpiod::line_iter::operator==(gpiod::line_iter const&) const@Base" 1.1
   (c++)"gpiod::line_iter::operator!=(gpiod::line_iter const&) const@Base" 1.1
   (c++)"gpiod::line_iter::operator->() const@Base" 1.1
 - (c++)"std::system_error::system_error(std::error_code, char const*)@Base" 1.1
 - (c++)"std::system_error::system_error(int, std::_V2::error_category const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.1
 - (c++)"std::system_error::system_error(std::error_code, char const*)@Base" 1.1
   (c++)"std::system_error::system_error(int, std::_V2::error_category const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.1
-  (c++)"std::_Function_base::_Base_manager<gpiod_chip* (*)(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)>::_M_manager(std::_Any_data&, std::_Any_data const&, std::_Manager_operation)@Base" 1.1
+  (c++|optional)"std::_Function_base::_Base_manager<gpiod_chip* (*)(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)>::_M_manager(std::_Any_data&, std::_Any_data const&, std::_Manager_operation)@Base" 1.1
 - (c++|arch= !armel !riscv64)"std::_Sp_counted_ptr<decltype(nullptr), (__gnu_cxx::_Lock_policy)2>::_M_dispose()@Base" 1.1
 - (c++|arch= !armel !riscv64)"std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2>::_M_destroy()@Base" 1.1
 - (c++)"std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2>::_M_release()@Base" 1.4.1
 - (c++)"std::map<int, int, std::less<int>, std::allocator<std::pair<int const, int> > >::~map()@Base" 1.1
 + (c++|optional=notarmelandprobabllynotraspbian)"std::_Sp_counted_ptr<decltype(nullptr), (__gnu_cxx::_Lock_policy)2>::_M_dispose()@Base" 1.1
 + (c++|optional=notarmelandprobabllynotraspbian)"std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2>::_M_destroy()@Base" 1.1
 + (c++|optional=notarmelandprobabllynotraspbian)"std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2>::_M_release()@Base" 1.4.1
   (c++)"std::map<int, int, std::less<int>, std::allocator<std::pair<int const, int> > >::~map()@Base" 1.1
 - (c++|optional|arch-bits=64)"std::vector<int, std::allocator<int> >::_M_default_append(unsigned long)@Base" 1.1
 + (c++|arch-bits=64)"std::bitset<32ul>::bitset<char>(char const*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >::size_type, char, char)@Base" 1.1
 + (c++|optional=disappeardinraspbian)"std::bitset<32u>::bitset<char>(char const*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >::size_type, char, char)@Base" 1.1
   (c++|optional|arch-bits=32)"std::vector<int, std::allocator<int> >::_M_default_append(unsigned int)@Base" 1.5.1
   (c++|optional)"void std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >::_M_construct<char const*>(char const*, char const*, std::forward_iterator_tag)@Base" 1.1
   (c++|optional)"std::_Rb_tree<int, std::pair<int const, int>, std::_Select1st<std::pair<int const, int> >, std::less<int>, std::allocator<std::pair<int const, int> > >::_M_get_insert_unique_pos(int const&)@Base" 1.1
-  (c++|arch=amd64 arm64 ppc64el mips64el riscv64)"std::_Rb_tree<int, std::pair<int const, int>, std::_Select1st<std::pair<int const, int> >, std::less<int>, std::allocator<std::pair<int const, int> > >::_M_get_insert_hint_unique_pos(std::_Rb_tree_const_iterator<std::pair<int const, int> >, int const&)@Base" 1.1
-  (c++)"std::_Rb_tree<int, std::pair<int const, int>, std::_Select1st<std::pair<int const, int> >, std::less<int>, std::allocator<std::pair<int const, int> > >::_M_erase(std::_Rb_tree_node<std::pair<int const, int> >*)@Base" 1.1
+  (c++|optional|arch=amd64 arm64 ppc64el mips64el riscv64)"std::_Rb_tree<int, std::pair<int const, int>, std::_Select1st<std::pair<int const, int> >, std::less<int>, std::allocator<std::pair<int const, int> > >::_M_get_insert_hint_unique_pos(std::_Rb_tree_const_iterator<std::pair<int const, int> >, int const&)@Base" 1.1
+  (c++|optional)"std::_Rb_tree<int, std::pair<int const, int>, std::_Select1st<std::pair<int const, int> >, std::less<int>, std::allocator<std::pair<int const, int> > >::_M_erase(std::_Rb_tree_node<std::pair<int const, int> >*)@Base" 1.1
 - (c++|arch= !armel !riscv64)"typeinfo for std::_Mutex_base<(__gnu_cxx::_Lock_policy)2>@Base" 1.1
 - (c++|arch= !armel !riscv64)"typeinfo for std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2>@Base" 1.1
 - (c++|arch= !armel !riscv64)"typeinfo name for std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2>@Base" 1.4
 - (c++|arch= !armel !riscv64)"typeinfo name for std::_Mutex_base<(__gnu_cxx::_Lock_policy)2>@Base" 1.1
 + (c++|optional=notarmelandprobabllynotraspbian)"typeinfo for std::_Mutex_base<(__gnu_cxx::_Lock_policy)2>@Base" 1.1
 + (c++|optional=notarmelandprobabllynotraspbian)"typeinfo for std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2>@Base" 1.1
 + (c++|optional=notarmelandprobabllynotraspbian)"typeinfo name for std::_Mutex_base<(__gnu_cxx::_Lock_policy)2>@Base" 1.1
 + (c++|optional=notarmelandprobabllynotraspbian)"typeinfo name for std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2>@Base" 1.4.1
   (c++|arch= armel riscv64)"std::_Sp_counted_ptr<decltype(nullptr), (__gnu_cxx::_Lock_policy)1>::_M_dispose()@Base" 1.2
   (c++|arch= armel riscv64)"std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)1>::_M_destroy()@Base" 1.2
   (c++|arch= armel riscv64)"std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)1>::_M_release()@Base" 1.2
@@@ -218,4 -237,6 +219,4 @@@
   (c++|arch= armel riscv64)"typeinfo name for __gnu_cxx::__mutex@Base" 1.2
   (c++|arch= armel riscv64)"typeinfo name for std::_Mutex_base<(__gnu_cxx::_Lock_policy)1>@Base" 1.2
   (c++|arch= armel riscv64)"typeinfo name for std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)1>@Base" 1.2
-  (c++|arch= i386 armel mipsel armhf s390x)"std::map<int, int, std::less<int>, std::allocator<std::pair<int const, int> > >::map(std::initializer_list<std::pair<int const, int> >, std::less<int> const&, std::allocator<std::pair<int const, int> > const&)@Base" 1.3
+  (c++|optional|arch= i386 armel mipsel armhf s390x)"std::map<int, int, std::less<int>, std::allocator<std::pair<int const, int> > >::map(std::initializer_list<std::pair<int const, int> >, std::less<int> const&, std::allocator<std::pair<int const, int> > const&)@Base" 1.3
 - (c++|arch= !armel !riscv64)"std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2>::_M_release()@Base" 1.4.1
 - (c++|arch= !armel !riscv64)"typeinfo name for std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2>@Base" 1.4.1