Unity

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

  1. removing_dependency_gcc_46
  2. Merge into trunk
Proposed by Ricardo Salveti
Status: Merged
Approved by: Stephen M. Webb
Approved revision: no longer in the source branch.
Merged at revision: 2899
Proposed branch: lp:~rsalveti/unity/removing_dependency_gcc_46
Merge into: lp:unity
Diff against target: 40 lines (+3/-5)
3 files modified
debian/changelog (+3/-0)
debian/control (+0/-2)
debian/rules (+0/-3)
To merge this branch: bzr merge lp:~rsalveti/unity/removing_dependency_gcc_46
Reviewer Review Type Date Requested Status
Stephen M. Webb (community) Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+134500@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Stephen M. Webb (bregma) wrote :

Thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
12 [ bschaefer ]12 [ bschaefer ]
13 * Ported to nux 4.013 * Ported to nux 4.0
1414
15 [ Ricardo Salveti de Araujo ]
16 * Doesn't need to depend on gcc 4.6 anymore (LP: #1044836)
17
15 -- Michael Terry <mterry@ubuntu.com> Tue, 06 Nov 2012 10:52:43 -050018 -- Michael Terry <mterry@ubuntu.com> Tue, 06 Nov 2012 10:52:43 -0500
1619
17unity (6.10.0-0ubuntu2) quantal-proposed; urgency=low20unity (6.10.0-0ubuntu2) quantal-proposed; urgency=low
1821
=== 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 @@
41 libunity-dev (>= 6.5.2),41 libunity-dev (>= 6.5.2),
42 libzeitgeist-dev (>= 0.3.18),42 libzeitgeist-dev (>= 0.3.18),
43 libxfixes-dev (>= 1:5.0-4ubuntu4),43 libxfixes-dev (>= 1:5.0-4ubuntu4),
44 gcc-4.6,
45 g++-4.6,
46 libgtest-dev,44 libgtest-dev,
47 google-mock,45 google-mock,
48Standards-Version: 3.9.346Standards-Version: 3.9.3
4947
=== 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 @@
99
10DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')10DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
1111
12export CC=gcc-4.6
13export CXX=g++-4.6
14
15CFLAGS=$(shell echo $$CFLAGS | sed -e 's/\-Wall//')12CFLAGS=$(shell echo $$CFLAGS | sed -e 's/\-Wall//')
1613
17CORE_ABIVERSION := $(shell sed -rn 's/^\#define[[:space:]]+CORE_ABIVERSION[[:space:]]+//p' /usr/include/compiz/core/abiversion.h )14CORE_ABIVERSION := $(shell sed -rn 's/^\#define[[:space:]]+CORE_ABIVERSION[[:space:]]+//p' /usr/include/compiz/core/abiversion.h )