Merge lp:~rsalveti/unity/removing_dependency_gcc_46 into lp:unity

[Ricardo Salveti]

Doesn't need to depend on gcc 4.6 anymore (LP: #1044836).

Doesn't need to depend on gcc 4.6 anymore (LP: #1044836).

MR for Nux: https://code.launchpad.net/~rsalveti/nux/removing_dependency_gcc_46/+merge/134493

[Stephen M. Webb (bregma)]

Thanks.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-13 23:23:41 +0000
+++ debian/changelog	2012-11-15 16:19:19 +0000
@@ -12,6 +12,9 @@
   [ bschaefer ]
   * Ported to nux 4.0
 
+  [ Ricardo Salveti de Araujo ]
+  * Doesn't need to depend on gcc 4.6 anymore (LP: #1044836)
+
  -- Michael Terry <[e-mail]>  Tue, 06 Nov 2012 10:52:43 -0500
 
 unity (6.10.0-0ubuntu2) quantal-proposed; urgency=low

=== modified file 'debian/control'
--- debian/control	2012-11-13 23:23:41 +0000
+++ debian/control	2012-11-15 16:19:19 +0000
@@ -41,8 +41,6 @@
                libunity-dev (>= 6.5.2),
                libzeitgeist-dev (>= 0.3.18),
                libxfixes-dev (>= 1:5.0-4ubuntu4),
-               gcc-4.6,
-               g++-4.6,
                libgtest-dev,
                google-mock,
 Standards-Version: 3.9.3

=== modified file 'debian/rules'
--- debian/rules	2012-11-14 18:46:11 +0000
+++ debian/rules	2012-11-15 16:19:19 +0000
@@ -9,9 +9,6 @@
 
 DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
 
-export CC=gcc-4.6
-export CXX=g++-4.6
-
 CFLAGS=$(shell echo $$CFLAGS | sed -e 's/\-Wall//')
 
 CORE_ABIVERSION := $(shell sed -rn 's/^\#define[[:space:]]+CORE_ABIVERSION[[:space:]]+//p' /usr/include/compiz/core/abiversion.h )