From 1f47b972a89a0edf0c7acec950059de8064254a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 5 Aug 2017 10:40:31 +0200 Subject: Drop dh-autoreconf from both Build-Depends; Rebuild debian/libicap1.symbols.[i386|amd64]; Remove outdated debian/bitz-server.upstart --- debian/bitz-server.upstart | 7 ------- debian/changelog | 4 ++++ debian/control | 1 - debian/libicap1.symbols.amd64 | 2 -- debian/libicap1.symbols.i386 | 12 ++++++------ debian/rules | 2 +- 6 files changed, 11 insertions(+), 17 deletions(-) delete mode 100644 debian/bitz-server.upstart diff --git a/debian/bitz-server.upstart b/debian/bitz-server.upstart deleted file mode 100644 index f0a3360..0000000 --- a/debian/bitz-server.upstart +++ /dev/null @@ -1,7 +0,0 @@ -description "bitz ICAP server" -author "Cameron Norman " - -start on runlevel [2345] -stop on runlevel [016] - -exec /usr/sbin/bitz-server /etc/bitz/bitz-server.conf diff --git a/debian/changelog b/debian/changelog index 93a61da..929357b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,11 +7,15 @@ bitz-server (1.0.0-4) UNRELEASED; urgency=medium - Change debian/compat to 10. - Bump minimum debhelper version in debian/control to >= 10. - Remove now useless autoreconf from debian/rules. + - Drop dh-autoreconf from both Build-Depends. * debina/control: - Add missing dependency lsb-base. * Use the automatic debug symbol packages: - Remove bitz-server-dbg and libicap1-dbg section from debian/control. - Remove override_dh_strip from debian/rules. + * Rebuild debian/libicap1.symbols.[i386|amd64] to fix a FTBFS + (Closes: #853331). + * Remove outdated debian/bitz-server.upstart. -- Jörg Frings-Fürst Sun, 30 Apr 2017 11:12:37 +0200 diff --git a/debian/control b/debian/control index 63ac6ca..d0c92b1 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,6 @@ Maintainer: Jörg Frings-Fürst Uploaders: Uditha Atukorala Build-Depends: debhelper (>= 10), - dh-autoreconf, dh-python, dh-systemd (>= 1.5), libconfig++-dev, diff --git a/debian/libicap1.symbols.amd64 b/debian/libicap1.symbols.amd64 index 70abc92..4128eba 100644 --- a/debian/libicap1.symbols.amd64 +++ b/debian/libicap1.symbols.amd64 @@ -102,11 +102,9 @@ libicap.so.1 libicap1 #MINVER# (c++)"std::_Rb_tree, std::allocator >, std::pair, std::allocator > const, int>, std::_Select1st, std::allocator > const, int> >, std::less, std::allocator > >, std::allocator, std::allocator > const, int> > >::_M_get_insert_hint_unique_pos(std::_Rb_tree_const_iterator, std::allocator > const, int> >, std::__cxx11::basic_string, std::allocator > const&)@Base" 1.0.0 (c++)"std::_Rb_tree, std::allocator >, std::pair, std::allocator > const, int>, std::_Select1st, std::allocator > const, int> >, std::less, std::allocator > >, std::allocator, std::allocator > const, int> > >::find(std::__cxx11::basic_string, std::allocator > const&)@Base" 1.0.0 (c++)"std::_Rb_tree, std::allocator >, std::pair, std::allocator > const, int>, std::_Select1st, std::allocator > const, int> >, std::less, std::allocator > >, std::allocator, std::allocator > const, int> > >::_M_erase(std::_Rb_tree_node, std::allocator > const, int> >*)@Base" 1.0.0 - (c++)"void std::__make_heap<__gnu_cxx::__normal_iterator, std::allocator >, int>*, std::vector, std::allocator >, int>, std::allocator, std::allocator >, int> > > >, __gnu_cxx::__ops::_Iter_comp_iter >(__gnu_cxx::__normal_iterator, std::allocator >, int>*, std::vector, std::allocator >, int>, std::allocator, std::allocator >, int> > > >, __gnu_cxx::__normal_iterator, std::allocator >, int>*, std::vector, std::allocator >, int>, std::allocator, std::allocator >, int> > > >, __gnu_cxx::__ops::_Iter_comp_iter)@Base" 1.0.0 (c++)"void std::__adjust_heap<__gnu_cxx::__normal_iterator, std::allocator >, int>*, std::vector, std::allocator >, int>, std::allocator, std::allocator >, int> > > >, long, std::pair, std::allocator >, int>, __gnu_cxx::__ops::_Iter_comp_iter >(__gnu_cxx::__normal_iterator, std::allocator >, int>*, std::vector, std::allocator >, int>, std::allocator, std::allocator >, int> > > >, long, long, std::pair, std::allocator >, int>, __gnu_cxx::__ops::_Iter_comp_iter)@Base" 1.0.0 (c++)"void std::__insertion_sort<__gnu_cxx::__normal_iterator, std::allocator >, int>*, std::vector, std::allocator >, int>, std::allocator, std::allocator >, int> > > >, __gnu_cxx::__ops::_Iter_comp_iter >(__gnu_cxx::__normal_iterator, std::allocator >, int>*, std::vector, std::allocator >, int>, std::allocator, std::allocator >, int> > > >, __gnu_cxx::__normal_iterator, std::allocator >, int>*, std::vector, std::allocator >, int>, std::allocator, std::allocator >, int> > > >, __gnu_cxx::__ops::_Iter_comp_iter)@Base" 1.0.0 (c++)"void std::__introsort_loop<__gnu_cxx::__normal_iterator, std::allocator >, int>*, std::vector, std::allocator >, int>, std::allocator, std::allocator >, int> > > >, long, __gnu_cxx::__ops::_Iter_comp_iter >(__gnu_cxx::__normal_iterator, std::allocator >, int>*, std::vector, std::allocator >, int>, std::allocator, std::allocator >, int> > > >, __gnu_cxx::__normal_iterator, std::allocator >, int>*, std::vector, std::allocator >, int>, std::allocator, std::allocator >, int> > > >, long, __gnu_cxx::__ops::_Iter_comp_iter)@Base" 1.0.0 - (c++)"void std::__unguarded_linear_insert<__gnu_cxx::__normal_iterator, std::allocator >, int>*, std::vector, std::allocator >, int>, std::allocator, std::allocator >, int> > > >, __gnu_cxx::__ops::_Val_comp_iter >(__gnu_cxx::__normal_iterator, std::allocator >, int>*, std::vector, std::allocator >, int>, std::allocator, std::allocator >, int> > > >, __gnu_cxx::__ops::_Val_comp_iter)@Base" 1.0.0 (c++)"__gnu_cxx::__normal_iterator, std::allocator > > std::__find_if<__gnu_cxx::__normal_iterator, std::allocator > >, __gnu_cxx::__ops::_Iter_pred > > >(__gnu_cxx::__normal_iterator, std::allocator > >, __gnu_cxx::__normal_iterator, std::allocator > >, __gnu_cxx::__ops::_Iter_pred > >, std::random_access_iterator_tag)@Base" 1.0.0 (c++)"typeinfo for icap::RequestHeader@Base" 1.0.0 (c++)"typeinfo for icap::ResponseHeader@Base" 1.0.0 diff --git a/debian/libicap1.symbols.i386 b/debian/libicap1.symbols.i386 index 213a9b0..c9aed61 100644 --- a/debian/libicap1.symbols.i386 +++ b/debian/libicap1.symbols.i386 @@ -47,6 +47,10 @@ libicap.so.1 libicap1 #MINVER# (c++)"icap::Header::value(std::__cxx11::basic_string, std::allocator > const&)@Base" 1.0.0 (c++)"icap::Header::attach(std::__cxx11::basic_string, std::allocator >, std::__cxx11::basic_string, std::allocator >)@Base" 1.0.0 (c++)"icap::Header::remove(std::__cxx11::basic_string, std::allocator >)@Base" 1.0.0 + (c++)"void std::vector, std::allocator >, std::allocator, std::allocator > > >::_M_realloc_insert, std::allocator > >(__gnu_cxx::__normal_iterator, std::allocator >*, std::vector, std::allocator >, std::allocator, std::allocator > > > >, std::__cxx11::basic_string, std::allocator >&&)@Base" 1.0.0 + (c++)"std::_Rb_tree, std::allocator >, std::pair, std::allocator > const, std::__cxx11::basic_string, std::allocator > >, std::_Select1st, std::allocator > const, std::__cxx11::basic_string, std::allocator > > >, std::less, std::allocator > >, std::allocator, std::allocator > const, std::__cxx11::basic_string, std::allocator > > > >::operator=(std::_Rb_tree, std::allocator >, std::pair, std::allocator > const, std::__cxx11::basic_string, std::allocator > >, std::_Select1st, std::allocator > const, std::__cxx11::basic_string, std::allocator > > >, std::less, std::allocator > >, std::allocator, std::allocator > const, std::__cxx11::basic_string, std::allocator > > > > const&)@Base" 1.0.0 + (c++)"void std::__make_heap<__gnu_cxx::__normal_iterator, std::allocator >, int>*, std::vector, std::allocator >, int>, std::allocator, std::allocator >, int> > > >, __gnu_cxx::__ops::_Iter_comp_iter >(__gnu_cxx::__normal_iterator, std::allocator >, int>*, std::vector, std::allocator >, int>, std::allocator, std::allocator >, int> > > >, __gnu_cxx::__normal_iterator, std::allocator >, int>*, std::vector, std::allocator >, int>, std::allocator, std::allocator >, int> > > >, __gnu_cxx::__ops::_Iter_comp_iter&)@Base" 1.0.0 + (c++)"void std::__adjust_heap<__gnu_cxx::__normal_iterator, std::allocator >, int>*, std::vector, std::allocator >, int>, std::allocator, std::allocator >, int> > > >, int, std::pair, std::allocator >, int>, __gnu_cxx::__ops::_Iter_comp_iter >(__gnu_cxx::__normal_iterator, std::allocator >, int>*, std::vector, std::allocator >, int>, std::allocator, std::allocator >, int> > > >, int, int, std::pair, std::allocator >, int>, __gnu_cxx::__ops::_Iter_comp_iter)@Base" 1.0.0 (c++)"icap::Header::Header()@Base" 1.0.0 (c++)"icap::Header::Header()@Base" 1.0.0 (c++)"icap::Header::~Header()@Base" 1.0.0 @@ -81,7 +85,6 @@ libicap.so.1 libicap1 #MINVER# (c++)"icap::Request::payload() const@Base" 1.0.0 (c++)"icap::Response::header() const@Base" 1.0.0 (c++)"icap::Response::payload() const@Base" 1.0.0 - (c++)"void std::vector, std::allocator >, std::allocator, std::allocator > > >::_M_emplace_back_aux, std::allocator > >(std::__cxx11::basic_string, std::allocator >&&)@Base" 1.0.0 (c++)"std::vector, std::allocator >, std::allocator, std::allocator > > >::~vector()@Base" 1.0.0 (c++)"std::vector, std::allocator >, std::allocator, std::allocator > > >::~vector()@Base" 1.0.0 (c++)"std::vector, std::allocator >, int>, std::allocator, std::allocator >, int> > >::~vector()@Base" 1.0.0 @@ -99,11 +102,8 @@ libicap.so.1 libicap1 #MINVER# (c++)"std::_Rb_tree, std::allocator >, std::pair, std::allocator > const, int>, std::_Select1st, std::allocator > const, int> >, std::less, std::allocator > >, std::allocator, std::allocator > const, int> > >::_M_get_insert_unique_pos(std::__cxx11::basic_string, std::allocator > const&)@Base" 1.0.0 (c++)"std::_Rb_tree, std::allocator >, std::pair, std::allocator > const, int>, std::_Select1st, std::allocator > const, int> >, std::less, std::allocator > >, std::allocator, std::allocator > const, int> > >::find(std::__cxx11::basic_string, std::allocator > const&)@Base" 1.0.0 (c++)"std::_Rb_tree, std::allocator >, std::pair, std::allocator > const, int>, std::_Select1st, std::allocator > const, int> >, std::less, std::allocator > >, std::allocator, std::allocator > const, int> > >::_M_erase(std::_Rb_tree_node, std::allocator > const, int> >*)@Base" 1.0.0 - (c++)"void std::__make_heap<__gnu_cxx::__normal_iterator, std::allocator >, int>*, std::vector, std::allocator >, int>, std::allocator, std::allocator >, int> > > >, __gnu_cxx::__ops::_Iter_comp_iter >(__gnu_cxx::__normal_iterator, std::allocator >, int>*, std::vector, std::allocator >, int>, std::allocator, std::allocator >, int> > > >, __gnu_cxx::__normal_iterator, std::allocator >, int>*, std::vector, std::allocator >, int>, std::allocator, std::allocator >, int> > > >, __gnu_cxx::__ops::_Iter_comp_iter)@Base" 1.0.0 - (c++)"void std::__adjust_heap<__gnu_cxx::__normal_iterator, std::allocator >, int>*, std::vector, std::allocator >, int>, std::allocator, std::allocator >, int> > > >, int, std::pair, std::allocator >, int>, __gnu_cxx::__ops::_Iter_comp_iter >(__gnu_cxx::__normal_iterator, std::allocator >, int>*, std::vector, std::allocator >, int>, std::allocator, std::allocator >, int> > > >, int, int, std::pair, std::allocator >, int>, __gnu_cxx::__ops::_Iter_comp_iter)@Base" 1.0.0 - (c++)"void std::__insertion_sort<__gnu_cxx::__normal_iterator, std::allocator >, int>*, std::vector, std::allocator >, int>, std::allocator, std::allocator >, int> > > >, __gnu_cxx::__ops::_Iter_comp_iter >(__gnu_cxx::__normal_iterator, std::allocator >, int>*, std::vector, std::allocator >, int>, std::allocator, std::allocator >, int> > > >, __gnu_cxx::__normal_iterator, std::allocator >, int>*, std::vector, std::allocator >, int>, std::allocator, std::allocator >, int> > > >, __gnu_cxx::__ops::_Iter_comp_iter)@Base" 1.0.0 - (c++)"void std::__introsort_loop<__gnu_cxx::__normal_iterator, std::allocator >, int>*, std::vector, std::allocator >, int>, std::allocator, std::allocator >, int> > > >, int, __gnu_cxx::__ops::_Iter_comp_iter >(__gnu_cxx::__normal_iterator, std::allocator >, int>*, std::vector, std::allocator >, int>, std::allocator, std::allocator >, int> > > >, __gnu_cxx::__normal_iterator, std::allocator >, int>*, std::vector, std::allocator >, int>, std::allocator, std::allocator >, int> > > >, int, __gnu_cxx::__ops::_Iter_comp_iter)@Base" 1.0.0 - (c++)"void std::__unguarded_linear_insert<__gnu_cxx::__normal_iterator, std::allocator >, int>*, std::vector, std::allocator >, int>, std::allocator, std::allocator >, int> > > >, __gnu_cxx::__ops::_Val_comp_iter >(__gnu_cxx::__normal_iterator, std::allocator >, int>*, std::vector, std::allocator >, int>, std::allocator, std::allocator >, int> > > >, __gnu_cxx::__ops::_Val_comp_iter)@Base" 1.0.0 + (c++)"void std::__insertion_sort<__gnu_cxx::__normal_iterator, std::allocator >, int>*, std::vector, std::allocator >, int>, std::allocator, std::allocator >, int> > > >, (c++)"__gnu_cxx::__ops::_Iter_comp_iter >(__gnu_cxx::__normal_iterator, std::allocator >, int>*, std::vector, std::allocator >, int>, std::allocator, std::allocator >, int> > > >, __gnu_cxx::__normal_iterator, std::allocator >, int>*, std::vector, std::allocator >, int>, std::allocator, std::allocator >, int> > > >, __gnu_cxx::__ops::_Iter_comp_iter)@Base"" 1.0.0 + (c++)"void std::__introsort_loop<__gnu_cxx::__normal_iterator, std::allocator >, int>*, std::vector, std::allocator >, int>, std::allocator, std::allocator >, int> > > >, int, (c++)"__gnu_cxx::__ops::_Iter_comp_iter >(__gnu_cxx::__normal_iterator, std::allocator >, int>*, std::vector, std::allocator >, int>, std::allocator, std::allocator >, int> > > >, __gnu_cxx::__normal_iterator, std::allocator >, int>*, std::vector, std::allocator >, int>, std::allocator, std::allocator >, int> > > >, int, __gnu_cxx::__ops::_Iter_comp_iter)@Base"" 1.0.0 (c++)"typeinfo for icap::RequestHeader@Base" 1.0.0 (c++)"typeinfo for icap::ResponseHeader@Base" 1.0.0 (c++)"typeinfo for icap::Header@Base" 1.0.0 diff --git a/debian/rules b/debian/rules index 2c79d98..abe80c4 100755 --- a/debian/rules +++ b/debian/rules @@ -19,7 +19,7 @@ VERSION = $(shell head -n1 debian/changelog | sed -e 's/.*(//;s/-.*).*//;s/\+/\- #export LDFLAGS += -fPIC # -# end of gcc-6 test +# end of gcc-7 test # -- cgit v1.2.3