[SCM] step packaging branch, kubuntu_vivid_archive, updated. debian/4.14.2-1-8-g1964bab

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 1964babc5806088903e0112175ff035ef8d6f1a8
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Feb 6 19:19:34 2015 -0800

    Fix replace_eigen2_by_eigen3 patch to reflect new text.
---
 debian/changelog                              | 5 +++--
 debian/patches/replace_eigen2_by_eigen3.patch | 5 ++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c348998..ead5673 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
-step (4:14.12.2-0ubuntu1) UNRELEASED; urgency=medium
+step (4:14.12.2-0ubuntu1~ubuntu15.04~ppa1) vivid; urgency=medium
 
   * New upstream release
   * Remove unstable from watch file, uscan fails with 
     remote site does not even have current version
+  * Fix replace_eigen2_by_eigen3 patch to reflect new text.
 
- -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 06 Feb 2015 12:31:14 -0800
+ -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 06 Feb 2015 19:11:48 -0800
 
 step (4:14.12.0-0ubuntu1) vivid; urgency=medium
 
diff --git a/debian/patches/replace_eigen2_by_eigen3.patch b/debian/patches/replace_eigen2_by_eigen3.patch
index 1d1d343..cd20ac2 100644
--- a/debian/patches/replace_eigen2_by_eigen3.patch
+++ b/debian/patches/replace_eigen2_by_eigen3.patch
@@ -21,7 +21,7 @@ Index: step/CMakeLists.txt
  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,15 +21,16 @@
+@@ -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")
  
@@ -35,6 +35,9 @@ Index: step/CMakeLists.txt
     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)

-- 
step packaging