Merge lp:~thomas-voss/process-cpp/bump-so-name-and-major-version into lp:process-cpp

[Thomas Voß]

Prepare for transition to GCC 4.9.

Prepare for transition to GCC 4.9.

[Colin Watson (cjwatson)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:53
http://jenkins.qa.ubuntu.com/job/process-cpp-ci/65/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/process-cpp-utopic-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/process-cpp-utopic-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/process-cpp-utopic-armhf-ci/4/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/process-cpp-utopic-i386-ci/4

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/process-cpp-ci/65/rebuild

review: Approve (continuous-integration)

[Steve Langasek (vorlon)]

This branch was superseded by lp:~thomas-voss/process-cpp/explicit-gcc-version, which has in turn been superseded by lp:~vorlon/process-cpp/explicit-gcc-version.

review: Disapprove

Unmerged revisions

53. By Thomas Voß on 2014-06-17

Prepare for transition to GCC 4.9.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-05-21 16:56:20 +0000
+++ CMakeLists.txt	2014-06-17 11:38:54 +0000
@@ -56,9 +56,9 @@
   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 1)
+set(PROCESS_CPP_VERSION_MAJOR 2)
 set(PROCESS_CPP_VERSION_MINOR 0)
-set(PROCESS_CPP_VERSION_PATCH 1)
+set(PROCESS_CPP_VERSION_PATCH 0)
 
 include(CTest)
 

=== modified file 'debian/control'
--- debian/control	2014-03-24 17:12:32 +0000
+++ debian/control	2014-06-17 11:38:54 +0000
@@ -1,9 +1,13 @@
 Source: process-cpp
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
+# We rely on C++11 features, and to prevent from ABI breaks
+# in libstdc++ causing us issues, we explicitly select a G++
+# version.
 Build-Depends: cmake,
                debhelper (>= 9),
                doxygen,
+               g++-4.9,
                google-mock,
                graphviz,
                libboost-dev,
@@ -19,7 +23,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-cpp1
+Package: libprocess-cpp2
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends},
@@ -35,7 +39,7 @@
 Architecture: any
 Multi-Arch: same
 Recommends: libprocess-cpp-doc,
-Depends: libprocess-cpp1 (= ${binary:Version}),
+Depends: libprocess-cpp2 (= ${binary:Version}),
          ${misc:Depends},
          libproperties-cpp-dev,
 Description: C++11 library for handling processes - dev headers and libraries

=== renamed file 'debian/libprocess-cpp1.install' => 'debian/libprocess-cpp2.install'
=== renamed file 'debian/libprocess-cpp1.symbols' => 'debian/libprocess-cpp2.symbols'
--- debian/libprocess-cpp1.symbols	2014-05-22 09:49:50 +0000
+++ debian/libprocess-cpp2.symbols	2014-06-17 11:38:54 +0000
@@ -1,4 +1,4 @@
-libprocess-cpp.so.1 libprocess-cpp1 #MINVER#
+libprocess-cpp.so.2 libprocess-cpp2 #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

=== modified file 'debian/rules'
--- debian/rules	2013-10-21 12:07:28 +0000
+++ debian/rules	2014-06-17 11:38:54 +0000
@@ -1,7 +1,17 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+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
+
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
 %:
 	dh $@ --fail-missing
+
+override_dh_auto_configure:
+	dh_auto_configure -- -DCMAKE_C_COMPILER=$(CC) -DCMAKE_CXX_COMPILER=$(CXX)