Merge lp:~bzoltan/ubuntu-ui-toolkit/OTA9_landing_2015-12-05-gles into lp:ubuntu-ui-toolkit/gles

[Zoltan Balogh]

Landing 2015.12.05 - OTA9

Landing 2015.12.05 - OTA9

[Zoltan Balogh (bzoltan)]

review: Approve

[lp:~bzoltan/ubuntu-ui-toolkit/OTA9_landing_2015-12-05-gles]

97. By Zoltan Balogh on 2015-12-05

Landing 2015.12.05 - OTA9

98. By Zoltan Balogh on 2015-12-05

Landing 2015.12.05 - OTA9

99. By Zoltan Balogh on 2015-12-05

Hack the version

100. By Zoltan Balogh on 2015-12-05

Hack the version

101. By Zoltan Balogh on 2015-12-05

Hack the version

102. By Zoltan Balogh on 2015-12-05

Hack the version

103. By Zoltan Balogh on 2015-12-05

Hack the version

104. By Zoltan Balogh on 2015-12-05

Hack the version

105. By Zoltan Balogh on 2015-12-05

fix a bit the debian stuff

[Robert Bruce Park (robru)]

(one comment inline)

[lp:~bzoltan/ubuntu-ui-toolkit/OTA9_landing_2015-12-05-gles]

106. By Zoltan Balogh on 2015-12-07

fix shlibs

107. By Zoltan Balogh on 2015-12-07

fix shlibs

108. By Zoltan Balogh on 2015-12-07

Sync with staging

109. By Zoltan Balogh on 2015-12-07

Sync with staging

110. By Zoltan Balogh on 2015-12-07

hack around with versions

111. By Zoltan Balogh on 2015-12-07

hack around with versions

112. By Zoltan Balogh on 2015-12-07

fix version

113. By Zoltan Balogh on 2015-12-08

Create gesture gles packages

114. By Zoltan Balogh on 2015-12-08

revert the local changes

115. By Zoltan Balogh on 2015-12-08

revert the local changes

=== modified file 'debian/changelog'
--- debian/changelog	2015-12-01 14:28:44 +0000
+++ debian/changelog	2015-12-08 09:01:27 +0000
@@ -1,3 +1,10 @@
+ubuntu-ui-toolkit-gles (1.3.1742+16.04-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Zoltán Balogh ]
+  * Sync with the main package 1.3.1742+16.04-0ubuntu1
+
+ -- Zoltán Balogh <[e-mail]>  Sat, 05 Dec 2015 12:35:57 +0200
+
 ubuntu-ui-toolkit-gles (1.3.1705+16.04.20151120.1-0ubuntu2) xenial; urgency=medium
 
   * Rebuild against Qt 5.5.1.

=== modified file 'debian/control'
--- debian/control	2015-11-03 11:13:58 +0000
+++ debian/control	2015-12-08 09:01:27 +0000
@@ -79,6 +79,7 @@
          suru-icon-theme,
          ttf-ubuntu-font-family,
          ubuntu-ui-toolkit-theme,
