net-cpp

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

  1. fix-1452333-take-2
  2. Merge into trunk
Proposed by Thomas Voß
Status: Needs review
Proposed branch: lp:~thomas-voss/net-cpp/fix-1452333-take-2
Merge into: lp:net-cpp
Diff against target: 149 lines (+30/-34)
5 files modified
CMakeLists.txt (+2/-2)
debian/changelog (+12/-0)
debian/control (+3/-7)
debian/libnet-cpp2.symbols (+12/-20)
debian/rules (+1/-5)
To merge this branch: bzr merge lp:~thomas-voss/net-cpp/fix-1452333-take-2
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team Pending
Review via email: mp+265310@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
lp:~thomas-voss/net-cpp/fix-1452333-take-2 updated
51. By Thomas Voß

Bump version.

52. By Thomas Voß

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

Unmerged revisions

52. By Thomas Voß

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

51. By Thomas Voß

Bump version.

50. By Thomas Voß

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
26set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Werror -Wall -fno-strict-aliasing -fvisibility=hidden -fvisibility-inlines-hidden -pedantic -Wextra")26set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Werror -Wall -fno-strict-aliasing -fvisibility=hidden -fvisibility-inlines-hidden -pedantic -Wextra")
27set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")27set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
2828
29set(NET_CPP_VERSION_MAJOR 1)29set(NET_CPP_VERSION_MAJOR 2)
30set(NET_CPP_VERSION_MINOR 2)30set(NET_CPP_VERSION_MINOR 0)
31set(NET_CPP_VERSION_PATCH 0)31set(NET_CPP_VERSION_PATCH 0)
3232
33include(CTest)33include(CTest)
3434
=== 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 @@
1net-cpp (2.0.0ubuntu1) wily; urgency=medium
2
3 * Bump version.
4
5 -- Thomas Voß <thomas.voss@canonical.com> Tue, 21 Jul 2015 11:44:30 +0200
6
7net-cpp (2.0.0) wily; urgency=medium
8
9 * Bump major revision to account for toolchain update. Fixes LP:#1452333.
10
11 -- Thomas Voß <thomas.voss@canonical.com> Mon, 20 Jul 2015 21:11:18 +0200
12
1net-cpp (1.2.0+15.04.20150415.2-0ubuntu1) vivid; urgency=medium13net-cpp (1.2.0+15.04.20150415.2-0ubuntu1) vivid; urgency=medium
214
3 [ Thomas Voß ]15 [ Thomas Voß ]
416
=== 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 @@
6 doxygen,6 doxygen,
7 google-mock,7 google-mock,
8 graphviz,8 graphviz,
9# We rely on C++11 features, and to prevent from ABI breaks
10# in libstdc++ causing us issues, we explicitly select a G++
11# version.
12 g++-4.9,
13 libboost-dev,9 libboost-dev,
14 libboost-serialization-dev,10 libboost-serialization-dev,
15 libboost-system-dev,11 libboost-system-dev,
16 libcurl4-openssl-dev,12 libcurl4-openssl-dev,
17 libjsoncpp-dev,13 libjsoncpp-dev,
18 libprocess-cpp-dev,14 libprocess-cpp-dev (>= 2.0.0),
19 pkg-config,15 pkg-config,
20 python-decorator,16 python-decorator,
21 python-flask,17 python-flask,
@@ -29,7 +25,7 @@
29Vcs-Bzr: https://code.launchpad.net/~phablet-team/net-cpp/trunk25Vcs-Bzr: https://code.launchpad.net/~phablet-team/net-cpp/trunk
30Vcs-Browser: https://bazaar.launchpad.net/~phablet-team/net-cpp/trunk/files26Vcs-Browser: https://bazaar.launchpad.net/~phablet-team/net-cpp/trunk/files
3127
32Package: libnet-cpp128Package: libnet-cpp2
33Architecture: any29Architecture: any
34Multi-Arch: same30Multi-Arch: same
35Pre-Depends: ${misc:Pre-Depends},31Pre-Depends: ${misc:Pre-Depends},
@@ -45,7 +41,7 @@
45Architecture: any41Architecture: any
46Multi-Arch: same42Multi-Arch: same
47Pre-Depends: ${misc:Pre-Depends},43Pre-Depends: ${misc:Pre-Depends},
48Depends: libnet-cpp1 (= ${binary:Version}),44Depends: libnet-cpp2 (= ${binary:Version}),
49 ${misc:Depends},45 ${misc:Depends},
50Description: C++11 library for networking purposes - runtime library46Description: C++11 library for networking purposes - runtime library
51 Net-Cpp is a simple and straightforward networking library for C++11.47 Net-Cpp is a simple and straightforward networking library for C++11.
5248
=== 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 @@
1libnet-cpp.so.1 libnet-cpp1 #MINVER#1libnet-cpp.so.2 libnet-cpp2 #MINVER#
2 (c++)"core::net::http::make_client()@Base" 0.0.1+14.10.201406112 (c++)"core::net::http::make_client()@Base" 0.0.1+14.10.20140611
3 (c++)"core::net::http::make_streaming_client()@Base" 1.1.0+15.04.20150305-0ubuntu13 (c++)"core::net::http::make_streaming_client()@Base" 1.1.0+15.04.20150305-0ubuntu1
4 (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.201408044 (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
5 (c++)"core::net::http::Client::uri_to_string(core::net::Uri const&) const@Base" 1.1.0+14.10.201408045 (c++)"core::net::http::Client::uri_to_string[abi:cxx11](core::net::Uri const&) const@Base" 1.1.0+14.10.20140804
6 (c++)"core::net::http::Client::Errors::HttpMethodNotSupported::HttpMethodNotSupported(core::net::http::Method, core::Location const&)@Base" 0.0.1+14.10.201406116 (c++)"core::net::http::Client::Errors::HttpMethodNotSupported::HttpMethodNotSupported(core::net::http::Method, core::Location const&)@Base" 0.0.1+14.10.20140611
7 (c++)"core::net::http::Client::Errors::HttpMethodNotSupported::~HttpMethodNotSupported()@Base" 0.0.1+14.10.201406117 (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
8 (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.201406118 (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
9 (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.201406119 (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
10 (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.2014061110 (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
11 (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.2014061111 (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
12 (c++)"core::net::http::Header::remove(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.0.1+14.10.2014061112 (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
13 (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.2014061113 (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
14 (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
15 (c++)"core::net::http::Request::Credentials::~Credentials()@Base" 0.0.1+14.10.20140611
16 (c++)"core::net::http::Request::Errors::AlreadyActive::AlreadyActive(core::Location const&)@Base" 0.0.1+14.10.2014061114 (c++)"core::net::http::Request::Errors::AlreadyActive::AlreadyActive(core::Location const&)@Base" 0.0.1+14.10.20140611
17 (c++)"core::net::http::Request::Errors::AlreadyActive::~AlreadyActive()@Base" 0.0.1+14.10.20140611
18 (c++)"core::net::http::Request::Handler::Handler(core::net::http::Request::Handler const&)@Base" 1.1.0+15.04.20141204
19 (c++)"core::net::http::Request::Handler::~Handler()@Base" 1.1.0+15.04.20141204
20 (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.2014061115 (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
21 (c++)"core::net::http::Request::Handler::on_response(std::function<void (core::net::http::Response const&)> const&)@Base" 0.0.1+14.10.2014061116 (c++)"core::net::http::Request::Handler::on_response(std::function<void (core::net::http::Response const&)> const&)@Base" 0.0.1+14.10.20140611
22 (c++)"core::net::http::Request::Handler::on_error(std::function<void (core::net::Error const&)> const&)@Base" 0.0.1+14.10.2014061117 (c++)"core::net::http::Request::Handler::on_error(std::function<void (core::net::Error const&)> const&)@Base" 0.0.1+14.10.20140611
23 (c++)"core::net::http::Response::~Response()@Base" 0.0.1+14.10.20140611
24 (c++)"core::net::http::operator<<(std::basic_ostream<char, std::char_traits<char> >&, core::net::http::Status)@Base" 0.0.1+14.10.2014061118 (c++)"core::net::http::operator<<(std::basic_ostream<char, std::char_traits<char> >&, core::net::http::Status)@Base" 0.0.1+14.10.20140611
25 (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.2014061119 (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
26 (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.2014061120 (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
27 (c++)"core::net::http::Request::Handler::on_progress() const@Base" 0.0.1+14.10.2014061121 (c++)"core::net::http::Request::Handler::on_progress() const@Base" 0.0.1+14.10.20140611
28 (c++)"core::net::http::Request::Handler::on_response() const@Base" 0.0.1+14.10.2014061122 (c++)"core::net::http::Request::Handler::on_response() const@Base" 0.0.1+14.10.20140611
29 (c++)"core::net::http::Request::Handler::on_error() const@Base" 0.0.1+14.10.2014061123 (c++)"core::net::http::Request::Handler::on_error() const@Base" 0.0.1+14.10.20140611
@@ -41,7 +35,5 @@
41 (c++)"vtable for core::net::http::Client@Base" 0.0.1+14.10.2014061135 (c++)"vtable for core::net::http::Client@Base" 0.0.1+14.10.20140611
42 (c++)"vtable for core::net::http::Header@Base" 0.0.1+14.10.2014061136 (c++)"vtable for core::net::http::Header@Base" 0.0.1+14.10.20140611
43 (c++)"vtable for core::net::http::Request::Errors::AlreadyActive@Base" 0.0.1+14.10.2014061137 (c++)"vtable for core::net::http::Request::Errors::AlreadyActive@Base" 0.0.1+14.10.20140611
44 (c++)"vtable for core::net::http::Request@Base" 0.0.1+14.10.20140611
45 (c++)"typeinfo for core::net::http::StreamingRequest@Base" 1.1.0+15.04.20150305-0ubuntu138 (c++)"typeinfo for core::net::http::StreamingRequest@Base" 1.1.0+15.04.20150305-0ubuntu1
46 (c++)"typeinfo name for core::net::http::StreamingRequest@Base" 1.1.0+15.04.20150305-0ubuntu139 (c++)"typeinfo name for core::net::http::StreamingRequest@Base" 1.1.0+15.04.20150305-0ubuntu1
47 (c++)"vtable for core::net::http::StreamingRequest@Base" 1.1.0+15.04.20150305-0ubuntu1
48\ No newline at end of file40\ No newline at end of file
4941
=== 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 @@
2# -*- makefile -*-2# -*- makefile -*-
33
4export DPKG_GENSYMBOLS_CHECK_LEVEL=44export DPKG_GENSYMBOLS_CHECK_LEVEL=4
5export DEB_CXXFLAGS_MAINT_APPEND = -Wno-error=unused-variable
56
6include /usr/share/dpkg/default.mk7include /usr/share/dpkg/default.mk
78
8# Explicitly selecting a G{CC,++}-version here to avoid accidental
9# ABI breaks introduced by toolchain updates.
10export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9
11export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9
12
13%:9%:
14 dh $@ --fail-missing10 dh $@ --fail-missing
1511

Subscribers

People subscribed via source and target branches