[openpilot] 01/03: Add debian-folder.
Anton Gladky
gladk at moszumanska.debian.org
Sun Apr 12 18:08:50 UTC 2015
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository openpilot.
commit 89f7771da4b0653e57947f0e682a090e77e43710
Author: Anton Gladky <gladk at debian.org>
Date: Sun Apr 12 19:39:28 2015 +0200
Add debian-folder.
---
debian/changelog | 5 +
debian/compat | 1 +
debian/control | 15 +++
debian/copyright | 27 ++++
debian/openpilot.udev | 41 ++++++
debian/patches/a.p | 58 ++++++++
debian/patches/d.p | 58 ++++++++
debian/patches/d.p~ | 67 ++++++++++
debian/patches/series | 6 +
debian/patches/use_system_eigen3.patch | 102 ++++++++++++++
debian/patches/use_system_flags.patch | 58 ++++++++
debian/patches/use_system_qwt.patch | 95 +++++++++++++
debian/patches/use_system_zlib.patch | 236 +++++++++++++++++++++++++++++++++
debian/postinst | 40 ++++++
debian/rules | 12 ++
debian/source/format | 1 +
debian/watch | 3 +
17 files changed, 825 insertions(+)
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..3d14cb3
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+openpilot (15.02.01-dfsg1) unstable; urgency=low
+
+ * Initial import. (Closes: #782347)
+
+ -- Anton Gladky <gladk at debian.org> Sat, 04 Apr 2015 15:01:08 +0200
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..b98cfb5
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,15 @@
+Source: openpilot
+Section: science
+Priority: optional
+Maintainer: James Duley <james at openpilot.org>
+Build-Depends: debhelper (>= 9), gcc-arm-none-eabi (>= 4.9.0), python-all-dev, libqt5opengl5-dev, qtbase5-dev, qtbase5-dev-tools, qttools5-dev-tools, libnewlib-arm-none-eabi(>=2.1.0+git20141201), libstdc++-arm-none-eabi-newlib, qtdeclarative5-dev, libqt5svg5-dev, qtscript5-dev, libusb-1.0-0-dev, libqt5serialport5-dev, qtmultimedia5-dev, libsdl1.2-dev, libudev-dev, libc6-i386, binutils-arm-none-eabi (=2.25-3+7), qml-module-qtquick-controls, qtdeclarative5-dev, qml-module-qtquick-controls [...]
+Standards-Version: 3.9.4
+Homepage: http://www.openpilot.org
+Vcs-Git: git://git.openpilot.org/OpenPilot.git
+Vcs-Browser: http://git.openpilot.org/changelog/OpenPilot
+
+Package: openpilot
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, qml-module-qtquick-controls
+Description: OpenPilot GCS
+ OpenPilot Ground Control Station software
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..3d041d3
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,27 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: https://www.openpilot.org/
+Upstream-Name: OpenPilot
+Files-Excluded:
+ flight/Project/Eclipse
+ flight/Project/Wind*
+ ground/openpilotgcs/src/libs/eigen
+ flight/pios/common/libraries/CMSIS/Documentation
+ flight/pios/stm32f0x/libraries/CMSIS/Documentation
+ artwork
+ hardware
+ matlab
+ package/osx
+ package/winx86
+ ground/openpilotgcs/src/libs/glc_lib/3rdparty
+ flight/pios/common/libraries/CMSIS/DSP_Lib
+ flight/pios/common/libraries/CMSIS/Lib
+ flight/pios/common/libraries/CMSIS/SVD
+ flight/pios/common/libraries/CMSIS/*.pdf
+ flight/pios/win32
+
+
+Files: *
+Copyright: 2005-2008 Sandia Corporation, Kitware Inc.
+License: Other
+ ParaView License Version 1.2
+
diff --git a/debian/openpilot.udev b/debian/openpilot.udev
new file mode 100644
index 0000000..fdca376
--- /dev/null
+++ b/debian/openpilot.udev
@@ -0,0 +1,41 @@
+# Skip this section below if this device is not connected by USB
+SUBSYSTEM!="usb", GOTO="op_rules_end"
+
+# OpenPilot openpilot flight control board
+SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="4117", GOTO="op_rules"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="415a", GOTO="op_rules"
+
+# OpenPilot coptercontrol flight control board
+SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="415b", GOTO="op_rules"
+
+# OpenPilot OPLink Mini radio modem board
+SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="415c", GOTO="op_rules"
+
+# OpenPilot Revolution board
+SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="415e", GOTO="op_rules"
+
+# Other OpenPilot reserved pids
+SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="415d", GOTO="op_rules"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="4194", GOTO="op_rules"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="4195", GOTO="op_rules"
+
+
+# unprogrammed openpilot flight control board
+SUBSYSTEM=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="5750", GOTO="op_rules"
+# FTDI FT2232C Dual USB-UART/FIFO IC
+SUBSYSTEM=="usb", ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6010", GOTO="op_rules"
+# Olimex Ltd. OpenOCD JTAG TINY
+SUBSYSTEM=="usb", ATTRS{idVendor}=="15ba", ATTRS{idProduct}=="0004", GOTO="op_rules"
+
+GOTO="op_rules_end"
+
+LABEL="op_rules"
+# Allow any seated user to access the board.
+# uaccess: modern ACL-enabled udev
+# udev-acl: for Ubuntu 12.10 and older
+TAG+="uaccess", TAG+="udev-acl"
+
+# Grant members of the "plugdev" group access to receiver (useful for SSH users)
+#MODE="0664", GROUP="plugdev"
+
+LABEL="op_rules_end"
diff --git a/debian/patches/a.p b/debian/patches/a.p
new file mode 100644
index 0000000..305aaea
--- /dev/null
+++ b/debian/patches/a.p
@@ -0,0 +1,58 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ openpilot (15.02-1) unstable; urgency=low
+ .
+ * Release from upstream Git (testing - unstable)
+Author: Anton Gladky <gladk at debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+Index: OpenPilot-RELEASE-15.02.01/Makefile
+===================================================================
+--- OpenPilot-RELEASE-15.02.01.orig/Makefile
++++ OpenPilot-RELEASE-15.02.01/Makefile
+@@ -80,12 +80,7 @@ SANITIZE_DEPRECATED_VARS := USE_BOOTLOAD
+ $(foreach var, $(SANITIZE_DEPRECATED_VARS), $(eval $(call SANITIZE_VAR,$(var),deprecated)))
+
+ # Make sure this isn't being run as root unless installing (no whoami on Windows, but that is ok here)
+-ifeq ($(shell whoami 2>/dev/null),root)
+- ifeq ($(filter install all_clean,$(MAKECMDGOALS)),)
+- $(error You should not be running this as root)
+- endif
+-endif
+-
++#
+ # Decide on a verbosity level based on the V= parameter
+ export AT := @
+ ifndef V
+Index: OpenPilot-RELEASE-15.02.01/flight/templates/firmware_info.c.template
+===================================================================
+--- OpenPilot-RELEASE-15.02.01.orig/flight/templates/firmware_info.c.template
++++ OpenPilot-RELEASE-15.02.01/flight/templates/firmware_info.c.template
+@@ -48,8 +48,8 @@ const struct fw_version_info fw_version_
+ const struct fw_version_info fw_version_blob __attribute__((used)) __attribute__((__section__(".fw_version_blob"))) = {
+ #endif
+ .magic = { 'O','p','F','w' },
+- .commit_hash_prefix = 0x${HASH8},
+- .timestamp = ${UNIXTIME},
++ .commit_hash_prefix = 0,
++ .timestamp = 0,
+ .board_type = ${BOARD_TYPE},
+ .board_revision = ${BOARD_REVISION},
+ .commit_tag_name = "${FWTAG}",
diff --git a/debian/patches/d.p b/debian/patches/d.p
new file mode 100644
index 0000000..3ea1172
--- /dev/null
+++ b/debian/patches/d.p
@@ -0,0 +1,58 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ openpilot (15.02.01-1) unstable; urgency=low
+ .
+ * Release from upstream Git (testing - unstable)
+Author: Anton Gladky <gladk at debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+Index: openpilot-15.02.01/Makefile
+===================================================================
+--- openpilot-15.02.01.orig/Makefile
++++ openpilot-15.02.01/Makefile
+@@ -79,6 +79,10 @@ $(foreach var, $(SANITIZE_GCC_VARS), $(e
+ SANITIZE_DEPRECATED_VARS := USE_BOOTLOADER CLEAN_BUILD
+ $(foreach var, $(SANITIZE_DEPRECATED_VARS), $(eval $(call SANITIZE_VAR,$(var),deprecated)))
+
++CXXFLAGSTMP = -Wall $(shell dpkg-buildflags --get CXXFLAGS)
++CFLAGSTMP = -Wall $(shell dpkg-buildflags --get CFLAGS)
++LDFLAGSTMP = $(shell dpkg-buildflags --get LDFLAGS)
++
+ # Make sure this isn't being run as root unless installing (no whoami on Windows, but that is ok here)
+ #
+ # Decide on a verbosity level based on the V= parameter
+@@ -164,7 +168,7 @@ endif
+ uavobjgenerator:
+ $(V1) $(MKDIR) -p $(BUILD_DIR)/$@
+ $(V1) ( cd $(BUILD_DIR)/$@ && \
+- $(QMAKE) $(ROOT_DIR)/ground/uavobjgenerator/uavobjgenerator.pro -spec $(QT_SPEC) -r CONFIG+="$(UAVOGEN_BUILD_CONF) $(UAVOGEN_SILENT)" && \
++ $(QMAKE) $(ROOT_DIR)/ground/uavobjgenerator/uavobjgenerator.pro -spec $(QT_SPEC) -r CONFIG+="$(UAVOGEN_BUILD_CONF) $(UAVOGEN_SILENT)" QMAKE_CXXFLAGS="$(CXXFLAGSTMP)" QMAKE_LFLAGS="$(LDFLAGSTMP)" QMAKE_CFLAGS="$(CFLAGSTMP)" && \
+ $(MAKE) --no-print-directory -w ; \
+ )
+
+@@ -472,7 +476,7 @@ openpilotgcs_qmake:
+ ifeq ($(QMAKE_SKIP),)
+ $(V1) $(MKDIR) -p $(BUILD_DIR)/openpilotgcs_$(GCS_BUILD_CONF)
+ $(V1) ( cd $(BUILD_DIR)/openpilotgcs_$(GCS_BUILD_CONF) && \
+- $(QMAKE) $(ROOT_DIR)/ground/openpilotgcs/openpilotgcs.pro -spec $(QT_SPEC) -r CONFIG+="$(GCS_BUILD_CONF) $(GCS_SILENT)" $(GCS_QMAKE_OPTS) \
++ $(QMAKE) $(ROOT_DIR)/ground/openpilotgcs/openpilotgcs.pro -spec $(QT_SPEC) -r CONFIG+="$(GCS_BUILD_CONF) $(GCS_SILENT)" $(GCS_QMAKE_OPTS) QMAKE_CXXFLAGS="$(CXXFLAGSTMP)" QMAKE_LFLAGS="$(LDFLAGSTMP)" QMAKE_CFLAGS="$(CFLAGSTMP)" \
+ )
+ else
+ @$(ECHO) "skipping qmake"
diff --git a/debian/patches/d.p~ b/debian/patches/d.p~
new file mode 100644
index 0000000..9c49883
--- /dev/null
+++ b/debian/patches/d.p~
@@ -0,0 +1,67 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ openpilot (15.02.01-1) unstable; urgency=low
+ .
+ * Release from upstream Git (testing - unstable)
+Author: Anton Gladky <gladk at debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+Index: openpilot-15.02.01/Makefile
+===================================================================
+--- openpilot-15.02.01.orig/Makefile
++++ openpilot-15.02.01/Makefile
+@@ -79,6 +79,10 @@ $(foreach var, $(SANITIZE_GCC_VARS), $(e
+ SANITIZE_DEPRECATED_VARS := USE_BOOTLOADER CLEAN_BUILD
+ $(foreach var, $(SANITIZE_DEPRECATED_VARS), $(eval $(call SANITIZE_VAR,$(var),deprecated)))
+
++CXXFLAGSTMP = -Wall $(shell dpkg-buildflags --get CXXFLAGS)
++CFLAGSTMP = -Wall $(shell dpkg-buildflags --get CFLAGS)
++LDFLAGSTMP = $(shell dpkg-buildflags --get LDFLAGS)
++
+ # Make sure this isn't being run as root unless installing (no whoami on Windows, but that is ok here)
+ #
+ # Decide on a verbosity level based on the V= parameter
+@@ -164,7 +168,7 @@ endif
+ uavobjgenerator:
+ $(V1) $(MKDIR) -p $(BUILD_DIR)/$@
+ $(V1) ( cd $(BUILD_DIR)/$@ && \
+- $(QMAKE) $(ROOT_DIR)/ground/uavobjgenerator/uavobjgenerator.pro -spec $(QT_SPEC) -r CONFIG+="$(UAVOGEN_BUILD_CONF) $(UAVOGEN_SILENT)" && \
++ $(QMAKE) -qt5 $(ROOT_DIR)/ground/uavobjgenerator/uavobjgenerator.pro -spec $(QT_SPEC) -r CONFIG+="$(UAVOGEN_BUILD_CONF) $(UAVOGEN_SILENT)" QMAKE_CXXFLAGS="$(CXXFLAGSTMP)" QMAKE_LFLAGS="$(LDFLAGSTMP)" QMAKE_CFLAGS="$(CFLAGSTMP)" && \
+ $(MAKE) --no-print-directory -w ; \
+ )
+
+@@ -472,7 +476,7 @@ openpilotgcs_qmake:
+ ifeq ($(QMAKE_SKIP),)
+ $(V1) $(MKDIR) -p $(BUILD_DIR)/openpilotgcs_$(GCS_BUILD_CONF)
+ $(V1) ( cd $(BUILD_DIR)/openpilotgcs_$(GCS_BUILD_CONF) && \
+- $(QMAKE) $(ROOT_DIR)/ground/openpilotgcs/openpilotgcs.pro -spec $(QT_SPEC) -r CONFIG+="$(GCS_BUILD_CONF) $(GCS_SILENT)" $(GCS_QMAKE_OPTS) \
++ $(QMAKE) -qt5 $(ROOT_DIR)/ground/openpilotgcs/openpilotgcs.pro -spec $(QT_SPEC) -r CONFIG+="$(GCS_BUILD_CONF) $(GCS_SILENT)" $(GCS_QMAKE_OPTS) QMAKE_CXXFLAGS="$(CXXFLAGSTMP)" QMAKE_LFLAGS="$(LDFLAGSTMP)" QMAKE_CFLAGS="$(CFLAGSTMP)" \
+ )
+ else
+ @$(ECHO) "skipping qmake"
+@@ -505,7 +509,7 @@ uploader_qmake:
+ ifeq ($(QMAKE_SKIP),)
+ $(V1) $(MKDIR) -p $(BUILD_DIR)/uploader_$(GCS_BUILD_CONF)
+ $(V1) ( cd $(BUILD_DIR)/uploader_$(GCS_BUILD_CONF) && \
+- $(QMAKE) $(ROOT_DIR)/ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/upload.pro -spec $(QT_SPEC) -r CONFIG+="$(GCS_BUILD_CONF) $(GCS_SILENT)" $(GCS_QMAKE_OPTS) \
++ $(QMAKE) -qt5 $(ROOT_DIR)/ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/upload.pro -spec $(QT_SPEC) -r CONFIG+="$(GCS_BUILD_CONF) $(GCS_SILENT)" $(GCS_QMAKE_OPTS) \
+ )
+ else
+ @$(ECHO) "skipping qmake"
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..fb6a9a9
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,6 @@
+a.p
+use_system_eigen3.patch
+#use_system_compilation_flags.patch
+use_system_zlib.patch
+#use_system_qwt.patch
+d.p
diff --git a/debian/patches/use_system_eigen3.patch b/debian/patches/use_system_eigen3.patch
new file mode 100644
index 0000000..07ede2b
--- /dev/null
+++ b/debian/patches/use_system_eigen3.patch
@@ -0,0 +1,102 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ openpilot (15.02.01-1) unstable; urgency=low
+ .
+ * Release from upstream Git (testing - unstable)
+Author: Anton Gladky <gladk at debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+Index: OpenPilot-RELEASE-15.02.01/ground/openpilotgcs/src/plugins/config/config.pro
+===================================================================
+--- OpenPilot-RELEASE-15.02.01.orig/ground/openpilotgcs/src/plugins/config/config.pro
++++ OpenPilot-RELEASE-15.02.01/ground/openpilotgcs/src/plugins/config/config.pro
+@@ -6,7 +6,7 @@ QT += svg opengl qml quick
+
+ include(config_dependencies.pri)
+
+-INCLUDEPATH += ../../libs/eigen
++INCLUDEPATH += /usr/include/eigen3
+
+ OTHER_FILES += \
+ Config.pluginspec \
+Index: OpenPilot-RELEASE-15.02.01/ground/openpilotgcs/src/plugins/config/calibration/calibrationutils.h
+===================================================================
+--- OpenPilot-RELEASE-15.02.01.orig/ground/openpilotgcs/src/plugins/config/calibration/calibrationutils.h
++++ OpenPilot-RELEASE-15.02.01/ground/openpilotgcs/src/plugins/config/calibration/calibrationutils.h
+@@ -28,9 +28,8 @@
+
+ #ifndef CALIBRATIONUTILS_H
+ #define CALIBRATIONUTILS_H
+-#include <Eigen/Core>
+-#include <Eigen/Eigenvalues>
+ #include <Eigen/Dense>
++#include <Eigen/Eigenvalues>
+ #include <Eigen/LU>
+ #include <QList>
+ namespace OpenPilot {
+Index: OpenPilot-RELEASE-15.02.01/ground/openpilotgcs/src/plugins/config/alignment-calibration.cpp
+===================================================================
+--- OpenPilot-RELEASE-15.02.01.orig/ground/openpilotgcs/src/plugins/config/alignment-calibration.cpp
++++ OpenPilot-RELEASE-15.02.01/ground/openpilotgcs/src/plugins/config/alignment-calibration.cpp
+@@ -1,5 +1,5 @@
+ #include "calibration.h"
+-#include <Eigen/Core>
++#include <Eigen/Dense>
+ #include <Eigen/Cholesky>
+ #include <Eigen/Geometry>
+
+Index: OpenPilot-RELEASE-15.02.01/ground/openpilotgcs/src/plugins/config/assertions.h
+===================================================================
+--- OpenPilot-RELEASE-15.02.01.orig/ground/openpilotgcs/src/plugins/config/assertions.h
++++ OpenPilot-RELEASE-15.02.01/ground/openpilotgcs/src/plugins/config/assertions.h
+@@ -24,7 +24,7 @@
+ #ifndef AHRS_ASSERTIONS_HPP
+ #define AHRS_ASSERTIONS_HPP
+
+-#include <Eigen/Core>
++#include <Eigen/Dense>
+ #include <cmath>
+
+ template<typename MatrixBase>
+Index: OpenPilot-RELEASE-15.02.01/ground/openpilotgcs/src/plugins/config/calibration.h
+===================================================================
+--- OpenPilot-RELEASE-15.02.01.orig/ground/openpilotgcs/src/plugins/config/calibration.h
++++ OpenPilot-RELEASE-15.02.01/ground/openpilotgcs/src/plugins/config/calibration.h
+@@ -1,7 +1,7 @@
+ #ifndef AHRS_CALIBRATION_HPP
+ #define AHRS_CALIBRATION_HPP
+
+-#include <Eigen/Core>
++#include <Eigen/Dense>
+ #include <cstdlib>
+ using std::size_t;
+ using namespace Eigen;
+Index: OpenPilot-RELEASE-15.02.01/ground/openpilotgcs/src/plugins/config/twostep.cpp
+===================================================================
+--- OpenPilot-RELEASE-15.02.01.orig/ground/openpilotgcs/src/plugins/config/twostep.cpp
++++ OpenPilot-RELEASE-15.02.01/ground/openpilotgcs/src/plugins/config/twostep.cpp
+@@ -28,7 +28,6 @@
+
+ #include <calibration.h>
+ #include <assertions.h>
+-#include <Eigen/Eigen2Support>
+
+ #include <cstdlib>
+
diff --git a/debian/patches/use_system_flags.patch b/debian/patches/use_system_flags.patch
new file mode 100644
index 0000000..2cc5d8d
--- /dev/null
+++ b/debian/patches/use_system_flags.patch
@@ -0,0 +1,58 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ openpilot (15.02.01-1) unstable; urgency=low
+ .
+ * Release from upstream Git (testing - unstable)
+Author: Anton Gladky <gladk at debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- openpilot-15.02.01.orig/Makefile
++++ openpilot-15.02.01/Makefile
+@@ -55,30 +55,6 @@ UAVOGEN_BUILD_CONF := release
+ ANDROIDGCS_BUILD_CONF := debug
+ GOOGLE_API_VERSION := 14
+
+-# Clean out undesirable variables from the environment and command-line
+-# to remove the chance that they will cause problems with our build
+-define SANITIZE_VAR
+-$(if $(filter-out undefined,$(origin $(1))),
+- $(info $(EMPTY) NOTE Sanitized $(2) variable '$(1)' from $(origin $(1)))
+- MAKEOVERRIDES = $(filter-out $(1)=%,$(MAKEOVERRIDES))
+- override $(1) :=
+- unexport $(1)
+-)
+-endef
+-
+-# These specific variables can influence compilation in unexpected (and undesirable) ways
+-# gcc flags
+-SANITIZE_GCC_VARS := TMPDIR GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH
+-# preprocessor flags
+-SANITIZE_GCC_VARS += CPATH C_INCLUDE_PATH CPLUS_INCLUDE_PATH OBJC_INCLUDE_PATH DEPENDENCIES_OUTPUT
+-# make flags
+-SANITIZE_GCC_VARS += CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LDLIBS
+-$(foreach var, $(SANITIZE_GCC_VARS), $(eval $(call SANITIZE_VAR,$(var),disallowed)))
+-
+-# These specific variables used to be valid but now they make no sense
+-SANITIZE_DEPRECATED_VARS := USE_BOOTLOADER CLEAN_BUILD
+-$(foreach var, $(SANITIZE_DEPRECATED_VARS), $(eval $(call SANITIZE_VAR,$(var),deprecated)))
+-
+ # Make sure this isn't being run as root unless installing (no whoami on Windows, but that is ok here)
+ #
+ # Decide on a verbosity level based on the V= parameter
diff --git a/debian/patches/use_system_qwt.patch b/debian/patches/use_system_qwt.patch
new file mode 100644
index 0000000..5a5dc4c
--- /dev/null
+++ b/debian/patches/use_system_qwt.patch
@@ -0,0 +1,95 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ openpilot (15.02.01-1) unstable; urgency=low
+ .
+ * Release from upstream Git (testing - unstable)
+Author: Anton Gladky <gladk at debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- openpilot-15.02.01.orig/ground/openpilotgcs/src/libs/libs.pro
++++ openpilot-15.02.01/ground/openpilotgcs/src/libs/libs.pro
+@@ -10,7 +10,7 @@ SUBDIRS = \
+ glc_lib \
+ utils \
+ opmapcontrol \
+- qwt \
+ sdlgamepad
+
+ SUBDIRS +=
++LIBS += -lqwt
+--- openpilot-15.02.01.orig/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp
++++ openpilot-15.02.01/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp
+@@ -46,10 +46,10 @@
+ #include "altitudeholdsettings.h"
+ #include "stabilizationsettings.h"
+
+-#include "qwt/src/qwt.h"
+-#include "qwt/src/qwt_plot.h"
+-#include "qwt/src/qwt_plot_canvas.h"
+-#include "qwt/src/qwt_scale_widget.h"
++#include <qwt/qwt.h>
++#include <qwt/qwt_plot.h>
++#include <qwt/qwt_plot_canvas.h>
++#include <qwt/qwt_scale_widget.h>
+
+ ConfigStabilizationWidget::ConfigStabilizationWidget(QWidget *parent) : ConfigTaskWidget(parent),
+ boardModel(0), m_stabSettingsBankCount(0), m_currentStabSettingsBank(0)
+--- openpilot-15.02.01.orig/ground/openpilotgcs/src/plugins/scope/plotdata.h
++++ openpilot-15.02.01/ground/openpilotgcs/src/plugins/scope/plotdata.h
+@@ -30,12 +30,12 @@
+
+ #include "uavobject.h"
+
+-#include "qwt/src/qwt.h"
+-#include "qwt/src/qwt_plot.h"
+-#include "qwt/src/qwt_plot_curve.h"
+-#include "qwt/src/qwt_scale_draw.h"
+-#include "qwt/src/qwt_scale_widget.h"
+-#include <qwt/src/qwt_plot_marker.h>
++#include <qwt/qwt.h>
++#include <qwt/qwt_plot.h>
++#include <qwt/qwt_plot_curve.h>
++#include <qwt/qwt_scale_draw.h>
++#include <qwt/qwt_scale_widget.h>
++#include <qwt/qwt_plot_marker.h>
+
+ #include <QTimer>
+ #include <QTime>
+--- openpilot-15.02.01.orig/ground/openpilotgcs/src/plugins/scope/scopegadgetwidget.h
++++ openpilot-15.02.01/ground/openpilotgcs/src/plugins/scope/scopegadgetwidget.h
+@@ -30,12 +30,12 @@
+
+ #include "plotdata.h"
+
+-#include "qwt/src/qwt.h"
+-#include "qwt/src/qwt_legend.h"
+-#include "qwt/src/qwt_plot.h"
+-#include "qwt/src/qwt_plot_curve.h"
+-#include "qwt/src/qwt_scale_draw.h"
+-#include "qwt/src/qwt_scale_widget.h"
++#include <qwt/qwt.h>
++#include <qwt/qwt_legend.h>
++#include <qwt/qwt_plot.h>
++#include <qwt/qwt_plot_curve.h>
++#include <qwt/qwt_scale_draw.h>
++#include <qwt/qwt_scale_widget.h>
+
+ #include <QTimer>
+ #include <QTime>
diff --git a/debian/patches/use_system_zlib.patch b/debian/patches/use_system_zlib.patch
new file mode 100644
index 0000000..f66aa15
--- /dev/null
+++ b/debian/patches/use_system_zlib.patch
@@ -0,0 +1,236 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ openpilot (15.02.01-1) unstable; urgency=low
+ .
+ * Release from upstream Git (testing - unstable)
+Author: Anton Gladky <gladk at debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+Index: openpilot-15.02.01/ground/openpilotgcs/src/libs/glc_lib/glc_lib.pro
+===================================================================
+--- openpilot-15.02.01.orig/ground/openpilotgcs/src/libs/glc_lib/glc_lib.pro
++++ openpilot-15.02.01/ground/openpilotgcs/src/libs/glc_lib/glc_lib.pro
+@@ -21,43 +21,13 @@ unix:UI_DIR = ./Build
+
+ DEPENDPATH += .
+ INCLUDEPATH += .
+-INCLUDEPATH += ./3rdparty/zlib
++INCLUDEPATH += /usr/include/lib3ds/
++INCLUDEPATH += /usr/include/gtkglext-1.0/gdk/glext/
++INCLUDEPATH += /usr/include/quazip/
+
+ RESOURCES += glc_lib.qrc
+
+ # Input
+-HEADERS_QUAZIP += 3rdparty/quazip/crypt.h \
+- 3rdparty/quazip/ioapi.h \
+- 3rdparty/quazip/quazip.h \
+- 3rdparty/quazip/quazipfile.h \
+- 3rdparty/quazip/quazipfileinfo.h \
+- 3rdparty/quazip/quazipnewinfo.h \
+- 3rdparty/quazip/unzip.h \
+- 3rdparty/quazip/zip.h
+-
+-HEADERS_LIB3DS += 3rdparty/lib3ds/atmosphere.h \
+- 3rdparty/lib3ds/background.h \
+- 3rdparty/lib3ds/camera.h \
+- 3rdparty/lib3ds/chunk.h \
+- 3rdparty/lib3ds/chunktable.h \
+- 3rdparty/lib3ds/ease.h \
+- 3rdparty/lib3ds/file.h \
+- 3rdparty/lib3ds/io.h \
+- 3rdparty/lib3ds/light.h \
+- 3rdparty/lib3ds/material.h \
+- 3rdparty/lib3ds/matrix.h \
+- 3rdparty/lib3ds/mesh.h \
+- 3rdparty/lib3ds/node.h \
+- 3rdparty/lib3ds/quat.h \
+- 3rdparty/lib3ds/shadow.h \
+- 3rdparty/lib3ds/tcb.h \
+- 3rdparty/lib3ds/tracks.h \
+- 3rdparty/lib3ds/types.h \
+- 3rdparty/lib3ds/vector.h \
+- 3rdparty/lib3ds/viewport.h
+-
+-HEADERS_GLEXT += 3rdparty/glext/glext.h
+-
+ HEADERS_GLC_MATHS += maths/glc_utils_maths.h \
+ maths/glc_vector2d.h \
+ maths/glc_vector2df.h \
+@@ -180,48 +150,10 @@ HEADERS_GLC_3DWIDGET += 3DWidget/glc_3dw
+
+ HEADERS_GLC_GLU += glu/glc_glu.h
+
+-HEADERS += $${HEADERS_QUAZIP} $${HEADERS_LIB3DS} $${HEADERS_GLC_MATHS} $${HEADERS_GLC_IO}
+-HEADERS += $${HEADERS_GLC} $${HEADERS_GLEXT} $${HEADERS_GLC_SCENEGRAPH} $${HEADERS_GLC_GEOMETRY}
++HEADERS += $${HEADERS_GLC_MATHS} $${HEADERS_GLC_IO}
++HEADERS += $${HEADERS_GLC} $${HEADERS_GLC_SCENEGRAPH} $${HEADERS_GLC_GEOMETRY}
+ HEADERS += $${HEADERS_GLC_SHADING} $${HEADERS_GLC_VIEWPORT} $${HEADERS_GLC_3DWIDGET} $${HEADERS_GLC_GLU}
+
+-SOURCES += 3rdparty/zlib/adler32.c \
+- 3rdparty/zlib/compress.c \
+- 3rdparty/zlib/crc32.c \
+- 3rdparty/zlib/deflate.c \
+- 3rdparty/zlib/gzio.c \
+- 3rdparty/zlib/inffast.c \
+- 3rdparty/zlib/inflate.c \
+- 3rdparty/zlib/inftrees.c \
+- 3rdparty/zlib/trees.c \
+- 3rdparty/zlib/uncompr.c \
+- 3rdparty/zlib/zutil.c
+-
+-SOURCES += 3rdparty/quazip/ioapi.c \
+- 3rdparty/quazip/quazip.cpp \
+- 3rdparty/quazip/quazipfile.cpp \
+- 3rdparty/quazip/quazipnewinfo.cpp \
+- 3rdparty/quazip/unzip.c \
+- 3rdparty/quazip/zip.c
+-
+-SOURCES += 3rdparty/lib3ds/atmosphere.c \
+- 3rdparty/lib3ds/background.c \
+- 3rdparty/lib3ds/camera.c \
+- 3rdparty/lib3ds/chunk.c \
+- 3rdparty/lib3ds/ease.c \
+- 3rdparty/lib3ds/file.c \
+- 3rdparty/lib3ds/io.c \
+- 3rdparty/lib3ds/light.c \
+- 3rdparty/lib3ds/material.c \
+- 3rdparty/lib3ds/matrix.c \
+- 3rdparty/lib3ds/mesh.c \
+- 3rdparty/lib3ds/node.c \
+- 3rdparty/lib3ds/quat.c \
+- 3rdparty/lib3ds/shadow.c \
+- 3rdparty/lib3ds/tcb.c \
+- 3rdparty/lib3ds/tracks.c \
+- 3rdparty/lib3ds/vector.c \
+- 3rdparty/lib3ds/viewport.c
+-
+ SOURCES += maths/glc_matrix4x4.cpp \
+ maths/glc_vector4d.cpp \
+ maths/glc_interpolator.cpp \
+@@ -448,12 +380,10 @@ unix {
+ # Location of HEADERS and library
+ LIB_DIR = /usr/local/lib
+ INCLUDE_DIR = /usr/local/include
++ LIBS += -lz -l3ds -lquazip-qt5
+ # Adds a -P to preserve link
+ QMAKE_COPY_FILE = $${QMAKE_COPY_FILE} -P
+ include.path = $${INCLUDE_DIR}/GLC_lib
+- include_lib3ds.path = $${INCLUDE_DIR}/GLC_lib/3rdparty/lib3ds
+- include_glext.path = $${INCLUDE_DIR}/GLC_lib/3rdparty/glext
+- include_quazip.path = $${INCLUDE_DIR}/GLC_lib/3rdparty/quazip
+ include_glc_maths.path = $${INCLUDE_DIR}/GLC_lib/maths
+ include_glc_io.path = $${INCLUDE_DIR}/GLC_lib/io
+ include_glc_scengraph.path = $${INCLUDE_DIR}/GLC_lib/sceneGraph
+@@ -484,9 +414,6 @@ win32 {
+ }
+
+ include.files = $${HEADERS_GLC} $${HEADERS_INST}
+-include_lib3ds.files = $${HEADERS_LIB3DS}
+-include_glext.files =$${HEADERS_GLEXT}
+-include_quazip.files = $${HEADERS_QUAZIP}
+ include_glc_maths.files= $${HEADERS_GLC_MATHS}
+ include_glc_io.files= $${HEADERS_GLC_IO}
+ include_glc_scengraph.files= $${HEADERS_GLC_SCENEGRAPH}
+Index: openpilot-15.02.01/ground/openpilotgcs/src/libs/glc_lib/glc_ext.h
+===================================================================
+--- openpilot-15.02.01.orig/ground/openpilotgcs/src/libs/glc_lib/glc_ext.h
++++ openpilot-15.02.01/ground/openpilotgcs/src/libs/glc_lib/glc_ext.h
+@@ -29,7 +29,7 @@
+ #if !defined(Q_OS_MAC)
+
+ // GL_point_parameters Point Sprite
+-#include "3rdparty/glext/glext.h"
++#include </usr/include/gtkglext-1.0/gdk/glext/glext.h>
+ extern PFNGLPOINTPARAMETERFARBPROC glPointParameterf;
+ extern PFNGLPOINTPARAMETERFVARBPROC glPointParameterfv;
+
+Index: openpilot-15.02.01/ground/openpilotgcs/src/libs/glc_lib/io/glc_3dstoworld.cpp
+===================================================================
+--- openpilot-15.02.01.orig/ground/openpilotgcs/src/libs/glc_lib/io/glc_3dstoworld.cpp
++++ openpilot-15.02.01/ground/openpilotgcs/src/libs/glc_lib/io/glc_3dstoworld.cpp
+@@ -36,11 +36,11 @@
+ #include "../sceneGraph/glc_structoccurence.h"
+
+ // Lib3ds Header
+-#include "3rdparty/lib3ds/file.h"
+-#include "3rdparty/lib3ds/mesh.h"
+-#include "3rdparty/lib3ds/node.h"
+-#include "3rdparty/lib3ds/matrix.h"
+-#include "3rdparty/lib3ds/material.h"
++#include "file.h"
++#include "mesh.h"
++#include "node.h"
++#include "matrix.h"
++#include "material.h"
+
+ #include <QFileInfo>
+ #include <QGLContext>
+Index: openpilot-15.02.01/ground/openpilotgcs/src/libs/glc_lib/io/glc_worldto3ds.cpp
+===================================================================
+--- openpilot-15.02.01.orig/ground/openpilotgcs/src/libs/glc_lib/io/glc_worldto3ds.cpp
++++ openpilot-15.02.01/ground/openpilotgcs/src/libs/glc_lib/io/glc_worldto3ds.cpp
+@@ -31,11 +31,11 @@
+ #include "../shading/glc_material.h"
+
+ // Lib3ds Header
+-#include "3rdparty/lib3ds/file.h"
+-#include "3rdparty/lib3ds/mesh.h"
+-#include "3rdparty/lib3ds/node.h"
+-#include "3rdparty/lib3ds/matrix.h"
+-#include "3rdparty/lib3ds/material.h"
++#include "file.h"
++#include "mesh.h"
++#include "node.h"
++#include "matrix.h"
++#include "material.h"
+
+ #include "glc_worldto3ds.h"
+
+Index: openpilot-15.02.01/ground/openpilotgcs/src/libs/glc_lib/io/glc_worldto3dxml.cpp
+===================================================================
+--- openpilot-15.02.01.orig/ground/openpilotgcs/src/libs/glc_lib/io/glc_worldto3dxml.cpp
++++ openpilot-15.02.01/ground/openpilotgcs/src/libs/glc_lib/io/glc_worldto3dxml.cpp
+@@ -23,8 +23,8 @@
+
+ #include "glc_worldto3dxml.h"
+ // Quazip library
+-#include "../3rdparty/quazip/quazip.h"
+-#include "../3rdparty/quazip/quazipfile.h"
++#include <quazip.h>
++#include <quazipfile.h>
+ #include "../glc_exception.h"
+ #include "../geometry/glc_mesh.h"
+
+Index: openpilot-15.02.01/ground/openpilotgcs/src/libs/glc_lib/io/glc_3dxmltoworld.cpp
+===================================================================
+--- openpilot-15.02.01.orig/ground/openpilotgcs/src/libs/glc_lib/io/glc_3dxmltoworld.cpp
++++ openpilot-15.02.01/ground/openpilotgcs/src/libs/glc_lib/io/glc_3dxmltoworld.cpp
+@@ -30,8 +30,8 @@
+ #include "glc_xmlutil.h"
+
+ // Quazip library
+-#include "../3rdparty/quazip/quazip.h"
+-#include "../3rdparty/quazip/quazipfile.h"
++#include <quazip.h>
++#include <quazipfile.h>
+
+ #include <QString>
+ #include <QGLContext>
diff --git a/debian/postinst b/debian/postinst
new file mode 100644
index 0000000..e58a3e1
--- /dev/null
+++ b/debian/postinst
@@ -0,0 +1,40 @@
+#!/bin/sh
+# postinst script for openpilot
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <postinst> `abort-remove'
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+ configure)
+ /sbin/udevadm control --reload-rules >&2
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..e40a285
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,12 @@
+#!/usr/bin/make -f
+
+export QT_SELECT=5
+
+%:
+ dh $@ --parallel
+
+override_dh_auto_build:
+ $(MAKE) all
+
+override_dh_auto_install:
+ dh_auto_install -- prefix=/usr
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..4f9c175
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=3
+opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)\d*)$/$1~$2/,dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$// \
+https://github.com/openpilot/OpenPilot/tags .*/RELEASE-?(\d\S*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/openpilot.git
More information about the debian-science-commits
mailing list