From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sat, 28 Mar 2020 03:23:21 +0000 (+0000)
Subject: Merge version 1.4.1-3+rpi1 and 1.4.1-4 to produce 1.4.1-4+rpi1
X-Git-Tag: raspbian/1.4.1-4+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c511b0d125efbcc230326658e0fc0b7719f5c7f4;p=libgpiod.git

Merge version 1.4.1-3+rpi1 and 1.4.1-4 to produce 1.4.1-4+rpi1
---

ad687f8c2f3341033919a29f3f0db0a4410253c5
diff --cc debian/changelog
index 142e9e3,443eb3f..fd1c44d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,19 +1,26 @@@
- libgpiod (1.4.1-3+rpi1) bullseye-staging; urgency=medium
++libgpiod (1.4.1-4+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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 18 Sep 2019 16:52:41 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 28 Mar 2020 03:23:21 +0000
++
+ libgpiod (1.4.1-4) unstable; urgency=medium
+ 
+   * Fix symbols disappeared on s390x - Thanks to Gianfranco Costamagna
+     <locutusofborg@debian.org> (Closes: #949958)
+   * Add Multi-Arch attribute - Thanks to Helmut Grohne <helmut@subdivi.de>
+     (Closes: #951196)
+   * Support nopython build profile to avoid FTFBS issue - This patch was
+     tweaked from Helmut Grohne <helmut@subdivi.de>. Thanks the report from
+     Michael Hudson-Doyle (Closes:#949919, #951197)
+   * d/control:
+     - Bump Standards-Version to 4.5.0
+     - Set Rules-Requires-Root: no
+   * d/watch:
+     - Ignore watching on rc version
+ 
+  -- SZ Lin (林上智) <szlin@debian.org>  Tue, 03 Mar 2020 21:46:43 +0800
  
  libgpiod (1.4.1-3) unstable; urgency=medium
  
diff --cc debian/libgpiod2.symbols
index fff8d6f,5caf6d0..abfa664
--- a/debian/libgpiod2.symbols
+++ b/debian/libgpiod2.symbols
@@@ -169,7 -181,10 +169,7 @@@ libgpiodcxx.so.1 libgpiod2 #MINVER
   (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=32)"std::vector<int, std::allocator<int> >::_M_default_append(unsigned int)@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++|optional)"std::vector<int, std::allocator<int> >::_M_default_append(unsigned long)@Base" 1.1
+  (c++|optional)"std::vector<int, std::allocator<int> >::_M_default_append(unsigned int)@Base" 1.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