[med-svn] [qtltools] 01/02: Replace Correct_Eigen_include.patch by adding DEB_CPPFLAGS_MAINT_APPEND in d/rules

Dylan Aïssi bob.dybian-guest at moszumanska.debian.org
Fri Dec 2 22:41:33 UTC 2016


This is an automated email from the git hooks/post-receive script.

bob.dybian-guest pushed a commit to branch master
in repository qtltools.

commit 8ed18d19d910978db1ede33959414ab4f9d39adf
Author: Dylan Aïssi <bob.dybian at gmail.com>
Date:   Fri Dec 2 22:13:16 2016 +0100

    Replace Correct_Eigen_include.patch by adding DEB_CPPFLAGS_MAINT_APPEND in d/rules
---
 debian/patches/Correct_Eigen_include.patch | 53 ------------------------------
 debian/patches/series                      |  1 -
 debian/rules                               |  1 +
 3 files changed, 1 insertion(+), 54 deletions(-)

diff --git a/debian/patches/Correct_Eigen_include.patch b/debian/patches/Correct_Eigen_include.patch
deleted file mode 100644
index 383e8b3..0000000
--- a/debian/patches/Correct_Eigen_include.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Author: Dylan Aïssi
-Description: Correct include in order to use eigen from Debian repository.
-Last-Update: 2016-11-07
-Forwarded: not-needed
-
---- a/lib/OTools/residualizer.h
-+++ b/lib/OTools/residualizer.h
-@@ -33,8 +33,8 @@
- #include <string>
- 
- //EIGEN INCLUDES
--#include <Eigen/Dense>
--#include <Eigen/LU>
-+#include <eigen3/Eigen/Dense>
-+#include <eigen3/Eigen/LU>
- 
- //EIGEN NAMESPACE
- using namespace Eigen;
---- a/lib/OTools/pca.h
-+++ b/lib/OTools/pca.h
-@@ -21,8 +21,8 @@
- #include <string>
- 
- //EIGEN INCLUDES
--#include <Eigen/Dense>
--#include <Eigen/SVD>
-+#include <eigen3/Eigen/Dense>
-+#include <eigen3/Eigen/SVD>
- #include <iterator>
- 
- //EIGEN NAMESPACE
---- a/src/mode_pca/pca_pca.h
-+++ b/src/mode_pca/pca_pca.h
-@@ -18,7 +18,7 @@
- 
- #include <vector>
- #include <string>
--#include "Eigen/Dense"
-+#include <eigen3/Eigen/Dense>
- #include "../common/data.h"
- 
- class Pca {
---- a/src/mode_pca/pca_pca.cpp
-+++ b/src/mode_pca/pca_pca.cpp
-@@ -16,7 +16,7 @@
- #include "pca_pca.h"
- #include <iostream>
- #include <iterator>
--#include "Eigen/SVD"
-+#include <eigen3/Eigen/SVD>
- 
- 
- using namespace std;
diff --git a/debian/patches/series b/debian/patches/series
index 21f5429..825a79b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 Makefile_config.patch
-Correct_Eigen_include.patch
 Spelling_error.patch
diff --git a/debian/rules b/debian/rules
index 36a8c96..e6dcb09 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_CPPFLAGS_MAINT_APPEND = -I/usr/include/eigen3
 
 %:
 	dh $@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/qtltools.git



More information about the debian-med-commit mailing list