Merge lp:~ubuntu-sdk-team/ubuntu-sdk-api/fixPackaging into lp:ubuntu-sdk-api

[Cris Dywan]

Fix problems in the Debian packaging

[Benjamin Zeller (zeller-benjamin)]

LGTM

review: Approve

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:10
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-sdk-api-ci-amd64/6/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1541/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-sdk-api-ci-amd64/6/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

review: Approve (continuous-integration)

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2016-03-03 13:07:23 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+split = True

=== modified file 'apicheck/apicheck.pro'
--- apicheck/apicheck.pro	2016-03-02 16:54:13 +0000
+++ apicheck/apicheck.pro	2016-03-03 13:07:23 +0000
@@ -4,7 +4,5 @@
 QT += core-private gui-private testlib quick-private
 CONFIG += no_keywords
 SOURCES += apicheck.cpp
-installPath = $$[QT_INSTALL_PREFIX]/bin
-apicheck.path = $$installPath
-apicheck.files = apicheck
-INSTALLS += $$TARGET
+target.path = $$[QT_INSTALL_PREFIX]/bin
+INSTALLS += target

=== modified file 'debian/control'
--- debian/control	2016-03-02 16:54:13 +0000
+++ debian/control	2016-03-03 13:07:23 +0000
@@ -10,12 +10,22 @@
                libqt5sql5-sqlite,
                qtdeclarative5-dev-tools,
                qtdeclarative5-private-dev,
+               qml-module-qtquick2,
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/ubuntu-sdk-api
 # If you aren't a member of ~ubuntu-sdk-team but need to upload packaging
 # changes, just go ahead. ~ubuntu-sdk-team will notice and sync up the code
 # again.
-Vcs-Bzr: https://code.launchpad.net/~ubuntu-sdk-team/ubuntu-sdk-api/trunk
+Vcs-Bzr: lp:ubuntu-sdk-api
+
+Package: ubuntu-sdk-api-data
+Section: devel
+Architecture: any
+Multi-Arch: same
+Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Description: Ubuntu SDK API tooling
 
 Package: ubuntu-sdk-api-bin
 Section: devel

=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2016-03-03 13:07:23 +0000
@@ -0,0 +1,8 @@
+Format: http://dep.debian.net/deps/dep5                                       
+Upstream-Name: ubuntu-ui-toolkit
+Source: https://bazaar.launchpad.net/~ubuntu-sdk-team/ubuntu-sdk-api/trunk
+ 
+Files: *·
+Copyright: 2014-2016 Canonical Ltd.
+License: LGPL-3.0
+

=== modified file 'debian/rules' (properties changed: -x to +x)
--- debian/rules	2016-03-02 16:54:13 +0000
+++ debian/rules	2016-03-03 13:07:23 +0000
@@ -22,7 +22,6 @@
 override_dh_auto_test:
 ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(testskip_architectures)))
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	mkdir -p debian/tmp/home/run
 	dh_auto_test || exit $?
 endif
 endif

=== added file 'tests/qml/Extinct.Animals.api'
--- tests/qml/Extinct.Animals.api	1970-01-01 00:00:00 +0000
+++ tests/qml/Extinct.Animals.api	2016-03-03 13:07:23 +0000
@@ -0,0 +1,46 @@
+Extinct.Animals.Andrewsarchus 2.0 Paratriisodon: Item
+    property double saggitalCrestSize
+    property double skullSize
+Extinct.Animals.AndrewsarchusMongoliensis 2.5 Paratriisodon: Item
+    property double saggitalCrestSize
+    property double skullSize
+EATarpan: QtObject
+    function kick()
+    property string name
+Extinct.Animals.Europe 4.1: QtObject
+Extinct.Animals.Europe 4.2: Europe
+    readonly property ushort era 4.2
+    function ushort era(uchar year)
+Extinct.Animals.Europe.ModernContinent: Enum
+    America
+    Europe
+Extinct.Animals.Excavator 1.0 1.1
+Extinct.Animals.Gigantophis 4.3: QQuickItem
+    property bool extinct
+    function var first()
+    function var fourth()
+Extinct.Animals.Pangaea 1.0: QtObject singleton
+Extinct.Animals.Pangaea 4.0: Pangaea singleton
+    readonly property ushort era 4.0
+    function ushort era(uchar year)
+Extinct.Animals.Pangaea.ModernContinent: Enum
+    America
+    Europe
+Extinct.Animals.Smilodon 1.0 ScimitarCat 0.1 EASmilodon: QtObject
+    function string paw(int i)
+    property string name
+Extinct.Animals.Titanoboa 4.2 MonsterSnake 3.1 test: Item
+    property string bar
+    property var basket
+    property url bazz
+    property list<Item> buckets
+    property string eggs
+    signal jump()
+    signal bounce(int length)
+    signal fly(var wing)
+    function var first()
+    function var second(var sliff)
+    function var third(var sloff)
+    property string spam
+    property var type
+    property var version

=== modified file 'tests/qml/Extinct/Animals/AnimalModule.pro'
--- tests/qml/Extinct/Animals/AnimalModule.pro	2016-03-02 16:54:13 +0000
+++ tests/qml/Extinct/Animals/AnimalModule.pro	2016-03-03 13:07:23 +0000
@@ -51,8 +51,4 @@
 }
 
 qmldir.files = qmldir
-installPath = $${UBUNTU_CLICK_PLUGIN_PATH}/Extinct/Animals
-qmldir.path = $$installPath
-target.path = $$installPath
-INSTALLS += target qmldir
 

=== modified file 'tests/qml/qml.pro'
--- tests/qml/qml.pro	2016-03-02 16:54:13 +0000
+++ tests/qml/qml.pro	2016-03-03 13:07:23 +0000
@@ -1,4 +1,5 @@
 TEMPLATE = subdirs
 SUBDIRS = Extinct
 
-check.commands += QML2_IMPORT_PATH=$$PWD $$PWD/../../apicheck/apicheck Extinct.Animals > Extinct.Animals.api.new || exit 1
+check.commands += QML2_IMPORT_PATH=$$PWD $$PWD/../../apicheck/apicheck Extinct.Animals > Extinct.Animals.api.new || exit 1;
+check.commands += diff -F '[.0-9]' -u Extinct.Animals.api Extinct.Animals.api.new || exit 1;