From c2a8f8fe11c9b241a7f45296f63c0cf7c127a37b Mon Sep 17 00:00:00 2001
From: Alessio Morale <alessiomorale@gmail.com>
Date: Sun, 1 Feb 2015 21:34:05 +0100
Subject: [PATCH 1/2] OP-1699 - Fix Linux build issue with tagged releases

---
 package/Linux.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/Linux.mk b/package/Linux.mk
index 0acb9d2d5..1dca75269 100644
--- a/package/Linux.mk
+++ b/package/Linux.mk
@@ -6,7 +6,7 @@ ifndef OPENPILOT_IS_COOL
     $(error Top level Makefile must be used to build this target)
 endif
 
-DEB_VER			:= $(PACKAGE_LBL)-1
+DEB_VER			:= $(subst RELEASE-,,$(PACKAGE_LBL))-1
 DEB_DIR			:= $(ROOT_DIR)/package/linux/debian
 DEB_BUILD_DIR		:= $(ROOT_DIR)/debian
 

From 3d797914a3639969540d45e1fbdfa27bffe19ebc Mon Sep 17 00:00:00 2001
From: James Duley <jagduley@gmail.com>
Date: Tue, 3 Feb 2015 15:51:59 +1300
Subject: [PATCH 2/2] OP-1701 Fix Linux Qt config: added a resource with
 qt.conf which has correct prefix set

---
 ground/openpilotgcs/src/app/app.pro    | 4 ++++
 ground/openpilotgcs/src/app/qt.conf    | 2 ++
 ground/openpilotgcs/src/app/qtconf.qrc | 5 +++++
 package/linux/qt.conf                  | 6 ------
 4 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 ground/openpilotgcs/src/app/qt.conf
 create mode 100644 ground/openpilotgcs/src/app/qtconf.qrc
 delete mode 100644 package/linux/qt.conf

diff --git a/ground/openpilotgcs/src/app/app.pro b/ground/openpilotgcs/src/app/app.pro
index 598201b2b..d7b33ccae 100644
--- a/ground/openpilotgcs/src/app/app.pro
+++ b/ground/openpilotgcs/src/app/app.pro
@@ -33,6 +33,10 @@ win32 {
     QMAKE_RPATHDIR = \'\$$ORIGIN\'/$$relative_path($$GCS_LIBRARY_PATH, $$GCS_APP_PATH)
     QMAKE_RPATHDIR += \'\$$ORIGIN\'/$$relative_path($$GCS_QT_LIBRARY_PATH, $$GCS_APP_PATH)
     include(../rpath.pri)
+
+    equals(copyqt, 1) {
+        RESOURCES += qtconf.qrc
+    }
 }
 
 OTHER_FILES += openpilotgcs.rc
diff --git a/ground/openpilotgcs/src/app/qt.conf b/ground/openpilotgcs/src/app/qt.conf
new file mode 100644
index 000000000..f83499f3f
--- /dev/null
+++ b/ground/openpilotgcs/src/app/qt.conf
@@ -0,0 +1,2 @@
+[Paths]
+Prefix = ../lib/openpilotgcs/qt5/
diff --git a/ground/openpilotgcs/src/app/qtconf.qrc b/ground/openpilotgcs/src/app/qtconf.qrc
new file mode 100644
index 000000000..bd4633fa9
--- /dev/null
+++ b/ground/openpilotgcs/src/app/qtconf.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file alias="qt/etc/qt.conf">qt.conf</file>
+</qresource>
+</RCC>
diff --git a/package/linux/qt.conf b/package/linux/qt.conf
deleted file mode 100644
index b8dd60015..000000000
--- a/package/linux/qt.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[Paths]
-Prefix = ..
-Plugins = lib/qt5/plugins
-Imports = lib/qt5/qml
-Qml2Imports = lib/qt5/qml
-Libraries = lib/qt5