[SCM] step packaging branch, master, updated. debian/4.13.3-1-3-g83ed4bc

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 60ecadbd93cbb16e7997b95c8f9ab91af89f0bdf
Author: Maximiliano Curia <maxy at debian.org>
Date:   Wed Aug 20 19:43:01 2014 +0200

    Refresh patches.
---
 debian/changelog                              |  1 +
 debian/patches/replace_eigen2_by_eigen3.patch | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f6c250c..1d402f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 step (4:4.14.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Refresh patches.
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 18 Aug 2014 18:21:28 +0200
 
diff --git a/debian/patches/replace_eigen2_by_eigen3.patch b/debian/patches/replace_eigen2_by_eigen3.patch
index 610263c..1d1d343 100644
--- a/debian/patches/replace_eigen2_by_eigen3.patch
+++ b/debian/patches/replace_eigen2_by_eigen3.patch
@@ -5,8 +5,8 @@ Last-Update: 2013-12-01
 
 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
+--- step.orig/CMakeLists.txt	2014-08-20 17:55:27.912482687 +0200
++++ step/CMakeLists.txt	2014-08-20 17:55:27.908482851 +0200
 @@ -9,11 +9,11 @@
  
  set(CMAKE_MODULE_PATH ${step_SOURCE_DIR}/cmake/modules )
@@ -39,12 +39,12 @@ Index: step/CMakeLists.txt
 -endif (EIGEN2_FOUND)
 +endif (EIGEN3_FOUND)
  
- if (${CMAKE_CURRENT_SOURCE_DIR} STREQUAL ${CMAKE_SOURCE_DIR})
-    macro_display_feature_log()
+ install(FILES step.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata/)
+ 
 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
+--- step.orig/step/propertiesbrowser.cc	2014-08-20 17:55:27.912482687 +0200
++++ step/step/propertiesbrowser.cc	2014-08-20 17:55:27.908482851 +0200
 @@ -389,7 +389,7 @@
                          if(p->userTypeId() == QMetaType::Double) {
                              vv = 0;
@@ -56,8 +56,8 @@ Index: step/step/propertiesbrowser.cc
                           * } else if(p->userTypeId() == qMetaTypeId<StepCore::Vector2dList >())
 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
+--- step.orig/stepcore/constraintsolver.cc	2014-08-20 17:55:27.912482687 +0200
++++ step/stepcore/constraintsolver.cc	2014-08-20 17:55:27.908482851 +0200
 @@ -96,7 +96,7 @@
              ++fmaxIndex;
          }
@@ -69,8 +69,8 @@ Index: step/stepcore/constraintsolver.cc
  
 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
+--- step.orig/stepcore/types.h	2014-08-20 17:55:27.912482687 +0200
++++ step/stepcore/types.h	2014-08-20 17:55:27.908482851 +0200
 @@ -35,7 +35,7 @@
  typedef Eigen::SparseMatrix<double> SparseColMatrix;
  typedef Eigen::SparseMatrix<double,Eigen::RowMajor> SparseRowMatrix;

-- 
step packaging