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
=== modified file 'debian/changelog'
--- debian/changelog 2016-01-06 04:27:12 +0000
+++ debian/changelog 2016-02-26 17:29:34 +0000
@@ -1,3 +1,10 @@
1ubuntu-ui-toolkit-gles (1.3.1872+16.04-0ubuntu1) UNRELEASED; urgency=medium
2
3 [ Zoltán Balogh ]
4 * Sync with main package 1.3.1872+16.04-0ubuntu1
5
6 -- Zoltán Balogh <zoltan@bakter.hu> Thu, 21 Jan 2016 06:28:30 +0200
7
1ubuntu-ui-toolkit-gles (1.3.1795+16.04.20160106-0ubuntu1) xenial; urgency=medium8ubuntu-ui-toolkit-gles (1.3.1795+16.04.20160106-0ubuntu1) xenial; urgency=medium
29
3 [ Zoltán Balogh ]10 [ Zoltán Balogh ]
411
=== modified file 'debian/control'
--- debian/control 2016-02-17 10:46:57 +0000
+++ debian/control 2016-02-26 17:29:34 +0000
@@ -44,6 +44,7 @@
44 dbus-test-runner,44 dbus-test-runner,
45 accountsservice,45 accountsservice,
46 xvfb,46 xvfb,
47 gdb,
47 locales,48 locales,
48 suru-icon-theme,49 suru-icon-theme,
49 uuid-runtime,50 uuid-runtime,
@@ -115,3 +116,22 @@
115 This package contains the development files for116 This package contains the development files for
116 Ubuntu gestures library with SwipeArea117 Ubuntu gestures library with SwipeArea
117118
119Package: libubuntutoolkit5-gles
120Architecture: i386 amd64
121Multi-Arch: same
122Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
123Depends: ${misc:Depends},
124 ${shlibs:Depends},
125Description: Ubuntu toolkit common library for Ubuntu UI Toolkit
126 Contains components and helper classes that are shared between the
127 Ubuntu QML plugins
128
129Package: libubuntutoolkit5-gles-dev
130Architecture: i386 amd64
131Multi-Arch: same
132Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
133Depends: ${misc:Depends},
134 ${shlibs:Depends},
135Description: Ubuntu toolkit common library development files
136 This package contains the development files for
137 Ubuntu toolkit common library
118138
=== added file 'debian/libubuntutoolkit5-gles-dev.install'
--- debian/libubuntutoolkit5-gles-dev.install 1970-01-01 00:00:00 +0000
+++ debian/libubuntutoolkit5-gles-dev.install 2016-02-26 17:29:34 +0000
@@ -0,0 +1,13 @@
1usr/include/*/qt5/UbuntuToolkit/ColorUtils
2usr/include/*/qt5/UbuntuToolkit/UbuntuToolkit
3usr/include/*/qt5/UbuntuToolkit/UbuntuToolkitDepends
4usr/include/*/qt5/UbuntuToolkit/UbuntuToolkitVersion
5usr/include/*/qt5/UbuntuToolkit/colorutils.h
6usr/include/*/qt5/UbuntuToolkit/ubuntutoolkitglobal.h
7usr/include/*/qt5/UbuntuToolkit/ubuntutoolkitversion.h
8usr/lib/*/libUbuntuToolkit.prl
9usr/lib/*/libUbuntuToolkit.la
10usr/lib/*/libUbuntuToolkit.so
11usr/lib/*/pkgconfig/UbuntuToolkit.pc
12usr/lib/*/qt5/mkspecs/modules/qt_lib_UbuntuToolkit.pri
13usr/lib/*/qt5/mkspecs/modules/qt_lib_UbuntuToolkit_private.pri
014
=== added file 'debian/libubuntutoolkit5-gles.install'
--- debian/libubuntutoolkit5-gles.install 1970-01-01 00:00:00 +0000
+++ debian/libubuntutoolkit5-gles.install 2016-02-26 17:29:34 +0000
@@ -0,0 +1,1 @@
1usr/lib/*/libUbuntuToolkit.so.*

Subscribers

People subscribed via source and target branches