Merge lp:~stolowski/unity-scope-mediascanner/no-gcc49 into lp:unity-scope-mediascanner

[Paweł Stołowski]

Drop explicit g++4.9 dependency

Drop explicit g++4.9 dependency

[James Henstridge (jamesh)]

You will need to make some extra changes to debian/rules to actually use a non-4.9 compiler. With this change as is, the package will stop building once the default is changed.

review: Needs Fixing

[lp:~stolowski/unity-scope-mediascanner/no-gcc49]

256. By Paweł Stołowski on 2015-07-16

Remove explicit g++ version from debian/rules

[James Henstridge (jamesh)]

Looks good.

review: Approve

=== modified file 'debian/control'
--- debian/control	2015-04-29 09:52:33 +0000
+++ debian/control	2015-07-16 08:12:14 +0000
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: cmake (>= 2.8),
 # To avoid GCC 4.8/4.9 ABI break issues.
-               g++-4.9,
+               g++,
                debhelper (>= 9),
                google-mock,
                intltool,

=== modified file 'debian/rules'
--- debian/rules	2014-06-27 06:52:36 +0000
+++ debian/rules	2015-07-16 08:12:14 +0000
@@ -4,10 +4,5 @@
 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 --parallel