Merge lp:~ken-vandine/process-cpp/yakkety into lp:process-cpp

[Ken VanDine]

Getting trunk in sync with latest source in yakkety

Getting trunk in sync with latest source in yakkety

[Thomas Voß (thomas-voss)]

LGTM.

review: Approve

Unmerged revisions

55. By Ken VanDine on 2016-06-15

* No-change rebuild for boost soname change.
* Fix symbols file for s390x.
* Bump version.
* Bump major revision and so name to account for toolchain update.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-06-27 07:50:18 +0000
+++ CMakeLists.txt	2016-06-15 18:18:31 +0000
@@ -56,7 +56,7 @@
   SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -ftest-coverage -fprofile-arcs" )
 ENDIF(cmake_build_type_lower MATCHES coverage)
 
-set(PROCESS_CPP_VERSION_MAJOR 2)
+set(PROCESS_CPP_VERSION_MAJOR 3)
 set(PROCESS_CPP_VERSION_MINOR 0)
 set(PROCESS_CPP_VERSION_PATCH 0)
 

=== modified file 'debian/changelog'
--- debian/changelog	2014-07-18 12:29:36 +0000
+++ debian/changelog	2016-06-15 18:18:31 +0000
@@ -1,3 +1,27 @@
+process-cpp (3.0.1-0ubuntu3) yakkety; urgency=medium
+
+  * No-change rebuild for boost soname change.
+
+ -- Matthias Klose <[e-mail]>  Sat, 23 Apr 2016 18:48:36 +0000
+
+process-cpp (3.0.1-0ubuntu2) xenial; urgency=medium
+
+  * Fix symbols file for s390x.
+
+ -- Dimitri John Ledkov <[e-mail]>  Mon, 30 Nov 2015 23:06:31 +0000
+
+process-cpp (3.0.1-0ubuntu1) wily; urgency=medium
+
+  * Bump version.
+
+ -- Thomas Voß <[e-mail]>  Tue, 21 Jul 2015 11:45:34 +0200
+
+process-cpp (3.0.0) wily; urgency=medium
+
+  * Bump major revision and so name to account for toolchain update.
+
+ -- Thomas Voß <[e-mail]>  Mon, 20 Jul 2015 20:39:56 +0200
+
 process-cpp (2.0.0+14.10.20140718-0ubuntu1) utopic; urgency=medium
 
   [ Thomas Voß ]

=== modified file 'debian/control'
--- debian/control	2014-06-27 07:50:18 +0000
+++ debian/control	2016-06-15 18:18:31 +0000
@@ -6,10 +6,6 @@
                doxygen,
                google-mock,
                graphviz,
-# We rely on C++11 features, and to prevent from ABI breaks
-# in libstdc++ causing us issues, we explicitly select a G++
-# version.
-               g++-4.9,
                libboost-dev,
                libboost-iostreams-dev,
                libboost-system-dev,
@@ -23,7 +19,7 @@
 Vcs-Bzr: https://code.launchpad.net/~phablet-team/content-hub/trunk
 Vcs-Browser: https://bazaar.launchpad.net/~phablet-team/process-cpp/trunk/files
 
-Package: libprocess-cpp2
+Package: libprocess-cpp3
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends},
@@ -39,7 +35,7 @@
 Architecture: any
 Multi-Arch: same
 Recommends: libprocess-cpp-doc,
-Depends: libprocess-cpp2 (= ${binary:Version}),
+Depends: libprocess-cpp3 (= ${binary:Version}),
          ${misc:Depends},
          libproperties-cpp-dev,
 Description: C++11 library for handling processes - dev headers and libraries

=== renamed file 'debian/libprocess-cpp2.install' => 'debian/libprocess-cpp3.install'
=== renamed file 'debian/libprocess-cpp2.symbols' => 'debian/libprocess-cpp3.symbols'
--- debian/libprocess-cpp2.symbols	2014-07-12 06:30:21 +0000
+++ debian/libprocess-cpp3.symbols	2016-06-15 18:18:31 +0000
@@ -1,4 +1,4 @@
-libprocess-cpp.so.2 libprocess-cpp2 #MINVER#
+libprocess-cpp.so.3 libprocess-cpp3 #MINVER#
  (c++)"core::posix::Signalable::send_signal(core::posix::Signal, std::error_code&)@Base" 1.0.0+14.04.20140326.2
  (c++)"core::posix::Signalable::send_signal_or_throw(core::posix::Signal)@Base" 1.0.0+14.04.20140326.2
  (c++)"core::posix::ChildProcess::DeathObserver::create_once_with_signal_trap(std::shared_ptr<core::posix::SignalTrap>)@Base" 1.0.0+14.04.20140326.2
@@ -9,21 +9,21 @@
  (c++)"core::posix::ChildProcess::wait_for(core::posix::wait::Flags const&)@Base" 0.0.1+14.04.20140311
  (c++)"core::posix::ChildProcess::~ChildProcess()@Base" 1.0.0+14.04.20140326.2
  (c++)"core::posix::this_process::cin()@Base" 1.0.0+14.04.20140326.2
- (c++)"core::posix::this_process::env::get_or_throw(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.0.0+14.04.20140326.2
- (c++)"core::posix::this_process::env::set_or_throw(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.0.0+14.04.20140326.2
- (c++)"core::posix::this_process::env::unset_or_throw(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.0.0+14.04.20140326.2
- (c++)"core::posix::this_process::env::get(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.0.0+14.04.20140326.2
- (c++)"core::posix::this_process::env::set(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::error_code&)@Base" 1.0.0+14.04.20140326.2
- (c++)"core::posix::this_process::env::unset(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::error_code&)@Base" 1.0.0+14.04.20140326.2
- (c++)"core::posix::this_process::env::for_each(std::function<void (std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)> const&)@Base" 1.0.0+14.04.20140326.2
+ (c++)"core::posix::this_process::env::get_or_throw(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.0.0+14.04.20140326.2
+ (c++)"core::posix::this_process::env::set_or_throw(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&)@Base" 1.0.0+14.04.20140326.2
+ (c++)"core::posix::this_process::env::unset_or_throw(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.0.0+14.04.20140326.2
+ (c++)"core::posix::this_process::env::get(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&)@Base" 1.0.0+14.04.20140326.2
+ (c++)"core::posix::this_process::env::set(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&, std::error_code&)@Base" 1.0.0+14.04.20140326.2
+ (c++)"core::posix::this_process::env::unset(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::error_code&)@Base" 1.0.0+14.04.20140326.2
+ (c++)"core::posix::this_process::env::for_each(std::function<void (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&)> const&)@Base" 1.0.0+14.04.20140326.2
  (c++)"core::posix::this_process::cerr()@Base" 1.0.0+14.04.20140326.2
  (c++)"core::posix::this_process::cout()@Base" 1.0.0+14.04.20140326.2
  (c++)"core::posix::this_process::parent()@Base" 1.0.0+14.04.20140326.2
  (c++)"core::posix::this_process::instance()@Base" 1.0.0+14.04.20140326.2
  (c++)"core::posix::trap_signals_for_process(std::initializer_list<core::posix::Signal>)@Base" 1.0.0+14.04.20140326.2
  (c++)"core::posix::trap_signals_for_all_subsequent_threads(std::initializer_list<core::posix::Signal>)@Base" 1.0.0+14.04.20140326.2
- (c++)"core::posix::exec(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&, std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > const&, core::posix::StandardStream const&)@Base" 0.0.1+14.04.20140311
- (c++)"core::posix::exec(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&, std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > const&, core::posix::StandardStream const&, std::function<void ()> const&)@Base" 1.0.1+14.10.20140522
+ (c++)"core::posix::exec(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, 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&, std::map<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<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&, core::posix::StandardStream const&)@Base" 0.0.1+14.04.20140311
+ (c++)"core::posix::exec(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, 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&, std::map<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<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&, core::posix::StandardStream const&, std::function<void ()> const&)@Base" 1.0.1+14.10.20140522
  (c++)"core::posix::fork(std::function<core::posix::exit::Status ()> const&, core::posix::StandardStream const&)@Base" 0.0.1+14.04.20140311
  (c++)"core::posix::wait::operator|(core::posix::wait::Flags, core::posix::wait::Flags)@Base" 1.0.0+14.04.20140326.2
  (c++)"core::posix::linux::proc::process::OomScoreAdj::max_value()@Base" 1.0.0+14.04.20140326.2
@@ -44,11 +44,10 @@
  (c++)"core::posix::operator&(core::posix::StandardStream, core::posix::StandardStream)@Base" 1.0.0+14.04.20140326.2
  (c++)"core::posix::operator|(core::posix::StandardStream, core::posix::StandardStream)@Base" 1.0.0+14.04.20140326.2
  (c++)"core::testing::fork_and_run(std::function<core::posix::exit::Status ()> const&, std::function<core::posix::exit::Status ()> const&)@Base" 1.0.0+14.04.20140326.2