+         libubuntugestures-gles (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
 Description: Qt Components for Ubuntu - QML plugin - OpenGLES
@@ -87,3 +88,29 @@
  .
  This package contains the Ubuntu Components QML plugin (built with
  the OpenGLES backend).
+
+Package: libubuntugestures-gles
+Architecture: i386 amd64
+Conflicts: libubuntugestures
+Replaces: libubuntugestures
+Provides: libubuntugestures
+Multi-Arch: same
+Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: Ubuntu gestures library - SwipeArea - OpenGLES
+ Ubuntu gestures library with SwipeArea
+
+Package: libubuntugestures-gles-dev
+Architecture: i386 amd64
+Conflicts: libubuntugestures-dev
+Replaces: libubuntugestures-dev
+Provides: libubuntugestures-dev
+Multi-Arch: same
+Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: Ubuntu gestures library development files - OpenGLES
+ This package contains the development files for
+ Ubuntu gestures library with SwipeArea
+

=== added file 'debian/libubuntugestures-gles-dev.install'
--- debian/libubuntugestures-gles-dev.install	1970-01-01 00:00:00 +0000
+++ debian/libubuntugestures-gles-dev.install	2015-12-08 09:01:27 +0000
@@ -0,0 +1,28 @@
+usr/include/*/qt5/UbuntuGestures/ubuntugesturesglobal.h 
+usr/include/*/qt5/UbuntuGestures/CandidateInactivityTimer 
+usr/include/*/qt5/UbuntuGestures/TouchOwnershipEvent 
+usr/include/*/qt5/UbuntuGestures/UbuntuGestures 
+usr/include/*/qt5/UbuntuGestures/pool.h 
+usr/include/*/qt5/UbuntuGestures/unownedtouchevent.h 
+usr/include/*/qt5/UbuntuGestures/DebugHelpers 
+usr/include/*/qt5/UbuntuGestures/debughelpers.h 
+usr/include/*/qt5/UbuntuGestures/touchownershipevent.h 
+usr/include/*/qt5/UbuntuGestures/touchregistry.h 
+usr/include/*/qt5/UbuntuGestures/UbuntuGesturesDepends 
+usr/include/*/qt5/UbuntuGestures/timesource.h 
+usr/include/*/qt5/UbuntuGestures/TimeSource 
+usr/include/*/qt5/UbuntuGestures/timer.h 
+usr/include/*/qt5/UbuntuGestures/UnownedTouchEvent 
+usr/include/*/qt5/UbuntuGestures/TouchRegistry 
+usr/include/*/qt5/UbuntuGestures/Pool 
+usr/include/*/qt5/UbuntuGestures/ubuntugesturesversion.h 
+usr/include/*/qt5/UbuntuGestures/Timer 
+usr/include/*/qt5/UbuntuGestures/candidateinactivitytimer.h 
+usr/include/*/qt5/UbuntuGestures/UbuntuGesturesVersion 
+usr/lib/*/libUbuntuGestures.prl
+usr/lib/*/libUbuntuGestures.la
+usr/lib/*/libUbuntuGestures.so
+usr/lib/*/pkgconfig/UbuntuGestures.pc
+usr/lib/*/qt5/mkspecs/modules/qt_lib_UbuntuGestures.pri
+usr/lib/*/qt5/mkspecs/modules/qt_lib_UbuntuGestures_private.pri
+

=== added file 'debian/libubuntugestures-gles.install'
--- debian/libubuntugestures-gles.install	1970-01-01 00:00:00 +0000
+++ debian/libubuntugestures-gles.install	2015-12-08 09:01:27 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/libUbuntuGestures.so.*

=== modified file 'debian/rules'
--- debian/rules	2015-11-23 19:37:02 +0000
+++ debian/rules	2015-12-08 09:01:27 +0000
@@ -13,12 +13,9 @@
 CONFIGURE_SWITCHES = "-r" \
                      "ROOT_SOURCE_DIR=$(CURDIR)" \
                      "ROOT_BUILD_DIR=$(CURDIR)"
-
-# Don't try this at /home/: It will only work within https://ci-train.ubuntu.com
 get-orig-source:
-	find ~/silos/$(SILONAME) -name $(SOURCE)_$(VERSION).orig.tar.gz -exec \
-		cp \{} $(CURDIR)/$(SOURCE)-gles_$(VERSION).orig.tar.gz \;
-
+	 	find ~/silos/$(SILONAME) -name $(SOURCE)_$(VERSION).orig.tar.gz -exec \
+	 		cp \{} $(CURDIR)/$(SOURCE)-gles_$(VERSION).orig.tar.gz \;
 %:
 	dh $@
 
@@ -35,3 +32,7 @@
 
 override_dh_auto_install:
 	dh_auto_install --destdir=debian/tmp
+
+override_dh_shlibdeps:
+	dh_shlibdeps -l/usr/lib/$(DEB_HOST_MULTI_ARCH)/
+