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
=== modified file 'debian/changelog'
--- debian/changelog 2015-03-05 13:19:06 +0000
+++ debian/changelog 2015-03-31 09:16:33 +0000
@@ -1,3 +1,10 @@
1oxide-qt (1.5.5-0ubuntu0.14.10.3) utopic-security; urgency=medium
2
3 * debian/rules:
4 - Force gcc-4.8 to avoid rendering issues
5
6 -- David Barth <david.barth@canonical.com> Tue, 31 Mar 2015 11:05:21 +0200
7
1oxide-qt (1.5.5-0ubuntu0.14.10.2) utopic-security; urgency=medium8oxide-qt (1.5.5-0ubuntu0.14.10.2) utopic-security; urgency=medium
29
3 * Update to v1.5.5 - see USN-2521-110 * Update to v1.5.5 - see USN-2521-1
411
=== modified file 'debian/control'
--- debian/control 2015-03-05 10:26:02 +0000
+++ debian/control 2015-03-31 09:16:33 +0000
@@ -4,6 +4,7 @@
4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5Build-Depends: debhelper (>= 8.0.0),5Build-Depends: debhelper (>= 8.0.0),
6 cmake,6 cmake,
7 g++-4.8,
7 qt5-qmake,8 qt5-qmake,
8 qt5-default,9 qt5-default,
9 qtdeclarative5-dev,10 qtdeclarative5-dev,
1011
=== modified file 'debian/rules'
--- debian/rules 2015-03-05 13:19:06 +0000
+++ debian/rules 2015-03-31 09:16:33 +0000
@@ -7,7 +7,7 @@
7export DH_OPTIONS7export DH_OPTIONS
88
9DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)9DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
10COMMON_OPTIONS := -DENABLE_TESTS=1 -DENABLE_CHROMEDRIVER=1 -DENABLE_OXIDEQMLSCENE=110COMMON_OPTIONS := -DENABLE_TESTS=1 -DENABLE_CHROMEDRIVER=1 -DENABLE_OXIDEQMLSCENE=1 -DCMAKE_C_COMPILER=gcc-4.8 -DCMAKE_CXX_COMPILER=g++-4.8
1111
12%:12%:
13 dh $@ --parallel13 dh $@ --parallel

Subscribers

People subscribed via source and target branches

to all changes: