From: Raspbian automatic forward porter <root@raspbian.org>
Date: Fri, 17 Jul 2020 10:34:03 +0000 (+0100)
Subject: Merge version 1.4.1-4+rpi1 and 1.5.1-1 to produce 1.5.1-1+rpi1
X-Git-Tag: archive/raspbian/1.5.1-1+rpi1~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ede5c7f4a12c704cd6bb1f995b34a84eedd1c027;p=libgpiod.git

Merge version 1.4.1-4+rpi1 and 1.5.1-1 to produce 1.5.1-1+rpi1
---

ede5c7f4a12c704cd6bb1f995b34a84eedd1c027
diff --cc debian/changelog
index fd1c44d,21c66bf..e7d0c7b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,23 @@@
- libgpiod (1.4.1-4+rpi1) bullseye-staging; urgency=medium
++libgpiod (1.5.1-1+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>  Sat, 28 Mar 2020 03:23:21 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 17 Jul 2020 10:34:03 +0000
++
+ libgpiod (1.5.1-1) unstable; urgency=medium
+ 
+   * Import new upstream release
+   * Add salsa-ci.yml for enabling CI function in Salsa
+   * Update symbol table
+   * d/control:
+     - Bump debhelper-compat to 13
+   * d/copyright:
+     - Correct copyright information
+   * d/rules:
+     - Remove unneeded declaration
+ 
+  -- SZ Lin (林上智) <szlin@debian.org>  Wed, 01 Jul 2020 11:27:41 +0800
  
  libgpiod (1.4.1-4) unstable; urgency=medium
  
diff --cc debian/libgpiod2.symbols
index abfa664,5e2c843..f6c7b4e
--- a/debian/libgpiod2.symbols
+++ b/debian/libgpiod2.symbols
@@@ -85,7 -102,11 +102,10 @@@ libgpiodcxx.so.1 libgpiod2 #MINVER
   (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
+  (c++)"gpiod::line_request::FLAG_BIAS_DISABLE@Base" 1.5.1
+  (c++)"gpiod::line_request::FLAG_BIAS_PULL_UP@Base" 1.5.1
+  (c++)"gpiod::line_request::FLAG_BIAS_PULL_DOWN@Base" 1.5.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
@@@ -120,7 -147,10 +140,8 @@@
   (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++|arch-bits=64)"gpiod::line::set_config(int, std::bitset<32ul>, int) const@Base" 1.5.1
+  (c++|arch-bits=32)"gpiod::line::set_config(int, std::bitset<32u>, int) const@Base" 1.5.1
   (c++)"gpiod::line::active_state() const@Base" 1.1
   (c++)"gpiod::line::event_get_fd() const@Base" 1.1
   (c++)"gpiod::line::is_requested() const@Base" 1.1
@@@ -135,6 -170,8 +161,7 @@@
   (c++)"gpiod::line::get_chip() const@Base" 1.1
   (c++)"gpiod::line::direction() const@Base" 1.1
   (c++)"gpiod::line::get_value() const@Base" 1.1
 - (c++|arch-bits=64)"gpiod::line::set_flags(std::bitset<32ul>) const@Base" 1.5.1
+  (c++|arch-bits=32)"gpiod::line::set_flags(std::bitset<32u>) const@Base" 1.5.1
   (c++)"gpiod::line::set_value(int) const@Base" 1.1
   (c++)"gpiod::line::operator bool() const@Base" 1.1
   (c++)"gpiod::line::operator==(gpiod::line const&) const@Base" 1.1
@@@ -144,9 -181,14 +171,12 @@@
   (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++|arch-bits=64)"gpiod::line_bulk::set_config(int, std::bitset<32ul>, std::vector<int, std::allocator<int> >) const@Base" 1.5.1
+  (c++|arch-bits=32)"gpiod::line_bulk::set_config(int, std::bitset<32u>, std::vector<int, std::allocator<int> >) const@Base" 1.5.1
   (c++)"gpiod::line_bulk::set_values(std::vector<int, std::allocator<int> > const&) const@Base" 1.1
+  (c++)"gpiod::line_bulk::set_direction_input() const@Base" 1.5.1
+  (c++)"gpiod::line_bulk::set_direction_output(std::vector<int, std::allocator<int> > const&) const@Base" 1.5.1
   (c++)"gpiod::line_bulk::size() const@Base" 1.1
   (c++)"gpiod::line_bulk::empty() const@Base" 1.1
   (c++)"gpiod::line_bulk::release() const@Base" 1.1
@@@ -155,21 -197,26 +185,22 @@@
   (c++)"gpiod::line_bulk::iterator::operator==(gpiod::line_bulk::iterator const&) const@Base" 1.1
   (c++)"gpiod::line_bulk::iterator::operator!=(gpiod::line_bulk::iterator const&) const@Base" 1.1
   (c++)"gpiod::line_bulk::iterator::operator->() const@Base" 1.1
 - (c++|arch-bits=64)"gpiod::line_bulk::set_flags(std::bitset<32ul>) const@Base" 1.5.1
+  (c++|arch-bits=32)"gpiod::line_bulk::set_flags(std::bitset<32u>) const@Base" 1.5.1
   (c++)"gpiod::line_bulk::operator bool() const@Base" 1.1
   (c++)"gpiod::line_bulk::operator!() const@Base" 1.1
   (c++)"gpiod::line_iter::operator*() const@Base" 1.1
   (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::_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++|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 int)@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