diff -Nru kstars-4.10.5/debian/changelog kstars-4.10.5/debian/changelog --- kstars-4.10.5/debian/changelog 2013-07-12 16:39:48.000000000 +0200 +++ kstars-4.10.5/debian/changelog 2013-10-17 18:52:07.000000000 +0200 @@ -1,3 +1,10 @@ +kstars (4:4.10.5-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Migrate from eigen2 to eigen3. (Closes: #726644) + + -- Anton Gladky Thu, 17 Oct 2013 18:51:56 +0200 + kstars (4:4.10.5-1) unstable; urgency=low * New upstream release. diff -Nru kstars-4.10.5/debian/control kstars-4.10.5/debian/control --- kstars-4.10.5/debian/control 2013-07-12 16:39:48.000000000 +0200 +++ kstars-4.10.5/debian/control 2013-10-17 18:04:29.000000000 +0200 @@ -7,7 +7,7 @@ Build-Depends: kde-sc-dev-latest (>= 4:4.10.2), cmake, debhelper (>= 9), pkg-kde-tools (>= 0.12), dpkg-dev (>= 1.15.5), kdelibs5-dev (>= 4:4.10), - libeigen2-dev (>> 2.0.3), zlib1g-dev, libcfitsio3-dev (>= 3.040), + libeigen3-dev (>> 2.0.3), zlib1g-dev, libcfitsio3-dev (>= 3.040), libglu1-mesa-dev, libnova-dev, libqt4-opengl-dev, pkg-config, xplanet, libindi-dev [linux-any], wcslib-dev Standards-Version: 3.9.4 diff -Nru kstars-4.10.5/debian/patches/eigen3.patch kstars-4.10.5/debian/patches/eigen3.patch --- kstars-4.10.5/debian/patches/eigen3.patch 1970-01-01 01:00:00.000000000 +0100 +++ kstars-4.10.5/debian/patches/eigen3.patch 2013-10-17 18:51:51.000000000 +0200 @@ -0,0 +1,163 @@ +Description: migrate eigen2 to eigen3 +Author: Anton Gladky +Bug-Debian: http://bugs.debian.org/726644 +Last-Update: 2013-10-17 + +--- kstars-4.10.5.orig/CMakeLists.txt ++++ kstars-4.10.5/CMakeLists.txt +@@ -10,8 +10,8 @@ set(CMAKE_MODULE_PATH ${kstars_SOURCE_DI + # some configure checks needed for kstars + include(CheckIncludeFiles) + +-find_package(Eigen2 2.0.3) +-macro_log_feature(EIGEN2_FOUND "Eigen2" "Required to build KStars." "http://eigen.tuxfamily.org" TRUE "2.0.3" "") ++find_package(Eigen3 REQUIRED) ++macro_log_feature(EIGEN3_FOUND "Eigen3" "Required to build KStars." "http://eigen.tuxfamily.org" TRUE "2.0.3" "") + + macro_optional_find_package(CFitsio) + macro_bool_to_01(CFITSIO_FOUND HAVE_CFITSIO_H) +@@ -38,13 +38,14 @@ macro_bool_to_01(OPENGL_FOUND HAVE_OPENG + macro_log_feature(OPENGL_FOUND "OpenGL" "Support for hardware rendering in KStars." "http://www.opengl.org/" FALSE "" "OpenGL rendering is generally faster on hardware with graphics acceleration.") + add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) + +-if (EIGEN2_FOUND) ++if (EIGEN3_FOUND) + include_directories(${CMAKE_CURRENT_BINARY_DIR}) ++ include_directories(${EIGEN3_INCLUDE_DIR}) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-kstars.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kstars.h ) + + add_subdirectory( doc ) + add_subdirectory( kstars ) +-endif (EIGEN2_FOUND) ++endif (EIGEN3_FOUND) + + + if (${CMAKE_CURRENT_SOURCE_DIR} STREQUAL ${CMAKE_SOURCE_DIR}) +--- /dev/null ++++ kstars-4.10.5/cmake/modules/FindEigen3.cmake +@@ -0,0 +1,81 @@ ++# - Try to find Eigen3 lib ++# ++# This module supports requiring a minimum version, e.g. you can do ++# find_package(Eigen3 3.1.2) ++# to require version 3.1.2 or newer of Eigen3. ++# ++# Once done this will define ++# ++# EIGEN3_FOUND - system has eigen lib with correct version ++# EIGEN3_INCLUDE_DIR - the eigen include directory ++# EIGEN3_VERSION - eigen version ++ ++# Copyright (c) 2006, 2007 Montel Laurent, ++# Copyright (c) 2008, 2009 Gael Guennebaud, ++# Copyright (c) 2009 Benoit Jacob ++# Redistribution and use is allowed according to the terms of the 2-clause BSD license. ++ ++if(NOT Eigen3_FIND_VERSION) ++ if(NOT Eigen3_FIND_VERSION_MAJOR) ++ set(Eigen3_FIND_VERSION_MAJOR 2) ++ endif(NOT Eigen3_FIND_VERSION_MAJOR) ++ if(NOT Eigen3_FIND_VERSION_MINOR) ++ set(Eigen3_FIND_VERSION_MINOR 91) ++ endif(NOT Eigen3_FIND_VERSION_MINOR) ++ if(NOT Eigen3_FIND_VERSION_PATCH) ++ set(Eigen3_FIND_VERSION_PATCH 0) ++ endif(NOT Eigen3_FIND_VERSION_PATCH) ++ ++ set(Eigen3_FIND_VERSION "${Eigen3_FIND_VERSION_MAJOR}.${Eigen3_FIND_VERSION_MINOR}.${Eigen3_FIND_VERSION_PATCH}") ++endif(NOT Eigen3_FIND_VERSION) ++ ++macro(_eigen3_check_version) ++ file(READ "${EIGEN3_INCLUDE_DIR}/Eigen/src/Core/util/Macros.h" _eigen3_version_header) ++ ++ string(REGEX MATCH "define[ \t]+EIGEN_WORLD_VERSION[ \t]+([0-9]+)" _eigen3_world_version_match "${_eigen3_version_header}") ++ set(EIGEN3_WORLD_VERSION "${CMAKE_MATCH_1}") ++ string(REGEX MATCH "define[ \t]+EIGEN_MAJOR_VERSION[ \t]+([0-9]+)" _eigen3_major_version_match "${_eigen3_version_header}") ++ set(EIGEN3_MAJOR_VERSION "${CMAKE_MATCH_1}") ++ string(REGEX MATCH "define[ \t]+EIGEN_MINOR_VERSION[ \t]+([0-9]+)" _eigen3_minor_version_match "${_eigen3_version_header}") ++ set(EIGEN3_MINOR_VERSION "${CMAKE_MATCH_1}") ++ ++ set(EIGEN3_VERSION ${EIGEN3_WORLD_VERSION}.${EIGEN3_MAJOR_VERSION}.${EIGEN3_MINOR_VERSION}) ++ if(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION}) ++ set(EIGEN3_VERSION_OK FALSE) ++ else(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION}) ++ set(EIGEN3_VERSION_OK TRUE) ++ endif(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION}) ++ ++ if(NOT EIGEN3_VERSION_OK) ++ ++ message(STATUS "Eigen3 version ${EIGEN3_VERSION} found in ${EIGEN3_INCLUDE_DIR}, " ++ "but at least version ${Eigen3_FIND_VERSION} is required") ++ endif(NOT EIGEN3_VERSION_OK) ++endmacro(_eigen3_check_version) ++ ++if (EIGEN3_INCLUDE_DIR) ++ ++ # in cache already ++ _eigen3_check_version() ++ set(EIGEN3_FOUND ${EIGEN3_VERSION_OK}) ++ ++else (EIGEN3_INCLUDE_DIR) ++ ++ find_path(EIGEN3_INCLUDE_DIR NAMES signature_of_eigen3_matrix_library ++ PATHS ++ ${CMAKE_INSTALL_PREFIX}/include ++ ${KDE4_INCLUDE_DIR} ++ PATH_SUFFIXES eigen3 eigen ++ ) ++ ++ if(EIGEN3_INCLUDE_DIR) ++ _eigen3_check_version() ++ endif(EIGEN3_INCLUDE_DIR) ++ ++ include(FindPackageHandleStandardArgs) ++ find_package_handle_standard_args(Eigen3 DEFAULT_MSG EIGEN3_INCLUDE_DIR EIGEN3_VERSION_OK) ++ ++ mark_as_advanced(EIGEN3_INCLUDE_DIR) ++ ++endif(EIGEN3_INCLUDE_DIR) ++ +--- kstars-4.10.5.orig/kstars/ksutils.h ++++ kstars-4.10.5/kstars/ksutils.h +@@ -29,7 +29,7 @@ + + #include + #include +-USING_PART_OF_NAMESPACE_EIGEN ++using namespace Eigen; + #include + #include "dms.h" + +--- kstars-4.10.5.orig/kstars/projections/projector.h ++++ kstars-4.10.5/kstars/projections/projector.h +@@ -22,7 +22,7 @@ + + #include + #include +-USING_PART_OF_NAMESPACE_EIGEN ++using namespace Eigen; + + #include + +--- kstars-4.10.5.orig/kstars/skyglpainter.cpp ++++ kstars-4.10.5/kstars/skyglpainter.cpp +@@ -25,7 +25,7 @@ + #include + #include + #include +-USING_PART_OF_NAMESPACE_EIGEN ++using namespace Eigen; + using Eigen::Rotation2Df; + + #include +--- kstars-4.10.5.orig/kstars/skyglpainter.h ++++ kstars-4.10.5/kstars/skyglpainter.h +@@ -22,7 +22,7 @@ + + #include + #include +-USING_PART_OF_NAMESPACE_EIGEN ++using namespace Eigen; + + #include "skypainter.h" + #include "skyobjects/skyobject.h" diff -Nru kstars-4.10.5/debian/patches/series kstars-4.10.5/debian/patches/series --- kstars-4.10.5/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ kstars-4.10.5/debian/patches/series 2013-10-17 18:28:12.000000000 +0200 @@ -0,0 +1 @@ +eigen3.patch