diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2024-12-23 22:08:57 +0100 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2024-12-23 22:08:57 +0100 |
| commit | 560ef5de0197a0ec1ac293cf91a983748a6b379b (patch) | |
| tree | 3df72175c164ad16782e805173018331ca6523c2 | |
| parent | e126f608c877b5febb1a43d01cb3c662c598e8f2 (diff) | |
symbols: Merge 2.9.19 and fix version for InsertErrno
Somehow InsertErrno was wrongly formatted as
symbol 0.8.11.4 1
and that caused dedup to miss-handle it. The 2.9.19 merge
fixes that but kept "1" as the version, change it to say
0.8.11.4 instead.
| -rw-r--r-- | debian/libapt-pkg6.0t64.symbols | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/libapt-pkg6.0t64.symbols b/debian/libapt-pkg6.0t64.symbols index c3e1865e3..ed22093c6 100644 --- a/debian/libapt-pkg6.0t64.symbols +++ b/debian/libapt-pkg6.0t64.symbols @@ -1310,6 +1310,7 @@ libapt-pkg.so.6.0 libapt-pkg6.0t64 #MINVER# (c++)"APT::Configuration::color(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@APTPKG_6.0" 2.9.17 (c++)"APT::Internal::FindGPGV[abi:cxx11](bool)@APTPKG_6.0" 2.9.17 (c++)"pkgTagSection::Write(FileFd&, pkgTagSection::WriteFlags, char const* const*, std::vector<pkgTagSection::Tag, std::allocator<pkgTagSection::Tag> > const&) const@APTPKG_6.0" 2.9.17 + (c++)"VerifyDetachedSignatureFile(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@APTPKG_6.0" 2.9.19 (arch=!armel !armhf|c++)"FTPMDTMStrToTime(char const*, long&)@APTPKG_6.0" 0.8.0 (arch=!armel !armhf|c++)"RFC1123StrToTime(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, long&)@APTPKG_6.0" 1.9.0 (arch=!armel !armhf|c++)"TimeRFC1123[abi:cxx11](long, bool)@APTPKG_6.0" 1.3~rc2 @@ -1327,11 +1328,10 @@ libapt-pkg.so.6.0 libapt-pkg6.0t64 #MINVER# (arch=armel armhf|c++)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, std::__va_list&, int, unsigned int&)@APTPKG_6.0" 0.8.11.4 (arch=arm64|c++)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, std::__va_list&, int, unsigned long&)@APTPKG_6.0" 0.8.11.4 (arch=amd64 s390x|c++)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, __va_list_tag (&) [1], int, unsigned long&)@APTPKG_6.0" 0.8.11.4 - (arch=riscv64|c++)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, void*&, int, unsigned long&)@APTPKG_6.0" 1 + (arch=mips64el riscv64|c++)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, void*&, int, unsigned long&)@APTPKG_6.0" 0.8.11.4 (arch=ppc64el|c++)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, char*&, int, unsigned long&)@APTPKG_6.0" 0.8.11.4 (arch=armel armhf i386|c++)"_strtabexpand(char*, unsigned int)@APTPKG_6.0" 0.8.0 (arch=!armel !armhf !i386|c++)"_strtabexpand(char*, unsigned long)@APTPKG_6.0" 0.8.0 (arch=armel armhf|c++)"FTPMDTMStrToTime(char const*, long long&)@APTPKG_6.0" 0.8.0 (arch=armel armhf|c++)"RFC1123StrToTime(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, long long&)@APTPKG_6.0" 1.9.0 - (arch=mips64el|c++)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, void*&, int, unsigned long&)@APTPKG_6.0 0.8.11.4" 1 (arch=armel armhf|c++)"TimeRFC1123[abi:cxx11](long long, bool)@APTPKG_6.0" 2.7.14 |