diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2015-07-27 18:06:28 +0000 |
|---|---|---|
| committer | CI Train Bot <ci-train-bot@canonical.com> | 2015-07-27 18:06:28 +0000 |
| commit | 65713ad8610f67df3232bea417108551ab2d3ae0 (patch) | |
| tree | b3c77d94c65efbdc8e1a4523c6e52e0b1e96f5c1 /debian | |
| parent | 9bcea949dc0d92f311d706ed5d599e16bbe9c961 (diff) | |
| parent | 83abb126052cc69e43804fb71222a93c80d0b3d3 (diff) | |
| download | ayatana-indicator-display-65713ad8610f67df3232bea417108551ab2d3ae0.tar.gz ayatana-indicator-display-65713ad8610f67df3232bea417108551ab2d3ae0.tar.bz2 ayatana-indicator-display-65713ad8610f67df3232bea417108551ab2d3ae0.zip | |
drop build-dependency on g++-4.9 Fixes: #1452323
Approved by: Pete Woods, PS Jenkins bot, Rodney Dawes
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | debian/rules | 5 |
2 files changed, 0 insertions, 7 deletions
diff --git a/debian/control b/debian/control index 87624ba..4f05f74 100644 --- a/debian/control +++ b/debian/control @@ -4,8 +4,6 @@ Priority: optional Maintainer: Charles Kerr <charles.kerr@canonical.com> Build-Depends: cmake, dbus, -# make g++ version explicit for ABI safety <https://wiki.ubuntu.com/cpp-11> - g++-4.9, libglib2.0-dev (>= 2.36), libproperties-cpp-dev, # for coverage reports diff --git a/debian/rules b/debian/rules index e39944a..c329b0a 100755 --- a/debian/rules +++ b/debian/rules @@ -1,10 +1,5 @@ #!/usr/bin/make -f -# Explicitly selecting a G{CC,++}-version here to avoid ABI breaks -# introduced by toolchain updates. <https://wiki.ubuntu.com/cpp-11> -export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9 -export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9 - %: dh $@ --with translations |