[openpilot] 02/03: Use DEP-3 for patches.
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 0a8e6c107a191ee36e00a86a524af8ff48ac3fd0
Author: Anton Gladky <gladk at debian.org>
Date: Sun Apr 12 19:52:39 2015 +0200
Use DEP-3 for patches.
---
debian/patches/{a.p => 10_fix_makefile.patch} | 27 ++-------
...tem_eigen3.patch => 20_use_system_eigen3.patch} | 25 +-------
..._system_zlib.patch => 30_use_system_libs.patch} | 25 +-------
.../{d.p => 40_use_system_buildflags.patch} | 25 +-------
debian/patches/d.p~ | 67 ----------------------
debian/patches/series | 10 ++--
debian/patches/use_system_flags.patch | 58 -------------------
debian/patches/use_system_qwt.patch | 27 ++-------
8 files changed, 18 insertions(+), 246 deletions(-)
diff --git a/debian/patches/a.p b/debian/patches/10_fix_makefile.patch
similarity index 60%
rename from debian/patches/a.p
rename to debian/patches/10_fix_makefile.patch
index 305aaea..f386e0b 100644
--- a/debian/patches/a.p
+++ b/debian/patches/10_fix_makefile.patch
@@ -1,27 +1,8 @@
-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)
+Description: Drop some unnesseccary scopes in Makefile.
+ The original Makefile did not allow to build the project
+ with root privileges.
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>
+Last-Update: 2015-04-12
Index: OpenPilot-RELEASE-15.02.01/Makefile
===================================================================
diff --git a/debian/patches/use_system_eigen3.patch b/debian/patches/20_use_system_eigen3.patch
similarity index 74%
rename from debian/patches/use_system_eigen3.patch
rename to debian/patches/20_use_system_eigen3.patch
index 07ede2b..ae3ad43 100644
--- a/debian/patches/use_system_eigen3.patch
+++ b/debian/patches/20_use_system_eigen3.patch
@@ -1,27 +1,6 @@
-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)
+Description: use packaged version of eigen3-lib instead of embedded
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>
+Last-Update: 2015-04-12
Index: OpenPilot-RELEASE-15.02.01/ground/openpilotgcs/src/plugins/config/config.pro
===================================================================
diff --git a/debian/patches/use_system_zlib.patch b/debian/patches/30_use_system_libs.patch
similarity index 87%
rename from debian/patches/use_system_zlib.patch
rename to debian/patches/30_use_system_libs.patch
index f66aa15..e9c0bb5 100644
--- a/debian/patches/use_system_zlib.patch
+++ b/debian/patches/30_use_system_libs.patch
@@ -1,27 +1,6 @@
-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)
+Description: use packaged versions of zlib, quazip and lib3ds instead of embedded
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>
+Last-Update: 2015-04-12
Index: openpilot-15.02.01/ground/openpilotgcs/src/libs/glc_lib/glc_lib.pro
===================================================================
diff --git a/debian/patches/d.p b/debian/patches/40_use_system_buildflags.patch
similarity index 65%
rename from debian/patches/d.p
rename to debian/patches/40_use_system_buildflags.patch
index 3ea1172..b2ee84a 100644
--- a/debian/patches/d.p
+++ b/debian/patches/40_use_system_buildflags.patch
@@ -1,27 +1,6 @@
-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)
+Description: let dpkg-buildflags set neccessary flags for Qt-files
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>
+Last-Update: 2015-04-12
Index: openpilot-15.02.01/Makefile
===================================================================
diff --git a/debian/patches/d.p~ b/debian/patches/d.p~
deleted file mode 100644
index 9c49883..0000000
--- a/debian/patches/d.p~
+++ /dev/null
@@ -1,67 +0,0 @@
-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
index fb6a9a9..f327d58 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
-a.p
-use_system_eigen3.patch
-#use_system_compilation_flags.patch
-use_system_zlib.patch
-#use_system_qwt.patch
-d.p
+10_fix_makefile.patch
+20_use_system_eigen3.patch
+30_use_system_libs.patch
+40_use_system_buildflags.patch
diff --git a/debian/patches/use_system_flags.patch b/debian/patches/use_system_flags.patch
deleted file mode 100644
index 2cc5d8d..0000000
--- a/debian/patches/use_system_flags.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-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
index 5a5dc4c..be86689 100644
--- a/debian/patches/use_system_qwt.patch
+++ b/debian/patches/use_system_qwt.patch
@@ -1,27 +1,8 @@
-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)
+Description: this patch allows to build openpilot with external qwt-lib.
+ Should be applied, when qwt gets newer 6.2.1 vesion and be built against
+ qt5
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>
+Last-Update: 2015-04-12
--- openpilot-15.02.01.orig/ground/openpilotgcs/src/libs/libs.pro
+++ openpilot-15.02.01/ground/openpilotgcs/src/libs/libs.pro
--
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