[eigen3] 02/07: Refresh patches.

Anton Gladky gladk at moszumanska.debian.org
Tue Jan 27 21:27:06 UTC 2015


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

gladk pushed a commit to branch experimental
in repository eigen3.

commit 22ccf47d4c76ac829ee1d21389c9d7ead9924a48
Author: Anton Gladky <gladk at debian.org>
Date:   Mon Jan 26 21:43:12 2015 +0100

    Refresh patches.
---
 debian/patches/01_install_FindEigen3.patch     |  8 ++++----
 debian/patches/02_remove_buildtype_check.patch |  6 +++---
 debian/patches/03_fix_spline_module.patch      |  6 +++---
 debian/patches/04_remove_piwik.patch           |  6 +++---
 debian/patches/05_fix_warning.patch            | 16 ----------------
 debian/patches/series                          |  1 -
 6 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/debian/patches/01_install_FindEigen3.patch b/debian/patches/01_install_FindEigen3.patch
index 4c1a338..34509be 100644
--- a/debian/patches/01_install_FindEigen3.patch
+++ b/debian/patches/01_install_FindEigen3.patch
@@ -2,17 +2,17 @@ Description: install FindEigen3.cmake into usr/share/cmake-2.8/Modules
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2013-11-09
 
-Index: eigen-eigen-1306d75b4a21/CMakeLists.txt
+Index: eigen-eigen-10219c95fe65/CMakeLists.txt
 ===================================================================
---- eigen-eigen-1306d75b4a21.orig/CMakeLists.txt
-+++ eigen-eigen-1306d75b4a21/CMakeLists.txt
+--- eigen-eigen-10219c95fe65.orig/CMakeLists.txt
++++ eigen-eigen-10219c95fe65/CMakeLists.txt
 @@ -323,6 +323,11 @@ install(FILES
    DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel
    )
  
 +install(FILES
 +  cmake/FindEigen3.cmake
-+  DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake-2.8/Modules
++  DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake-3.0/Modules
 +  )
 +
  if(EIGEN_BUILD_PKGCONFIG)
diff --git a/debian/patches/02_remove_buildtype_check.patch b/debian/patches/02_remove_buildtype_check.patch
index ce13f5f..eb664b7 100644
--- a/debian/patches/02_remove_buildtype_check.patch
+++ b/debian/patches/02_remove_buildtype_check.patch
@@ -2,10 +2,10 @@ Description: Remove build type check in cmake
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2014-01-15
 
-Index: eigen-eigen-1306d75b4a21/CMakeLists.txt
+Index: eigen-eigen-10219c95fe65/CMakeLists.txt
 ===================================================================
---- eigen-eigen-1306d75b4a21.orig/CMakeLists.txt
-+++ eigen-eigen-1306d75b4a21/CMakeLists.txt
+--- eigen-eigen-10219c95fe65.orig/CMakeLists.txt
++++ eigen-eigen-10219c95fe65/CMakeLists.txt
 @@ -15,12 +15,6 @@ if (NOT CMAKE_BUILD_TYPE)
  endif()
  
diff --git a/debian/patches/03_fix_spline_module.patch b/debian/patches/03_fix_spline_module.patch
index c1075ae..ecd885f 100644
--- a/debian/patches/03_fix_spline_module.patch
+++ b/debian/patches/03_fix_spline_module.patch
@@ -4,10 +4,10 @@ Reviewed-By: Anton Gladky <gladk at debian.org>
 Bug-Debian: http://bugs.debian.org/736985
 Last-Update: 2014-01-30
 
-Index: eigen-eigen-1306d75b4a21/unsupported/Eigen/src/Splines/SplineFwd.h
+Index: eigen-eigen-10219c95fe65/unsupported/Eigen/src/Splines/SplineFwd.h
 ===================================================================
---- eigen-eigen-1306d75b4a21.orig/unsupported/Eigen/src/Splines/SplineFwd.h
-+++ eigen-eigen-1306d75b4a21/unsupported/Eigen/src/Splines/SplineFwd.h
+--- eigen-eigen-10219c95fe65.orig/unsupported/Eigen/src/Splines/SplineFwd.h
++++ eigen-eigen-10219c95fe65/unsupported/Eigen/src/Splines/SplineFwd.h
 @@ -67,7 +67,7 @@ namespace Eigen
        typedef Array<_Scalar,Dynamic,Dynamic,RowMajor,NumOfDerivativesAtCompileTime,OrderAtCompileTime> BasisDerivativeType;
        
diff --git a/debian/patches/04_remove_piwik.patch b/debian/patches/04_remove_piwik.patch
index 481d971..97f3d28 100644
--- a/debian/patches/04_remove_piwik.patch
+++ b/debian/patches/04_remove_piwik.patch
@@ -2,10 +2,10 @@ Description: remove piwik scripts.
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2014-02-27
 
-Index: eigen-eigen-1306d75b4a21/doc/eigendoxy_footer.html.in
+Index: eigen-eigen-10219c95fe65/doc/eigendoxy_footer.html.in
 ===================================================================
---- eigen-eigen-1306d75b4a21.orig/doc/eigendoxy_footer.html.in
-+++ eigen-eigen-1306d75b4a21/doc/eigendoxy_footer.html.in
+--- eigen-eigen-10219c95fe65.orig/doc/eigendoxy_footer.html.in
++++ eigen-eigen-10219c95fe65/doc/eigendoxy_footer.html.in
 @@ -17,19 +17,6 @@ $generatedby  <a href="http://www.d
  </small></address>
  <!--END !GENERATE_TREEVIEW-->
diff --git a/debian/patches/05_fix_warning.patch b/debian/patches/05_fix_warning.patch
deleted file mode 100644
index 88cb8c5..0000000
--- a/debian/patches/05_fix_warning.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: fix compilation warning
-Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2014-09-08
-
-Index: eigen3/Eigen/src/Cholesky/LDLT.h
-===================================================================
---- eigen3.orig/Eigen/src/Cholesky/LDLT.h
-+++ eigen3/Eigen/src/Cholesky/LDLT.h
-@@ -502,7 +502,6 @@ struct solve_retval<LDLT<_MatrixType,_Up
-     using std::abs;
-     using std::max;
-     typedef typename LDLTType::MatrixType MatrixType;
--    typedef typename LDLTType::Scalar Scalar;
-     typedef typename LDLTType::RealScalar RealScalar;
-     const typename Diagonal<const MatrixType>::RealReturnType vectorD(dec().vectorD());
-     // In some previous versions, tolerance was set to the max of 1/highest and the maximal diagonal entry * epsilon
diff --git a/debian/patches/series b/debian/patches/series
index 8d2fd03..2737c12 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@
 02_remove_buildtype_check.patch
 03_fix_spline_module.patch
 04_remove_piwik.patch
-05_fix_warning.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/eigen3.git



More information about the debian-science-commits mailing list