[SCM] step packaging branch, kubuntu_vivid_archive, updated. debian/14.12.2-1-1-g8c539e0
Harald Sitter
apachelogger-guest at moszumanska.debian.org
Mon Mar 9 14:57:30 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/step.git;a=commitdiff;h=8c539e0
The following commit has been merged in the kubuntu_vivid_archive branch:
commit 8c539e03f38c698ebf7b9f0cf078736ca58ecf91
Author: Harald Sitter <sitter at kde.org>
Date: Mon Mar 2 11:46:26 2015 +0100
kde frameworks 5 port
---
debian/control | 13 +++-
debian/patches/replace_eigen2_by_eigen3.patch | 85 ---------------------------
debian/patches/series | 1 -
debian/rules | 2 +-
4 files changed, 11 insertions(+), 90 deletions(-)
diff --git a/debian/control b/debian/control
index bc9ee22..eb15a02 100644
--- a/debian/control
+++ b/debian/control
@@ -5,13 +5,20 @@ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Eshat Cakar <info at eshat.de>, Maximiliano Curia <maxy at debian.org>
Build-Depends: cmake,
debhelper (>= 9),
- kde-sc-dev-latest (>= 4:4.12),
- kdelibs5-dev,
+ extra-cmake-modules (>= 1.0.0),
+ kdoctools-dev,
+ qtdeclarative5-dev (>= 5.2.0),
+ libqt5svg5-dev (>= 5.2.0),
+ libqt5opengl5-dev (>= 5.2.0),
+ libkf5khtml-dev,
+ libkf5config-dev,
+ libkf5kdelibs4support-dev,
+ libkf5newstuff-dev,
+ libkf5plotting-dev,
libeigen3-dev (>= 3.2.0-6),
libglib2.0-dev,
libgsl0-dev (>= 1.8),
libqalculate-dev (>= 0.9.5),
- libqt4-opengl-dev,
libx11-dev,
pkg-kde-tools (>= 0.12)
Standards-Version: 3.9.6
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
diff --git a/debian/rules b/debian/rules
index 6a77e53..b57f3e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,3 +1,3 @@
#!/usr/bin/make -f
-include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
--
step packaging
More information about the pkg-kde-commits
mailing list