Merge lp:~timo-jyrinki/qtcreator-plugin-ubuntu/packaging into lp:~zeller-benjamin/qtcreator-plugin-ubuntu/sdk-refactor2

[Timo Jyrinki]

Make packaging produce functional packages (but do a hack for initial configure), install lib under arch triplet dir and adjust plugin directory, enable parallel build.

[lp:~timo-jyrinki/qtcreator-plugin-ubuntu/packaging]

379. By Timo Jyrinki on 2015-06-09

Merge trunk.

=== modified file 'debian/qtcreator-plugin-ubuntu-autopilot.install'
--- debian/qtcreator-plugin-ubuntu-autopilot.install	2014-09-30 11:23:06 +0000
+++ debian/qtcreator-plugin-ubuntu-autopilot.install	2015-06-09 06:56:41 +0000
@@ -1,2 +1,2 @@
 usr/share/polkit-1/actions
-usr/lib/*/dist-packages/qtcreator_plugin_ubuntu/*
+usr/lib/python3/dist-packages/qtcreator_plugin_ubuntu/*
 
=== modified file 'debian/qtcreator-plugin-ubuntu-common.install'
--- debian/qtcreator-plugin-ubuntu-common.install	2015-01-16 22:15:55 +0000
+++ debian/qtcreator-plugin-ubuntu-common.install	2015-06-09 06:56:41 +0000
@@ -1,13 +1,3 @@
 usr/bin/ubuntu-sdk
-usr/share/qtcreator/templates/wizards/ubuntu/backend-app-cmake
-usr/share/qtcreator/templates/wizards/ubuntu/backend-app-qmake
-usr/share/qtcreator/templates/wizards/ubuntu/goproject
-usr/share/qtcreator/templates/wizards/ubuntu/html5-simple
-usr/share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake
-usr/share/qtcreator/templates/wizards/ubuntu/scope
-usr/share/qtcreator/templates/wizards/ubuntu/share
-usr/share/qtcreator/templates/wizards/ubuntu/simple-app-qmake
-usr/share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject
-usr/share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake
-usr/share/qtcreator/templates/wizards/ubuntu/webapp
+usr/share/qtcreator/templates/wizards/ubuntu/
 usr/share/qtcreator/ubuntu
 
=== modified file 'debian/qtcreator-plugin-ubuntu.install'
--- debian/qtcreator-plugin-ubuntu.install	2014-12-12 13:42:11 +0000
+++ debian/qtcreator-plugin-ubuntu.install	2015-06-09 06:56:41 +0000
@@ -1,5 +1,4 @@
 debian/ubuntusdk.desktop usr/share/applications
 ubuntu-qtcreator.png usr/share/icons
-usr/lib/*/qtcreator/plugins/Canonical/Ubuntu.pluginspec
-usr/lib/*/qtcreator/plugins/Canonical/libUbuntu.so
+usr/lib/*/qtcreator/plugins/libUbuntu.so
 usr/bin/click-chroot-agent
 
=== modified file 'debian/rules'
--- debian/rules	2015-06-05 09:16:05 +0000
+++ debian/rules	2015-06-09 06:56:41 +0000
@@ -16,10 +16,11 @@
 	dh $@ --fail-missing --parallel
 
 override_dh_auto_configure:
+	# Crude hack, the project needs to be fixed to not require hard coded path name
 	mkdir -p builddir
 	rm -rf ../ubuntu
 	mv ../qtcreator-plugin-ubuntu-* ../ubuntu
-	IDE_LIBRARY_BASENAME=lib/$(DEB_HOST_MULTIARCH) qmake -r ubuntu.pro
+	dh_auto_configure -- IDE_LIBRARY_BASENAME=lib/$(DEB_HOST_MULTIARCH)
 
 override_dh_auto_test:
 	LD_LIBRARY_PATH=/usr/lib/$(DEB_HOST_MULTIARCH)/qtcreator:/usr/lib/$(DEB_HOST_MULTIARCH)/qtcreator/plugins/QtProject make check
 
=== modified file 'src/plugin.pri'
--- src/plugin.pri	2015-05-26 14:35:05 +0000
+++ src/plugin.pri	2015-06-09 06:56:41 +0000
@@ -69,5 +69,5 @@
         LIBS += -L$$DESTDIRBASE/QtProject/$$DESTDIRAPPNAME/plugins/$$QTCREATOR_VERSION/QtProject
     }
     LIBS += -L$$[QT_INSTALL_LIBS]/qtcreator
-    LIBS += -L$$[QT_INSTALL_LIBS]/qtcreator/plugins/QtProject
+    LIBS += -L$$[QT_INSTALL_LIBS]/qtcreator/plugins
 }