diff -Nru libgpiod-1.4.1/debian/changelog libgpiod-1.4.1/debian/changelog
--- libgpiod-1.4.1/debian/changelog	2019-08-31 13:25:57.000000000 +0000
+++ libgpiod-1.4.1/debian/changelog	2019-09-07 03:03:04.000000000 +0000
@@ -1,3 +1,10 @@
+libgpiod (1.4.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>  Sat, 07 Sep 2019 03:03:04 +0000
+
 libgpiod (1.4.1-2) unstable; urgency=medium
 
   * Fix FTBFS in armel
diff -Nru libgpiod-1.4.1/debian/libgpiod2.symbols libgpiod-1.4.1/debian/libgpiod2.symbols
--- libgpiod-1.4.1/debian/libgpiod2.symbols	2019-08-31 03:51:59.000000000 +0000
+++ libgpiod-1.4.1/debian/libgpiod2.symbols	2019-09-07 03:03:04.000000000 +0000
@@ -86,19 +86,14 @@
  (c++)"gpiod::line_request::FLAG_OPEN_DRAIN@Base" 1.1
  (c++)"gpiod::line_request::FLAG_OPEN_SOURCE@Base" 1.1
  (c++)"gpiod::make_chip_iter()@Base" 1.1
- (c++)"gpiod::end(gpiod::chip_iter const&)@Base" 1.1
  (c++)"gpiod::end(gpiod::line_iter const&)@Base" 1.1
  (c++)"gpiod::chip::open(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, int)@Base" 1.1
  (c++)"gpiod::chip::reset()@Base" 1.1
  (c++)"gpiod::chip::chip(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, int)@Base" 1.1
- (c++)"gpiod::chip::chip(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, int)@Base" 1.1
  (c++)"gpiod::line::reset()@Base" 1.1
  (c++)"gpiod::line::line()@Base" 1.1
- (c++)"gpiod::line::line()@Base" 1.1
- (c++)"gpiod::begin(gpiod::chip_iter)@Base" 1.1
  (c++)"gpiod::begin(gpiod::line_iter)@Base" 1.1
  (c++)"gpiod::chip_iter::~chip_iter()@Base" 1.1
- (c++)"gpiod::chip_iter::~chip_iter()@Base" 1.1
  (c++)"gpiod::chip_iter::operator++()@Base" 1.1
  (c++)"gpiod::find_line(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.1
  (c++)"gpiod::line_bulk::end()@Base" 1.1
@@ -109,10 +104,8 @@
  (c++)"gpiod::line_bulk::iterator::operator++()@Base" 1.1
  (c++)"gpiod::line_bulk::MAX_LINES@Base" 1.1
  (c++)"gpiod::line_bulk::line_bulk(std::vector<gpiod::line, std::allocator<gpiod::line> > const&)@Base" 1.1
- (c++)"gpiod::line_bulk::line_bulk(std::vector<gpiod::line, std::allocator<gpiod::line> > const&)@Base" 1.1
  (c++)"gpiod::line_bulk::operator[](unsigned int)@Base" 1.1
  (c++)"gpiod::line_iter::line_iter(gpiod::chip const&)@Base" 1.1
- (c++)"gpiod::line_iter::line_iter(gpiod::chip const&)@Base" 1.1
  (c++)"gpiod::line_iter::operator++()@Base" 1.1
  (c++)"gpiod::chip::find_lines(std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&) const@Base" 1.1
  (c++)"gpiod::chip::get_all_lines() const@Base" 1.1
@@ -127,7 +120,6 @@
  (c++)"gpiod::chip::operator!=(gpiod::chip const&) const@Base" 1.1
  (c++)"gpiod::chip::operator!() const@Base" 1.1
  (c++)"gpiod::line::event_read() const@Base" 1.1
- (c++|arch-bits=64)"gpiod::line::event_wait(std::chrono::duration<long, std::ratio<1l, 1000000000l> > const&) const@Base" 1.1
  (c++|arch-bits=32)"gpiod::line::event_wait(std::chrono::duration<long long, std::ratio<1ll, 1000000000ll> > const&) const@Base" 1.1
  (c++)"gpiod::line::active_state() const@Base" 1.1
  (c++)"gpiod::line::event_get_fd() const@Base" 1.1
@@ -152,7 +144,6 @@
  (c++)"gpiod::chip_iter::operator==(gpiod::chip_iter const&) const@Base" 1.1
  (c++)"gpiod::chip_iter::operator!=(gpiod::chip_iter const&) const@Base" 1.1
  (c++)"gpiod::chip_iter::operator->() const@Base" 1.1
- (c++|arch-bits=64)"gpiod::line_bulk::event_wait(std::chrono::duration<long, std::ratio<1l, 1000000000l> > const&) const@Base" 1.1
  (c++|arch-bits=32)"gpiod::line_bulk::event_wait(std::chrono::duration<long long, std::ratio<1ll, 1000000000ll> > const&) const@Base" 1.1
  (c++)"gpiod::line_bulk::get_values() const@Base" 1.1
  (c++)"gpiod::line_bulk::set_values(std::vector<int, std::allocator<int> > const&) const@Base" 1.1
@@ -170,39 +161,30 @@
  (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++|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::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++|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++|arch-bits=32)"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++|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++|arch-bits=32)"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++|arch-bits=64)"std::vector<int, std::allocator<int> >::_M_default_append(unsigned long)@Base" 1.1
  (c++|arch-bits=32)"std::vector<int, std::allocator<int> >::_M_default_append(unsigned int)@Base" 1.1
  (c++)"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++)"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++|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
  (c++|arch= armel riscv64)"typeinfo for __gnu_cxx::__mutex@Base" 1.2
  (c++|arch= armel riscv64)"typeinfo for std::_Mutex_base<(__gnu_cxx::_Lock_policy)1>@Base" 1.2
- (c++|arch= amd64 arm64 s390x)"typeinfo name for std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2>@Base" 1.3
  (c++|arch= armel riscv64)"typeinfo for std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)1>@Base" 1.2
  (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++|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