Merge lp:~thomas-voss/net-cpp/fix-1452333-take-2 into lp:net-cpp

[Thomas Voß]

Bump major revision to account for toolchain update. Fixes lp:1452333.

Bump major revision to account for toolchain update. Fixes lp:1452333.

[lp:~thomas-voss/net-cpp/fix-1452333-take-2]

51. By Thomas Voß on 2015-07-21

Bump version.

52. By Thomas Voß on 2015-07-21

Bump major revision to account for toolchain update. Fixes LP:#1452333.

Unmerged revisions

52. By Thomas Voß on 2015-07-21

Bump major revision to account for toolchain update. Fixes LP:#1452333.

51. By Thomas Voß on 2015-07-21

Bump version.

50. By Thomas Voß on 2015-07-20

Bump major revision to account for toolchain update. Fixes lp:1452333.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-04-01 06:23:30 +0000
+++ CMakeLists.txt	2015-07-21 09:56:51 +0000
@@ -26,8 +26,8 @@
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Werror -Wall -fno-strict-aliasing -fvisibility=hidden -fvisibility-inlines-hidden -pedantic -Wextra")
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
 
-set(NET_CPP_VERSION_MAJOR 1)
-set(NET_CPP_VERSION_MINOR 2)
+set(NET_CPP_VERSION_MAJOR 2)
+set(NET_CPP_VERSION_MINOR 0)
 set(NET_CPP_VERSION_PATCH 0)
 
 include(CTest)

=== modified file 'debian/changelog'
--- debian/changelog	2015-04-15 12:34:49 +0000
+++ debian/changelog	2015-07-21 09:56:51 +0000
@@ -1,3 +1,15 @@
+net-cpp (2.0.0ubuntu1) wily; urgency=medium
+
+  * Bump version.
+
+ -- Thomas Voß <[e-mail]>  Tue, 21 Jul 2015 11:44:30 +0200
+
+net-cpp (2.0.0) wily; urgency=medium
+
+  * Bump major revision to account for toolchain update. Fixes LP:#1452333.
+
+ -- Thomas Voß <[e-mail]>  Mon, 20 Jul 2015 21:11:18 +0200
+
 net-cpp (1.2.0+15.04.20150415.2-0ubuntu1) vivid; urgency=medium
 
   [ Thomas Voß ]

=== modified file 'debian/control'
--- debian/control	2015-02-25 10:27:29 +0000
+++ debian/control	2015-07-21 09:56:51 +0000
@@ -6,16 +6,12 @@
                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-serialization-dev,
                libboost-system-dev,
                libcurl4-openssl-dev,
                libjsoncpp-dev,
-               libprocess-cpp-dev,
+               libprocess-cpp-dev (>= 2.0.0),
                pkg-config,
                python-decorator,
                python-flask,
@@ -29,7 +25,7 @@
 Vcs-Bzr: https://code.launchpad.net/~phablet-team/net-cpp/trunk
 Vcs-Browser: https://bazaar.launchpad.net/~phablet-team/net-cpp/trunk/files
 
-Package: libnet-cpp1
+Package: libnet-cpp2
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends},
@@ -45,7 +41,7 @@
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends},
-Depends: libnet-cpp1 (= ${binary:Version}),
+Depends: libnet-cpp2 (= ${binary:Version}),
          ${misc:Depends},
 Description: C++11 library for networking purposes - runtime library
  Net-Cpp is a simple and straightforward networking library for C++11.

=== renamed file 'debian/libnet-cpp1.install' => 'debian/libnet-cpp2.install'
=== renamed file 'debian/libnet-cpp1.symbols' => 'debian/libnet-cpp2.symbols'
--- debian/libnet-cpp1.symbols	2015-03-23 16:24:27 +0000
+++ debian/libnet-cpp2.symbols	2015-07-21 09:56:51 +0000
@@ -1,29 +1,23 @@
-libnet-cpp.so.1 libnet-cpp1 #MINVER#
+libnet-cpp.so.2 libnet-cpp2 #MINVER#
  (c++)"core::net::http::make_client()@Base" 0.0.1+14.10.20140611
  (c++)"core::net::http::make_streaming_client()@Base" 1.1.0+15.04.20150305-0ubuntu1
- (c++)"core::net::make_uri(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::vector<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, 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> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > const&)@Base" 1.1.0+14.10.20140804
- (c++)"core::net::http::Client::uri_to_string(core::net::Uri const&) const@Base" 1.1.0+14.10.20140804
+ (c++)"core::net::make_uri(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::vector<std::pair<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::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > const&)@Base" 1.1.0+14.10.20140804
+ (c++)"core::net::http::Client::uri_to_string[abi:cxx11](core::net::Uri const&) const@Base" 1.1.0+14.10.20140804
  (c++)"core::net::http::Client::Errors::HttpMethodNotSupported::HttpMethodNotSupported(core::net::http::Method, core::Location const&)@Base" 0.0.1+14.10.20140611
- (c++)"core::net::http::Client::Errors::HttpMethodNotSupported::~HttpMethodNotSupported()@Base" 0.0.1+14.10.20140611
- (c++)"core::net::http::Client::post_form(core::net::http::Request::Configuration 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&)@Base" 0.0.1+14.10.20140611
- (c++)"core::net::http::Header::canonicalize_key(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.0.1+14.10.20140611
- (c++)"core::net::http::Header::add(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" 0.0.1+14.10.20140611
- (c++)"core::net::http::Header::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&)@Base" 0.0.1+14.10.20140611
- (c++)"core::net::http::Header::remove(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.0.1+14.10.20140611
- (c++)"core::net::http::Header::remove(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" 0.0.1+14.10.20140611
- (c++)"core::net::http::Header::enumerate(std::function<void (std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::set<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::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&)> const&) const@Base" 0.0.1+14.10.20140611
- (c++)"core::net::http::Request::Credentials::~Credentials()@Base" 0.0.1+14.10.20140611
+ (c++)"core::net::http::Client::post_form(core::net::http::Request::Configuration 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&)@Base" 0.0.1+14.10.20140611
+ (c++)"core::net::http::Header::canonicalize_key(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.0.1+14.10.20140611
+ (c++)"core::net::http::Header::add(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" 0.0.1+14.10.20140611
+ (c++)"core::net::http::Header::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&)@Base" 0.0.1+14.10.20140611
+ (c++)"core::net::http::Header::remove(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.0.1+14.10.20140611
+ (c++)"core::net::http::Header::remove(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" 0.0.1+14.10.20140611
+ (c++)"core::net::http::Header::enumerate(std::function<void (std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::set<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::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&)> const&) const@Base" 0.0.1+14.10.20140611
  (c++)"core::net::http::Request::Errors::AlreadyActive::AlreadyActive(core::Location const&)@Base" 0.0.1+14.10.20140611
- (c++)"core::net::http::Request::Errors::AlreadyActive::~AlreadyActive()@Base" 0.0.1+14.10.20140611
- (c++)"core::net::http::Request::Handler::Handler(core::net::http::Request::Handler const&)@Base" 1.1.0+15.04.20141204
- (c++)"core::net::http::Request::Handler::~Handler()@Base" 1.1.0+15.04.20141204
  (c++)"core::net::http::Request::Handler::on_progress(std::function<core::net::http::Request::Progress::Next (core::net::http::Request::Progress const&)> const&)@Base" 0.0.1+14.10.20140611
  (c++)"core::net::http::Request::Handler::on_response(std::function<void (core::net::http::Response const&)> const&)@Base" 0.0.1+14.10.20140611
  (c++)"core::net::http::Request::Handler::on_error(std::function<void (core::net::Error const&)> const&)@Base" 0.0.1+14.10.20140611
- (c++)"core::net::http::Response::~Response()@Base" 0.0.1+14.10.20140611
  (c++)"core::net::http::operator<<(std::basic_ostream<char, std::char_traits<char> >&, core::net::http::Status)@Base" 0.0.1+14.10.20140611
- (c++)"core::net::http::Header::has(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.0.1+14.10.20140611
- (c++)"core::net::http::Header::has(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" 0.0.1+14.10.20140611
+ (c++)"core::net::http::Header::has(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.0.1+14.10.20140611
+ (c++)"core::net::http::Header::has(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" 0.0.1+14.10.20140611
  (c++)"core::net::http::Request::Handler::on_progress() const@Base" 0.0.1+14.10.20140611
  (c++)"core::net::http::Request::Handler::on_response() const@Base" 0.0.1+14.10.20140611
  (c++)"core::net::http::Request::Handler::on_error() const@Base" 0.0.1+14.10.20140611
@@ -41,7 +35,5 @@
  (c++)"vtable for core::net::http::Client@Base" 0.0.1+14.10.20140611
  (c++)"vtable for core::net::http::Header@Base" 0.0.1+14.10.20140611
  (c++)"vtable for core::net::http::Request::Errors::AlreadyActive@Base" 0.0.1+14.10.20140611
- (c++)"vtable for core::net::http::Request@Base" 0.0.1+14.10.20140611
  (c++)"typeinfo for core::net::http::StreamingRequest@Base" 1.1.0+15.04.20150305-0ubuntu1
  (c++)"typeinfo name for core::net::http::StreamingRequest@Base" 1.1.0+15.04.20150305-0ubuntu1
- (c++)"vtable for core::net::http::StreamingRequest@Base" 1.1.0+15.04.20150305-0ubuntu1
\ No newline at end of file

=== modified file 'debian/rules'
--- debian/rules	2014-06-27 08:16:12 +0000
+++ debian/rules	2015-07-21 09:56:51 +0000
@@ -2,14 +2,10 @@
 # -*- makefile -*-
 
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
+export DEB_CXXFLAGS_MAINT_APPEND = -Wno-error=unused-variable
 
 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