From f59512cdc142e35cdf0a5ac2ec94e7e8062d83c2 Mon Sep 17 00:00:00 2001 From: James Duley Date: Thu, 19 Feb 2015 12:40:20 +1300 Subject: [PATCH] OP-1695 Ubuntu PPA: added trusty depends workaround --- package/Linux.mk | 11 +++++++++++ package/linux/debian/control | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/package/Linux.mk b/package/Linux.mk index 19972b3bf..76657eca4 100644 --- a/package/Linux.mk +++ b/package/Linux.mk @@ -20,6 +20,14 @@ DEB_DIR := package/linux/debian SED_DATE_STRG = $(shell date -R) SED_SCRIPT = s//$(UPSTREAM_VER)-$(DEB_REV)/;s//$(SED_DATE_STRG)/;s//$(DEB_DIST)/ +# Ubuntu 14.04 (Trusty Tahr) has different names for the qml-modules +TRUSTY_DEPS_SED := s/qml-module-qtquick-controls/qtdeclarative5-controls-plugin/g; \ + s/qml-module-qtquick-dialogs/qtdeclarative5-dialogs-plugin/g; \ + s/qml-module-qtquick-localstorage/qtdeclarative5-localstorage-plugin/g; \ + s/qml-module-qtquick-particles2/qtdeclarative5-particles-plugin/g; \ + s/qml-module-qtquick2/qtdeclarative5-qtquick2-plugin/g; \ + s/qml-module-qtquick-window2/qtdeclarative5-window-plugin/g; \ + s/qml-module-qtquick-xmllistmodel/qtdeclarative5-xmllistmodel-plugin/g; .PHONY: package package: debian @@ -35,6 +43,9 @@ debian: $(DEB_DIR) $(V1) rm -rf debian $(V1) cp -rL $(DEB_DIR) debian $(V1) sed -i -e "$(SED_SCRIPT)" debian/changelog +ifeq ($(DEB_DIST), trusty) + $(V1) sed -i -e "$(TRUSTY_DEPS_SED)" debian/control +endif .PHONY: package_src package_src: $(DEB_ORIG_SRC_NAME) $(DEB_PACKAGE_DIR) diff --git a/package/linux/debian/control b/package/linux/debian/control index 0734154a6..db02e54a7 100644 --- a/package/linux/debian/control +++ b/package/linux/debian/control @@ -2,7 +2,7 @@ Source: openpilot Section: electronics Priority: optional Maintainer: James Duley -Build-Depends: debhelper (>= 9), libudev-dev, libusb-1.0-0-dev, libsdl1.2-dev, python, gcc-arm-none-eabi (>=4.9), qt5-default, qttools5-dev-tools, libqt5svg5-dev, qtdeclarative5-dev, qtdeclarative5-controls-plugin, libqt5serialport5-dev, qtmultimedia5-dev, qtscript5-dev, libqt5opengl5-dev +Build-Depends: debhelper (>= 9), libudev-dev, libusb-1.0-0-dev, libsdl1.2-dev, python, gcc-arm-none-eabi (>=4.9), qt5-default, qttools5-dev-tools, libqt5svg5-dev, qtdeclarative5-dev, qml-module-qtquick-controls, libqt5serialport5-dev, qtmultimedia5-dev, qtscript5-dev, libqt5opengl5-dev Standards-Version: 3.9.5 Homepage: http://www.openpilot.org Vcs-Git: git://git.openpilot.org/OpenPilot.git