Merge lp:~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-01-20-gles into lp:ubuntu-ui-toolkit/gles

Proposed by Zoltan Balogh on 2016-01-21
Status: Merged
Approved by: Zoltan Balogh on 2016-02-25
Approved revision: 123
Merged at revision: 108
Proposed branch: lp:~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-01-20-gles
Merge into: lp:ubuntu-ui-toolkit/gles
Diff against target: 73 lines (+41/-0)
4 files modified
debian/changelog (+7/-0)
debian/control (+20/-0)
debian/libubuntutoolkit5-gles-dev.install (+13/-0)
debian/libubuntutoolkit5-gles.install (+1/-0)
To merge this branch: bzr merge lp:~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-01-20-gles
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team 2016-01-21 Pending
Review via email: mp+283386@code.launchpad.net

Commit message

OTA10-landing-2016-01-20-gles

Description of the change

OTA10-landing-2016-01-20-gles

To post a comment you must log in.
107. By Zoltan Balogh on 2016-01-21

Sync with staging

108. By Zoltan Balogh on 2016-01-21

Sync with staging

109. By Zoltan Balogh on 2016-01-21

Sync with staging

110. By Zoltan Balogh on 2016-01-25

Sync with staging

111. By Zoltan Balogh on 2016-01-27

Sync with staging

112. By Zoltan Balogh on 2016-01-28

Sync with the staging

113. By Zoltan Balogh on 2016-01-28

sync with staging

114. By Zoltan Balogh on 2016-01-29

Sync with staging

115. By Zoltan Balogh on 2016-02-03

Sync with the staging

116. By Zoltan Balogh on 2016-02-03

Sync with staging

117. By Zoltan Balogh on 2016-02-04

sync with staging

118. By Zoltan Balogh on 2016-02-16

Sync

119. By Zoltan Balogh on 2016-02-16

Sync with trunk

120. By Zoltan Balogh on 2016-02-17

sync

121. By Zoltan Balogh on 2016-02-17

Resolving conflict

122. By Zoltan Balogh on 2016-02-19

Sync with staging

123. By Zoltan Balogh on 2016-02-22

Sync

124. By Zoltan Balogh on 2016-02-26

Sync from staging

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 2016-01-06 04:27:12 +0000
3+++ debian/changelog 2016-02-26 17:29:34 +0000
4@@ -1,3 +1,10 @@
5+ubuntu-ui-toolkit-gles (1.3.1872+16.04-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ [ Zoltán Balogh ]
8+ * Sync with main package 1.3.1872+16.04-0ubuntu1
9+
10+ -- Zoltán Balogh <zoltan@bakter.hu> Thu, 21 Jan 2016 06:28:30 +0200
11+
12 ubuntu-ui-toolkit-gles (1.3.1795+16.04.20160106-0ubuntu1) xenial; urgency=medium
13
14 [ Zoltán Balogh ]
15
16=== modified file 'debian/control'
17--- debian/control 2016-02-17 10:46:57 +0000
18+++ debian/control 2016-02-26 17:29:34 +0000
19@@ -44,6 +44,7 @@
20 dbus-test-runner,
21 accountsservice,
22 xvfb,
23+ gdb,
24 locales,
25 suru-icon-theme,
26 uuid-runtime,
27@@ -115,3 +116,22 @@
28 This package contains the development files for
29 Ubuntu gestures library with SwipeArea
30
31+Package: libubuntutoolkit5-gles
32+Architecture: i386 amd64
33+Multi-Arch: same
34+Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
35+Depends: ${misc:Depends},
36+ ${shlibs:Depends},
37+Description: Ubuntu toolkit common library for Ubuntu UI Toolkit
38+ Contains components and helper classes that are shared between the
39+ Ubuntu QML plugins
40+
41+Package: libubuntutoolkit5-gles-dev
42+Architecture: i386 amd64
43+Multi-Arch: same
44+Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
45+Depends: ${misc:Depends},
46+ ${shlibs:Depends},
47+Description: Ubuntu toolkit common library development files
48+ This package contains the development files for
49+ Ubuntu toolkit common library
50
51=== added file 'debian/libubuntutoolkit5-gles-dev.install'
52--- debian/libubuntutoolkit5-gles-dev.install 1970-01-01 00:00:00 +0000
53+++ debian/libubuntutoolkit5-gles-dev.install 2016-02-26 17:29:34 +0000
54@@ -0,0 +1,13 @@
55+usr/include/*/qt5/UbuntuToolkit/ColorUtils
56+usr/include/*/qt5/UbuntuToolkit/UbuntuToolkit
57+usr/include/*/qt5/UbuntuToolkit/UbuntuToolkitDepends
58+usr/include/*/qt5/UbuntuToolkit/UbuntuToolkitVersion
59+usr/include/*/qt5/UbuntuToolkit/colorutils.h
60+usr/include/*/qt5/UbuntuToolkit/ubuntutoolkitglobal.h
61+usr/include/*/qt5/UbuntuToolkit/ubuntutoolkitversion.h
62+usr/lib/*/libUbuntuToolkit.prl
63+usr/lib/*/libUbuntuToolkit.la
64+usr/lib/*/libUbuntuToolkit.so
65+usr/lib/*/pkgconfig/UbuntuToolkit.pc
66+usr/lib/*/qt5/mkspecs/modules/qt_lib_UbuntuToolkit.pri
67+usr/lib/*/qt5/mkspecs/modules/qt_lib_UbuntuToolkit_private.pri
68
69=== added file 'debian/libubuntutoolkit5-gles.install'
70--- debian/libubuntutoolkit5-gles.install 1970-01-01 00:00:00 +0000
71+++ debian/libubuntutoolkit5-gles.install 2016-02-26 17:29:34 +0000
72@@ -0,0 +1,1 @@
73+usr/lib/*/libUbuntuToolkit.so.*

Subscribers

People subscribed via source and target branches