- (c++|arch=!amd64 !arm64 !ppc64el)"core::testing::CrossProcessSync::try_signal_ready_for(std::chrono::duration<long long, std::ratio<1ll, 1000ll> > const&)@Base" 0.0.1+14.04.20140311
- (c++|arch=amd64 arm64 ppc64el)"core::testing::CrossProcessSync::try_signal_ready_for(std::chrono::duration<long, std::ratio<1l, 1000l> > const&)@Base" 0.0.1+14.04.20140311
- (c++|arch=!amd64 !arm64 !ppc64el)"core::testing::CrossProcessSync::wait_for_signal_ready_for(std::chrono::duration<long long, std::ratio<1ll, 1000ll> > const&)@Base" 0.0.1+14.04.20140311
- (c++|arch=amd64 arm64 ppc64el)"core::testing::CrossProcessSync::wait_for_signal_ready_for(std::chrono::duration<long, std::ratio<1l, 1000l> > const&)@Base" 0.0.1+14.04.20140311
- (c++)"core::testing::CrossProcessSync::Error::Timeout::~Timeout()@Base" 1.0.0+14.04.20140326.2
+ (c++|arch=!amd64 !arm64 !ppc64el !s390x)"core::testing::CrossProcessSync::try_signal_ready_for(std::chrono::duration<long long, std::ratio<1ll, 1000ll> > const&)@Base" 0.0.1+14.04.20140311
+ (c++|arch=amd64 arm64 ppc64el s390x)"core::testing::CrossProcessSync::try_signal_ready_for(std::chrono::duration<long, std::ratio<1l, 1000l> > const&)@Base" 0.0.1+14.04.20140311
+ (c++|arch=!amd64 !arm64 !ppc64el !s390x)"core::testing::CrossProcessSync::wait_for_signal_ready_for(std::chrono::duration<long long, std::ratio<1ll, 1000ll> > const&)@Base" 0.0.1+14.04.20140311
+ (c++|arch=amd64 arm64 ppc64el s390x)"core::testing::CrossProcessSync::wait_for_signal_ready_for(std::chrono::duration<long, std::ratio<1l, 1000l> > const&)@Base" 0.0.1+14.04.20140311
  (c++)"core::testing::CrossProcessSync::CrossProcessSync(core::testing::CrossProcessSync const&)@Base" 1.0.0+14.04.20140326.2
  (c++)"core::testing::CrossProcessSync::CrossProcessSync()@Base" 1.0.0+14.04.20140326.2
  (c++)"core::testing::CrossProcessSync::CrossProcessSync(core::testing::CrossProcessSync const&)@Base" 0.0.1+14.04.20140311
@@ -75,9 +74,7 @@
  (c++)"typeinfo name for core::posix::ProcessGroup@Base" 0.0.1+14.04.20140311
  (c++)"typeinfo name for core::posix::Process@Base" 1.0.0+14.04.20140326.2
  (c++)"typeinfo name for core::testing::CrossProcessSync::Error::Timeout@Base" 0.0.1+14.04.20140311
- (c++)"vtable for core::posix::SignalTrap@Base" 1.0.0+14.04.20140326.2
  (c++)"vtable for core::posix::Signalable@Base" 1.0.0+14.04.20140326.2
- (c++)"vtable for core::posix::ChildProcess::DeathObserver@Base" 0.0.1+14.04.20140311
  (c++)"vtable for core::posix::ChildProcess@Base" 1.0.0+14.04.20140326.2
  (c++)"vtable for core::posix::ProcessGroup@Base" 0.0.1+14.04.20140311
  (c++)"vtable for core::posix::Process@Base" 1.0.0+14.04.20140326.2

=== modified file 'debian/rules'
--- debian/rules	2014-06-27 07:50:18 +0000
+++ debian/rules	2016-06-15 18:18:31 +0000
@@ -5,13 +5,5 @@
 
 include /usr/share/dpkg/default.mk
 
-# Explicitly selecting a G{CC,++}-version here to avoid accidental
-# ABI breaks introduced by toolchain updates.
-export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9
-export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9
-
 %:
 	dh $@ --fail-missing
-
-override_dh_auto_configure:
-	dh_auto_configure -- -DCMAKE_C_COMPILER=$(CC) -DCMAKE_CXX_COMPILER=$(CXX)