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

[Zoltan Balogh]

OTA10-landing-2016-01-20-gles

OTA10-landing-2016-01-20-gles

[lp:~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-01-20-gles]

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

=== 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 @@
+ubuntu-ui-toolkit-gles (1.3.1872+16.04-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Zoltán Balogh ]
+  * Sync with main package 1.3.1872+16.04-0ubuntu1 
+
+ -- Zoltán Balogh <[e-mail]>  Thu, 21 Jan 2016 06:28:30 +0200
+
 ubuntu-ui-toolkit-gles (1.3.1795+16.04.20160106-0ubuntu1) xenial; urgency=medium
 
   [ Zoltán Balogh ]
 
=== 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 @@
                dbus-test-runner,
                accountsservice,
                xvfb,
+               gdb,
                locales,
                suru-icon-theme,
                uuid-runtime,
@@ -115,3 +116,22 @@
  This package contains the development files for
  Ubuntu gestures library with SwipeArea
 
+Package: libubuntutoolkit5-gles
+Architecture: i386 amd64
+Multi-Arch: same
+Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: Ubuntu toolkit common library for Ubuntu UI Toolkit
+ Contains components and helper classes that are shared between the
+ Ubuntu QML plugins
+
+Package: libubuntutoolkit5-gles-dev
+Architecture: i386 amd64
+Multi-Arch: same
+Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: Ubuntu toolkit common library development files
+ This package contains the development files for
+ Ubuntu toolkit common library
 
=== 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 @@
+usr/include/*/qt5/UbuntuToolkit/ColorUtils
+usr/include/*/qt5/UbuntuToolkit/UbuntuToolkit
+usr/include/*/qt5/UbuntuToolkit/UbuntuToolkitDepends
+usr/include/*/qt5/UbuntuToolkit/UbuntuToolkitVersion
+usr/include/*/qt5/UbuntuToolkit/colorutils.h
+usr/include/*/qt5/UbuntuToolkit/ubuntutoolkitglobal.h
+usr/include/*/qt5/UbuntuToolkit/ubuntutoolkitversion.h
+usr/lib/*/libUbuntuToolkit.prl
+usr/lib/*/libUbuntuToolkit.la
+usr/lib/*/libUbuntuToolkit.so
+usr/lib/*/pkgconfig/UbuntuToolkit.pc
+usr/lib/*/qt5/mkspecs/modules/qt_lib_UbuntuToolkit.pri
+usr/lib/*/qt5/mkspecs/modules/qt_lib_UbuntuToolkit_private.pri
 
=== 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 @@
+usr/lib/*/libUbuntuToolkit.so.*