[SCM] step packaging branch, master, updated. debian/14.12.3-1-6-g05e7e65

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/step.git;a=commitdiff;h=05e7e65

The following commit has been merged in the master branch:
commit 05e7e65defe73906f09882378cb35128f38340eb
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed May 27 19:23:44 2015 +0200

    Remove upstream applied patch: replace_eigen2_by_eigen3.patch
---
 debian/changelog                              |  1 +
 debian/patches/replace_eigen2_by_eigen3.patch | 85 ---------------------------
 debian/patches/series                         |  1 -
 3 files changed, 1 insertion(+), 86 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 934099c..eb6607d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ step (4:15.04.1-1~) UNRELEASED; urgency=medium
 
   * New upstream release (15.04.0).
   * New upstream release (15.04.1).
+  * Remove upstream applied patch: replace_eigen2_by_eigen3.patch
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 18 May 2015 14:19:14 +0200
 
diff --git a/debian/patches/replace_eigen2_by_eigen3.patch b/debian/patches/replace_eigen2_by_eigen3.patch
deleted file mode 100644
index cd20ac2..0000000
--- a/debian/patches/replace_eigen2_by_eigen3.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-Description: replace libeigen2-dev by libeigen3-dev
-Author: Anton Gladky <gladk at debian.org>
-Bug-Debian: http://bugs.debian.org/726162
-Last-Update: 2013-12-01
-
-Index: step/CMakeLists.txt
-===================================================================
---- 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 )
- 
--find_package(Eigen2 2.0.3)
-+find_package(Eigen3)
- macro_optional_find_package(GSL)
- macro_optional_find_package(Qalculate)
- 
--macro_log_feature(EIGEN2_FOUND "Eigen2" "Required to build step." "http://eigen.tuxfamily.org" TRUE "2.0.3" "")
-+macro_log_feature(EIGEN3_FOUND "Eigen3" "Required to build step." "http://eigen.tuxfamily.org" TRUE "2.0.3" "")
- 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" "")
- 
-@@ -21,18 +21,19 @@
- 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")
- 
--if (EIGEN2_FOUND)
--   include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${EIGEN2_INCLUDE_DIR})
-+if (EIGEN3_FOUND)
-+   include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${EIGEN3_INCLUDE_DIR})
-+   add_definitions( -DEIGEN2_SUPPORT)
- 
-    add_subdirectory(doc) 
-    add_subdirectory(stepcore)
-    add_subdirectory(step)
- 
-    # Note: Disabled temporarily because WorldCopyTestSolver inherits both Body
-    # 	   and Force.  And both of these are now inheriting Item, which
-    # 	   creates an error. This needs to be sorted out.
-    add_subdirectory(stepcore_tests)
--endif (EIGEN2_FOUND)
-+endif (EIGEN3_FOUND)
- 
- install(FILES step.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata/)
- 
-Index: step/step/propertiesbrowser.cc
-===================================================================
---- 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;
-                         } else if(p->userTypeId() == qMetaTypeId<StepCore::Vector2d>()) {
--                            StepCore::Vector2d svv(0);
-+                            StepCore::Vector2d svv=StepCore::Vector2d::Zero();
-                             vv = QVariant::fromValue(svv);
-                         /* XXX
-                          * } else if(p->userTypeId() == qMetaTypeId<StepCore::Vector2dList >())
-Index: step/stepcore/constraintsolver.cc
-===================================================================
---- 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;
-         }
-     }    
--    ei_constrained_cg(a, c, x, b, f, iter);
-+    internal::constrained_cg(a, c, x, b, f, iter);
- 
-     info->force = info->jacobian.transpose() * x;
- 
-Index: step/stepcore/types.h
-===================================================================
---- 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;
- // a sparse matrix with efficient write facilities
--typedef Eigen::DynamicSparseMatrix<double,Eigen::RowMajor> DynSparseRowMatrix;
-+typedef Eigen::SparseMatrix<double,Eigen::RowMajor> DynSparseRowMatrix;
- typedef Eigen::Map<Eigen::VectorXd> MappedVector;
- 
- ///////////////// Color
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 7e0e7d0..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-replace_eigen2_by_eigen3.patch

-- 
step packaging