Merge lp:~bregma/qtubuntu/lp-1246851 into lp:qtubuntu

[Stephen M. Webb]

provide two binary deb variants: Touch and Desktop (lp: #1246851)

Packaging changes to produce two binary debs: an -android variant for Touch and a -desktop variant for Desktop. Fixes lp:1246851, part of enabling a Unity8 session on the desktop.

[lp:~bregma/qtubuntu/lp-1246851]

201. By Stephen M. Webb on 2013-12-09

debian/changelog: backed out PPA changes

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:201
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/101/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-trusty-armhf-ci/12
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-trusty-armhf-ci/12/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-ci/101/rebuild

review: Approve (continuous-integration)

[Ricardo Mendoza (ricmm)]

Looks good, works across devices.

[Ricardo Mendoza (ricmm)]

Approve

review: Approve

=== modified file 'debian/control'
--- debian/control	2013-11-22 15:45:47 +0000
+++ debian/control	2013-12-09 20:11:56 +0000
@@ -30,21 +30,47 @@
 Package: qtubuntu-android
 Architecture: any
 Multi-Arch: same
+Conflicts: qtubuntu-desktop
 Replaces: qthybris (<< 0.37),
           qtubuntu (<< 0.52),
-Breaks: qthybris (<< 0.37)
-Provides: qtubuntu-shell,
-          qtubuntu,
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         libqt5sensors5,
-         qtubuntu-sensors,
-Description: Qt plugins for Ubuntu Platform API
- QtUbuntu is a set of Qt5 components for the Ubuntu Platform API. It
- contains a QPA (Qt Platform Abstraction) plugin based on the Ubuntu
- Platform API and a legacy QPA plugin based on the compatibility
- layers. It also provides Qt bindings for Ubuntu Platform API features
- that are not exposed through the QPA plugins.
+          qtubuntu-desktop
+Breaks: qthybris (<< 0.37)
+Provides: qtubuntu-shell,
+          qtubuntu,
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libqt5sensors5,
+         qtubuntu-sensors,
+Description: Qt plugins for Ubuntu Platform API (mobile)
+ QtUbuntu is a set of Qt5 components for the Ubuntu Platform API. It contains a
+ QPA (Qt Platform Abstraction) plugin based on the Ubuntu Platform API and a
+ legacy QPA plugin based on the compatibility layers. It also provides Qt
+ bindings for Ubuntu Platform API features that are not exposed through the QPA
+ plugins.
+ .
+ This variant of the package is for Android-based phones and tablets.
+
+Package: qtubuntu-desktop
+Architecture: any
+Multi-Arch: same
+Conflicts: qtubuntu-android
+Replaces: qtubuntu (<< 0.52),
+          qtubuntu-android
+Breaks: qthybris (<< 0.37)
+Provides: qtubuntu-shell,
+          qtubuntu,
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libqt5sensors5,
+         qtubuntu-sensors,
+Description: Qt plugins for Ubuntu Platform API (desktop)
+ QtUbuntu is a set of Qt5 components for the Ubuntu Platform API. It contains a
+ QPA (Qt Platform Abstraction) plugin based on the Ubuntu Platform API and a
+ legacy QPA plugin based on the compatibility layers. It also provides Qt
+ bindings for Ubuntu Platform API features that are not exposed through the QPA
+ plugins.
+ .
+ This variant of the package is for GNU-based desktops.
 
 Package: qthybris
 Depends: ${misc:Depends},
 
=== added file 'debian/qtubuntu-desktop.install'
--- debian/qtubuntu-desktop.install	1970-01-01 00:00:00 +0000
+++ debian/qtubuntu-desktop.install	2013-12-09 20:11:56 +0000
@@ -0,0 +1,2 @@
+usr/lib/*/qt5/plugins/platforms/*
+usr/lib/*/qt5/imports/Unity/*
 
=== modified file 'debian/rules'
--- debian/rules	2013-08-21 04:48:49 +0000
+++ debian/rules	2013-12-09 20:11:56 +0000
@@ -3,12 +3,18 @@
 
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
+ANDROID_DIR = build-android
+DESKTOP_DIR = build-desktop
+
 %:
-	dh $@ --parallel
+	dh $@ --builddirectory=$(ANDROID_DIR) --parallel
+	dh $@ --builddirectory=$(DESKTOP_DIR) --parallel
 
 override_dh_auto_configure:
-	dh_auto_configure -- "CONFIG+=mirserver" "CONFIG+=mirclient" "CONFIG+=hybris" "QMAKE_CXXFLAGS=-g"
+	mkdir -p $(ANDROID_DIR) && dh_auto_configure -- "CONFIG+=mirserver" "CONFIG+=mirclient" "CONFIG+=hybris" "QMAKE_CXXFLAGS=-g" $(CURDIR)
+	mkdir -p $(DESKTOP_DIR) && dh_auto_configure -- "CONFIG+=mirserver" "CONFIG+=mirclient" "QMAKE_CXXFLAGS=-g" $(CURDIR)
 
 override_dh_install:
 	rm -f debian/*/usr/lib/*/qt5/examples/qtubuntu/qmlscene-ubuntu
 	dh_install --fail-missing
+