Merge lp:~thomas-voss/media-hub/fix-1452331 into lp:media-hub

[Thomas Voß]

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

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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:150
http://jenkins.qa.ubuntu.com/job/media-hub-ci/366/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-amd64-ci/206/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/206/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-i386-ci/206/console

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

review: Needs Fixing (continuous-integration)

[Jim Hodapp (jhodapp)]

Looks good, thanks. I've gone ahead and merged this into my branch at lp:~jhodapp/media-hub/bg-playlists and will land this in that branch.

Unmerged revisions

150. By Thomas Voß on 2015-07-23

Rename *.install files to account for major version bump.

149. By Thomas Voß on 2015-07-23

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

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-04-10 16:21:16 +0000
+++ CMakeLists.txt	2015-07-23 08:08:22 +0000
@@ -2,8 +2,8 @@
 
 project(ubuntu-media-hub)
 
-set(UBUNTU_MEDIA_HUB_VERSION_MAJOR 3)
-set(UBUNTU_MEDIA_HUB_VERSION_MINOR 1)
+set(UBUNTU_MEDIA_HUB_VERSION_MAJOR 4)
+set(UBUNTU_MEDIA_HUB_VERSION_MINOR 0)
 set(UBUNTU_MEDIA_HUB_VERSION_PATCH 0)
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -fPIC -pthread")

=== modified file 'debian/changelog'
--- debian/changelog	2015-07-10 18:12:22 +0000
+++ debian/changelog	2015-07-23 08:08:22 +0000
@@ -1,3 +1,9 @@
+media-hub (4.0.0) wily; urgency=medium
+
+  * Bump major revision to account for toolchain update. Fixes LP:#1452331
+
+ -- Thomas Voß <[e-mail]>  Thu, 23 Jul 2015 08:47:21 +0200
+
 media-hub (3.1.0+15.10.20150710-0ubuntu1) wily; urgency=medium
 
   [ CI Train Bot ]

=== modified file 'debian/control'
--- debian/control	2015-03-12 11:38:32 +0000
+++ debian/control	2015-07-23 08:08:22 +0000
@@ -10,16 +10,12 @@
                google-mock,
                graphviz,
                gstreamer1.0-plugins-good,
-# 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 (>= 4.3.0),
+               libdbus-cpp-dev (>= 5.0.0),
                libgoogle-glog-dev,
                libhybris-dev (>=0.1.0+git20131207+e452e83-0ubuntu30),
                libprocess-cpp-dev,
@@ -39,8 +35,8 @@
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libmedia-hub-common3 (= ${binary:Version}),
-         libmedia-hub-client3 (= ${binary:Version}),
+Depends: libmedia-hub-common4 (= ${binary:Version}),
+         libmedia-hub-client4 (= ${binary:Version}),
          ${misc:Depends},
          libproperties-cpp-dev,
 Suggests: libmedia-hub-doc
@@ -61,7 +57,7 @@
  .
  This package contains the runtime.
 
-Package: libmedia-hub-common3
+Package: libmedia-hub-common4
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends},
@@ -72,7 +68,7 @@
  .
  This package contains the common libraries.
 
-Package: libmedia-hub-client3
+Package: libmedia-hub-client4
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends},

=== renamed file 'debian/libmedia-hub-client3.install' => 'debian/libmedia-hub-client4.install'
=== removed file 'debian/libmedia-hub-common3.symbols'
--- debian/libmedia-hub-common3.symbols	2014-11-26 12:45:39 +0000
+++ debian/libmedia-hub-common3.symbols	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-libmedia-hub-common.so.3 libmedia-hub-common3 #MINVER#
- (c++)"core::ubuntu::media::the_session_bus()@Base" 2.0.0+14.10.20140910.2

=== renamed file 'debian/libmedia-hub-common3.install' => 'debian/libmedia-hub-common4.install'
=== modified file 'debian/rules'
--- debian/rules	2015-01-09 17:17:57 +0000
+++ debian/rules	2015-07-23 08:08:22 +0000
@@ -8,17 +8,9 @@
 
 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 --parallel -- -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