Merge lp:~mterry/qtubuntu/arm64 into lp:qtubuntu

[Michael Terry]

Build qtubuntu for arm64, and drop ancient qthybris transition package.

Build qtubuntu for arm64, and drop ancient qthybris transition package.

[lp:~mterry/qtubuntu/arm64]

319. By Michael Terry on 2016-05-27

Whoops, and actually use gles2 on arm64

320. By Michael Terry on 2016-05-27

Guh, that stupid gles patch

[Gerry Boland (gerboland)]

Looks reasonable, waiting for CI

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:320
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/59/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/1734
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1760
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1707
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1707
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1707
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1700
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1700/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1700
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1700/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1700
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1700/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1700
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1700/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1700
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1700/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1700
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1700/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1700
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1700/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1700
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1700/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1700
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1700/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/59/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

@mterry - any suggestions how we can verify this? Just build in a chroot?

review: Needs Information

[Gerry Boland (gerboland)]

Builds ok in silo59.

review: Approve

=== modified file 'debian/control'
--- debian/control	2016-03-31 22:36:24 +0000
+++ debian/control	2016-05-27 13:03:57 +0000
@@ -26,14 +26,12 @@
 Section: libs
 
 Package: qtubuntu-android
-Architecture: armhf
+Architecture: arm64 armhf
 Multi-Arch: same
 Conflicts: qtubuntu-desktop,
-Replaces: qthybris (<< 0.37),
-          qtubuntu (<< 0.52),
+Replaces: qtubuntu (<< 0.52),
           qtubuntu-desktop,
-Breaks: qthybris (<< 0.37),
-        ubuntu-touch-session (<< 0.107),
+Breaks: ubuntu-touch-session (<< 0.107),
         unity8 (<< 7.85),
 Provides: qtubuntu,
 Depends: ubuntu-application-api3-touch,
@@ -54,8 +52,7 @@
 Conflicts: qtubuntu-android,
 Replaces: qtubuntu (<< 0.52),
           qtubuntu-android,
-Breaks: qthybris (<< 0.37),
-        unity8 (<< 7.85),
+Breaks: unity8 (<< 7.85),
 Provides: qtubuntu,
 Depends: ubuntu-application-api3-desktop,
          ${misc:Depends},
@@ -68,12 +65,3 @@
  plugins.
  .
  This variant of the package is for GNU-based desktops.
-
-Package: qthybris
-Depends: qtubuntu-android,
-         ${misc:Depends},
-Architecture: any
-Section: oldlibs
-Description: transitional dummy package
- This is a transitional dummy package for the qthybris -> qtubuntu
- transition.

=== modified file 'debian/gles-patches/convert-to-gles.patch'
--- debian/gles-patches/convert-to-gles.patch	2016-03-31 22:45:42 +0000
+++ debian/gles-patches/convert-to-gles.patch	2016-05-27 13:03:57 +0000
@@ -1,7 +1,7 @@
-Index: qtubuntu/debian/control
+Index: arm64/debian/control
 ===================================================================
---- qtubuntu.orig/debian/control
-+++ qtubuntu/debian/control
+--- arm64.orig/debian/control
++++ arm64/debian/control
 @@ -1,4 +1,4 @@
 -Source: qtubuntu
 +Source: qtubuntu-gles
@@ -34,12 +34,12 @@
  Section: libs
  
  Package: qtubuntu-android
--Architecture: armhf
+-Architecture: arm64 armhf
 +Architecture: amd64 i386
  Multi-Arch: same
  Conflicts: qtubuntu-desktop,
- Replaces: qthybris (<< 0.37),
-@@ -39,41 +47,12 @@ Provides: qtubuntu,
+ Replaces: qtubuntu (<< 0.52),
+@@ -37,31 +45,12 @@ Provides: qtubuntu,
  Depends: ubuntu-application-api3-touch,
           ${misc:Depends},
           ${shlibs:Depends},
@@ -59,8 +59,7 @@
 -Conflicts: qtubuntu-android,
 -Replaces: qtubuntu (<< 0.52),
 -          qtubuntu-android,
--Breaks: qthybris (<< 0.37),
--        unity8 (<< 7.85),
+-Breaks: unity8 (<< 7.85),
 -Provides: qtubuntu,
 -Depends: ubuntu-application-api3-desktop,
 -         ${misc:Depends},
@@ -73,21 +72,12 @@
 - plugins.
 - .
 - This variant of the package is for GNU-based desktops.
--
--Package: qthybris
--Depends: qtubuntu-android,
--         ${misc:Depends},
--Architecture: any
--Section: oldlibs
--Description: transitional dummy package
-- This is a transitional dummy package for the qthybris -> qtubuntu
-- transition.
 + This variant of the package is for Android-based phones and tablets (built
 + against the OpenGLES variant of qtbase).
-Index: qtubuntu/debian/rules
+Index: arm64/debian/rules
 ===================================================================
---- qtubuntu.orig/debian/rules
-+++ qtubuntu/debian/rules
+--- arm64.orig/debian/rules
++++ arm64/debian/rules
 @@ -4,47 +4,25 @@
  export DPKG_GENSYMBOLS_CHECK_LEVEL=4
  
@@ -98,7 +88,7 @@
 -
 -# We only want to build qtubuntu-android on arches using Qt built with OpenGL ES2.0
 -DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
--gles2_architectures = armhf
+-gles2_architectures = arm64 armhf
  
  %:
  	dh $@

=== modified file 'debian/rules'
--- debian/rules	2014-06-20 11:34:53 +0000
+++ debian/rules	2016-05-27 13:03:57 +0000
@@ -10,7 +10,7 @@
 
 # We only want to build qtubuntu-android on arches using Qt built with OpenGL ES2.0
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-gles2_architectures = armhf
+gles2_architectures = arm64 armhf
 
 %:
 	dh $@