Merge lp:~thomas-voss/media-hub/explicit-gcc-version into lp:media-hub

[Thomas Voß]

Bump major revision and so name to account for toolchain update.

Bump major revision and so name to account for toolchain update.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:38
http://jenkins.qa.ubuntu.com/job/media-hub-ci/75/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-utopic-amd64-ci/17/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-utopic-armhf-ci/16/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-utopic-i386-ci/15/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/media-hub-ci/75/rebuild

review: Needs Fixing (continuous-integration)

[Colin Watson (cjwatson)]

review: Approve

[Steve Langasek (vorlon)]

Fails to build because the list of exported symbols doesn't match when built with g++4.9, as seen at
https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/landing-008/+build/6175722/+files/buildlog_ubuntu-utopic-amd64.media-hub_1.0.0%2B14.10.20140712-0ubuntu1_FAILEDTOBUILD.txt.gz

Superseded by https://code.launchpad.net/~vorlon/media-hub/explicit-gcc-version/+merge/226567

review: Disapprove

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-04-04 14:31:43 +0000
+++ CMakeLists.txt	2014-06-27 08:08:27 +0000
@@ -2,9 +2,9 @@
 
 project(ubuntu-media-hub)
 
-set(UBUNTU_MEDIA_HUB_VERSION_MAJOR 0)
+set(UBUNTU_MEDIA_HUB_VERSION_MAJOR 1)
 set(UBUNTU_MEDIA_HUB_VERSION_MINOR 0)
-set(UBUNTU_MEDIA_HUB_VERSION_PATCH 1)
+set(UBUNTU_MEDIA_HUB_VERSION_PATCH 0)
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wall -pedantic -Wextra -fPIC -pthread")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Werror -Wall -fno-strict-aliasing -pedantic -Wextra -fPIC -pthread")

=== modified file 'debian/changelog'
--- debian/changelog	2014-06-24 22:34:29 +0000
+++ debian/changelog	2014-06-27 08:08:27 +0000
@@ -1,3 +1,9 @@
+media-hub (1.0.0) UNRELEASED; urgency=medium
+
+  * Bump major revision and so name to account for toolchain update. 
+
+ -- Thomas Voß <[e-mail]>  Fri, 27 Jun 2014 10:02:53 +0200
+
 media-hub (0.0.2+14.10.20140624.4-0ubuntu1) utopic; urgency=low
 
   [ Alberto Aguirre ]

=== modified file 'debian/control'
--- debian/control	2014-05-06 18:48:44 +0000
+++ debian/control	2014-06-27 08:08:27 +0000
@@ -11,12 +11,16 @@
                graphviz,
                gstreamer1.0-plugins-good,
                gstreamer1.0-fluendo-mp3,
+# 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 (>=1.53),
                libboost-filesystem-dev (>=1.53),
                libboost-program-options-dev (>=1.53),
                libboost-system-dev (>=1.53),
                libdbus-1-dev,
-               libdbus-cpp-dev (>= 3.0.0),
+               libdbus-cpp-dev (>= 4.0.0),
                libgoogle-glog-dev,
                libhybris-dev (>=0.1.0+git20131207+e452e83-0ubuntu13),
                libprocess-cpp-dev,
@@ -35,8 +39,8 @@
 Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~)
-Depends: libmedia-hub-common0 (= ${binary:Version}),
-         libmedia-hub-client0 (= ${binary:Version}),
+Depends: libmedia-hub-common1 (= ${binary:Version}),
+         libmedia-hub-client1 (= ${binary:Version}),
          ${misc:Depends},
          libproperties-cpp-dev,
 Suggests: libmedia-hub-doc
@@ -58,7 +62,7 @@
  .
  This package contains the runtime.
 
-Package: libmedia-hub-common0
+Package: libmedia-hub-common1
 Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~)
@@ -70,7 +74,7 @@
  .
  This package contains the common libraries.
 
-Package: libmedia-hub-client0
+Package: libmedia-hub-client1
 Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~)

=== renamed file 'debian/libmedia-hub-client0.install' => 'debian/libmedia-hub-client1.install'
=== renamed file 'debian/libmedia-hub-common0.install' => 'debian/libmedia-hub-common1.install'
=== renamed file 'debian/libmedia-hub-common0.symbols' => 'debian/libmedia-hub-common1.symbols'
--- debian/libmedia-hub-common0.symbols	2014-03-26 16:13:02 +0000
+++ debian/libmedia-hub-common1.symbols	2014-06-27 08:08:27 +0000
@@ -1,4 +1,4 @@
-libmedia-hub-common.so.0 libmedia-hub-common0 #MINVER#
+libmedia-hub-common.so.1 libmedia-hub-common1 #MINVER#
  (c++)"the_session_bus()@Base" 0.0.1
  (c++)"std::shared_ptr<core::dbus::Bus>::~shared_ptr()@Base" 0.0.1
  (c++)"std::shared_ptr<core::dbus::Bus>::~shared_ptr()@Base" 0.0.1

=== modified file 'debian/rules'
--- debian/rules	2014-05-06 09:13:43 +0000
+++ debian/rules	2014-06-27 08:08:27 +0000
@@ -6,9 +6,19 @@
 
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
+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 -- -B build 
 
+override_dh_auto_configure:
+	dh_auto_configure -- -DCMAKE_C_COMPILER=$(CC) -DCMAKE_CXX_COMPILER=$(CXX)
+
 override_dh_auto_test:
 	env -u LD_PRELOAD dh_auto_test