qtubuntu

Merge lp:~unity-team/qtubuntu/gles-qtcomp-refactor into lp:qtubuntu/gles

  1. gles-qtcomp-refactor
  2. Merge into gles
Proposed by Michał Sawicz
Status: Merged
Approved by: Gerry Boland
Approved revision: no longer in the source branch.
Merged at revision: 3
Proposed branch: lp:~unity-team/qtubuntu/gles-qtcomp-refactor
Merge into: lp:qtubuntu/gles
Diff against target: 82 lines (+16/-11)
5 files modified
debian/changelog (+8/-0)
debian/control (+6/-8)
debian/docs (+0/-1)
debian/rules (+1/-1)
debian/watch (+1/-1)
To merge this branch: bzr merge lp:~unity-team/qtubuntu/gles-qtcomp-refactor
Reviewer Review Type Date Requested Status
Gerry Boland (community) Approve
Review via email: mp+226870@code.launchpad.net

Commit message

Sync with qtubuntu 0.60+14.10.20140724-0ubuntu1

To post a comment you must log in.
Revision history for this message
Gerry Boland (gerboland) :
review: Approve
lp:~unity-team/qtubuntu/gles-qtcomp-refactor updated
3. By Gerry Boland

Sync with qtubuntu 0.60+14.10.20140724-0ubuntu1
Approved by: Gerry Boland

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 2014-07-15 15:13:08 +0000
3+++ debian/changelog 2014-07-28 04:20:19 +0000
4@@ -1,3 +1,11 @@
5+qtubuntu-gles (0.60+14.10.20140728-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ [ Gerry Boland ]
8+ * Major refactor: remove SurfaceFlinger & Mir in-server-process-client
9+ support, flatten class hierarchy. Only Mir client QPA remains
10+
11+ -- Kevin Gunn <kevin.gunn@canonical.com> Sun, 27 Jul 2014 23:18:01 -0500
12+
13 qtubuntu-gles (0.54+14.10.20140613-0ubuntu2) utopic; urgency=medium
14
15 * debian/control: should depend on libqt5quickwidgets5-gles instead
16
17=== modified file 'debian/control'
18--- debian/control 2014-07-15 15:13:08 +0000
19+++ debian/control 2014-07-28 04:20:19 +0000
20@@ -3,27 +3,25 @@
21 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
22 Build-Depends: debhelper (>= 9),
23 libatspi2.0-dev,
24- libdbus-1-dev,
25 libegl1-mesa-dev,
26 libfontconfig1-dev,
27 libfreetype6-dev,
28 libgles2-mesa-dev,
29 libglib2.0-dev,
30- libhybris-dev,
31- libubuntu-application-api-dev (>= 2.0.0),
32+ libqt5gui5-gles,
33+ libqt5sensors5-dev,
34+ libqt5quicktest5,
35+ libubuntu-application-api-dev (>= 2.2.0),
36 libudev-dev,
37 libxrender-dev,
38 libxkbcommon-dev,
39- libqt5gui5-gles,
40- libqt5quicktest5,
41- libqt5quickwidgets5-gles,
42 qt5-default,
43+ qtbase5-gles-dev,
44 qtbase5-private-gles-dev,
45 qtdeclarative5-dev,
46- libqt5sensors5-dev,
47- zlib1g-dev,
48 Standards-Version: 3.9.4
49 Section: libs
50+X-Auto-Uploader: no-rewrite-version
51
52 Package: qtubuntu-android
53 Architecture: i386 amd64
54
55=== modified file 'debian/docs'
56--- debian/docs 2014-07-15 15:13:08 +0000
57+++ debian/docs 2014-07-28 04:20:19 +0000
58@@ -1,2 +1,1 @@
59 README
60-TODO
61
62=== modified file 'debian/rules'
63--- debian/rules 2014-07-15 15:13:08 +0000
64+++ debian/rules 2014-07-28 04:20:19 +0000
65@@ -14,7 +14,7 @@
66 dh_clean
67
68 override_dh_auto_configure:
69- mkdir -p $(ANDROID_DIR) && dh_auto_configure -B$(ANDROID_DIR) -- "CONFIG+=mirserver" "CONFIG+=mirclient" "CONFIG+=hybris" "QMAKE_CXXFLAGS=-DPLATFORM_API_TOUCH" $(CURDIR)
70+ mkdir -p $(ANDROID_DIR) && dh_auto_configure -B$(ANDROID_DIR) -- "QMAKE_CXXFLAGS=-DPLATFORM_API_TOUCH" $(CURDIR)
71
72 override_dh_auto_build:
73 dh_auto_build -B$(ANDROID_DIR)
74
75=== modified file 'debian/watch'
76--- debian/watch 2014-07-15 15:37:25 +0000
77+++ debian/watch 2014-07-28 04:20:19 +0000
78@@ -1,3 +1,3 @@
79 version=3
80 opts=dversionmangle=s/\-gles// \
81-http://ppa.launchpad.net/ci-train-ppa-service/landing-021/ubuntu/pool/main/q/qtubuntu/qtubuntu_([^-]*)\.orig.tar.gz
82+http://ppa.launchpad.net/ci-train-ppa-service/landing-006/ubuntu/pool/main/q/qtubuntu/qtubuntu_([^-]*)\.orig.tar.gz

Subscribers

People subscribed via source and target branches