Merge lp:~dbarth/oxide/gcc-4.8-for-utopic into lp:~oxide-developers/oxide/packaging.utopic

Proposed by David Barth on 2015-03-31
Status: Needs review
Proposed branch: lp:~dbarth/oxide/gcc-4.8-for-utopic
Merge into: lp:~oxide-developers/oxide/packaging.utopic
Diff against target: 39 lines (+9/-1)
3 files modified
debian/changelog (+7/-0)
debian/control (+1/-0)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~dbarth/oxide/gcc-4.8-for-utopic
Reviewer Review Type Date Requested Status
Oxide Developers 2015-03-31 Pending
Review via email: mp+254710@code.launchpad.net

Commit message

Force gcc-4.8 to avoid rendering issues

Description of the change

Force gcc-4.8 to avoid rendering issues

To post a comment you must log in.

Unmerged revisions

57. By David Barth on 2015-03-31

Force gcc-4.8 to avoid rendering issues

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-03-05 13:19:06 +0000
3+++ debian/changelog 2015-03-31 09:16:33 +0000
4@@ -1,3 +1,10 @@
5+oxide-qt (1.5.5-0ubuntu0.14.10.3) utopic-security; urgency=medium
6+
7+ * debian/rules:
8+ - Force gcc-4.8 to avoid rendering issues
9+
10+ -- David Barth <david.barth@canonical.com> Tue, 31 Mar 2015 11:05:21 +0200
11+
12 oxide-qt (1.5.5-0ubuntu0.14.10.2) utopic-security; urgency=medium
13
14 * Update to v1.5.5 - see USN-2521-1
15
16=== modified file 'debian/control'
17--- debian/control 2015-03-05 10:26:02 +0000
18+++ debian/control 2015-03-31 09:16:33 +0000
19@@ -4,6 +4,7 @@
20 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
21 Build-Depends: debhelper (>= 8.0.0),
22 cmake,
23+ g++-4.8,
24 qt5-qmake,
25 qt5-default,
26 qtdeclarative5-dev,
27
28=== modified file 'debian/rules'
29--- debian/rules 2015-03-05 13:19:06 +0000
30+++ debian/rules 2015-03-31 09:16:33 +0000
31@@ -7,7 +7,7 @@
32 export DH_OPTIONS
33
34 DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
35-COMMON_OPTIONS := -DENABLE_TESTS=1 -DENABLE_CHROMEDRIVER=1 -DENABLE_OXIDEQMLSCENE=1
36+COMMON_OPTIONS := -DENABLE_TESTS=1 -DENABLE_CHROMEDRIVER=1 -DENABLE_OXIDEQMLSCENE=1 -DCMAKE_C_COMPILER=gcc-4.8 -DCMAKE_CXX_COMPILER=g++-4.8
37
38 %:
39 dh $@ --parallel

Subscribers

People subscribed via source and target branches

to all changes: