[SCM] step packaging branch, master, updated. debian/4.12.2-2-6-gb892c00

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/step.git;a=commitdiff;h=75a6c41

The following commit has been merged in the master branch:
commit 75a6c41b474f02a585d0f7cd8625ba5ef9adec32
Author: Maximiliano Curia <maxy at debian.org>
Date:   Fri Jul 25 12:40:44 2014 +0200

    Refresh patch.
---
 debian/changelog                              |  1 +
 debian/patches/replace_eigen2_by_eigen3.patch | 35 ++++++++++++++++-----------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f3692b9..aa880e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ step (4:4.13.3-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Add basic autopkgtests.
+  * Refresh patch.
 
  -- Maximiliano Curia <maxy at debian.org>  Wed, 16 Jul 2014 13:06:03 +0200
 
diff --git a/debian/patches/replace_eigen2_by_eigen3.patch b/debian/patches/replace_eigen2_by_eigen3.patch
index 53c2b49..610263c 100644
--- a/debian/patches/replace_eigen2_by_eigen3.patch
+++ b/debian/patches/replace_eigen2_by_eigen3.patch
@@ -3,8 +3,10 @@ Author: Anton Gladky <gladk at debian.org>
 Bug-Debian: http://bugs.debian.org/726162
 Last-Update: 2013-12-01
 
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
+Index: step/CMakeLists.txt
+===================================================================
+--- step.orig/CMakeLists.txt	2014-07-25 12:37:10.992073323 +0200
++++ step/CMakeLists.txt	2014-07-25 12:38:35.948713478 +0200
 @@ -9,11 +9,11 @@
  
  set(CMAKE_MODULE_PATH ${step_SOURCE_DIR}/cmake/modules )
@@ -19,7 +21,7 @@ Last-Update: 2013-12-01
  macro_log_feature(QALCULATE_FOUND "Qalculate" "Unit conversion support in Step" "http://qalculate.sourceforge.net/" FALSE "0.9.5" "")
  macro_log_feature(GSL_FOUND "GSL" "Provides a GSL-powered solver for Step" "http://www.gnu.org/software/gsl/" FALSE "1.8" "")
  
-@@ -22,8 +22,9 @@
+@@ -21,15 +21,16 @@
  set(STEPCORE_WITH_QT ON) # CACHE BOOL "Enable QT-powered features for StepCore")
  set(STEP_WITH_QALCULATE ${QALCULATE_FOUND} CACHE BOOL "Enable unit conversion support using libqalculate")
  
@@ -31,17 +33,18 @@ Last-Update: 2013-12-01
  
     add_subdirectory(doc) 
     add_subdirectory(stepcore)
-@@ -32,7 +33,7 @@
-    if(STEPCORE_TESTS)
-      add_subdirectory(stepcore_tests)
-    endif(STEPCORE_TESTS)
+    add_subdirectory(step)
+ 
+    add_subdirectory(stepcore_tests)
 -endif (EIGEN2_FOUND)
 +endif (EIGEN3_FOUND)
  
  if (${CMAKE_CURRENT_SOURCE_DIR} STREQUAL ${CMAKE_SOURCE_DIR})
     macro_display_feature_log()
---- a/step/propertiesbrowser.cc
-+++ b/step/propertiesbrowser.cc
+Index: step/step/propertiesbrowser.cc
+===================================================================
+--- step.orig/step/propertiesbrowser.cc	2014-07-25 12:37:10.992073323 +0200
++++ step/step/propertiesbrowser.cc	2014-07-25 12:37:10.988073482 +0200
 @@ -389,7 +389,7 @@
                          if(p->userTypeId() == QMetaType::Double) {
                              vv = 0;
@@ -51,8 +54,10 @@ Last-Update: 2013-12-01
                              vv = QVariant::fromValue(svv);
                          /* XXX
                           * } else if(p->userTypeId() == qMetaTypeId<StepCore::Vector2dList >())
---- a/stepcore/constraintsolver.cc
-+++ b/stepcore/constraintsolver.cc
+Index: step/stepcore/constraintsolver.cc
+===================================================================
+--- step.orig/stepcore/constraintsolver.cc	2014-07-25 12:37:10.992073323 +0200
++++ step/stepcore/constraintsolver.cc	2014-07-25 12:37:10.988073482 +0200
 @@ -96,7 +96,7 @@
              ++fmaxIndex;
          }
@@ -62,9 +67,11 @@ Last-Update: 2013-12-01
  
      info->force = info->jacobian.transpose() * x;
  
---- a/stepcore/types.h
-+++ b/stepcore/types.h
-@@ -34,7 +34,7 @@
+Index: step/stepcore/types.h
+===================================================================
+--- step.orig/stepcore/types.h	2014-07-25 12:37:10.992073323 +0200
++++ step/stepcore/types.h	2014-07-25 12:37:10.988073482 +0200
+@@ -35,7 +35,7 @@
  typedef Eigen::SparseMatrix<double> SparseColMatrix;
  typedef Eigen::SparseMatrix<double,Eigen::RowMajor> SparseRowMatrix;
  // a sparse matrix with efficient write facilities

-- 
step packaging