[SCM] kstars packaging branch, master, updated. debian/4.12.3-2-5-g15a78ca
Maximiliano Curia
maxy at moszumanska.debian.org
Thu May 29 09:51:45 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kstars.git;a=commitdiff;h=ecaa6d6
The following commit has been merged in the master branch:
commit ecaa6d611578d5541a8426f9911c61f818aa7750
Author: Maximiliano Curia <maxy at debian.org>
Date: Tue May 20 15:20:52 2014 +0200
Remove applied by upstream patch: eigen.patch
---
debian/changelog | 1 +
debian/patches/eigen3.patch | 175 ---------------------------------------
debian/patches/link_pthread.diff | 6 +-
debian/patches/series | 1 -
4 files changed, 4 insertions(+), 179 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f78c8e4..4966ad4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
kstars (4:4.13.1-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Remove applied by upstream patch: eigen.patch
-- Maximiliano Curia <maxy at debian.org> Tue, 20 May 2014 15:11:03 +0200
diff --git a/debian/patches/eigen3.patch b/debian/patches/eigen3.patch
deleted file mode 100644
index aa338a2..0000000
--- a/debian/patches/eigen3.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-Description: migrate eigen2 to eigen3
-Author: Anton Gladky <gladk at debian.org>
-Bug-Debian: http://bugs.debian.org/726644
-Last-Update: 2013-10-17
-
-Index: kstars/CMakeLists.txt
-===================================================================
---- kstars.orig/CMakeLists.txt 2014-02-07 09:10:39.796083315 +0100
-+++ kstars/CMakeLists.txt 2014-02-07 09:10:39.780082947 +0100
-@@ -15,8 +15,8 @@
- # 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)
-@@ -50,13 +50,14 @@
- enable_testing(true)
-
-
--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)
-
-
- add_subdirectory(datahandlers)
-Index: kstars/cmake/modules/FindEigen3.cmake
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ kstars/cmake/modules/FindEigen3.cmake 2014-02-07 09:10:39.788083131 +0100
-@@ -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, <montel at kde.org>
-+# Copyright (c) 2008, 2009 Gael Guennebaud, <g.gael at free.fr>
-+# Copyright (c) 2009 Benoit Jacob <jacob.benoit.1 at gmail.com>
-+# 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[ ]+EIGEN_WORLD_VERSION[ ]+([0-9]+)" _eigen3_world_version_match "${_eigen3_version_header}")
-+ set(EIGEN3_WORLD_VERSION "${CMAKE_MATCH_1}")
-+ string(REGEX MATCH "define[ ]+EIGEN_MAJOR_VERSION[ ]+([0-9]+)" _eigen3_major_version_match "${_eigen3_version_header}")
-+ set(EIGEN3_MAJOR_VERSION "${CMAKE_MATCH_1}")
-+ string(REGEX MATCH "define[ ]+EIGEN_MINOR_VERSION[ ]+([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)
-+
-Index: kstars/kstars/ksutils.h
-===================================================================
---- kstars.orig/kstars/ksutils.h 2014-02-07 09:10:39.796083315 +0100
-+++ kstars/kstars/ksutils.h 2014-02-07 09:10:39.788083131 +0100
-@@ -29,7 +29,7 @@
-
- #include <cstddef>
- #include <Eigen/Core>
--USING_PART_OF_NAMESPACE_EIGEN
-+using namespace Eigen;
- #include <QPointF>
- #include "dms.h"
-
-Index: kstars/kstars/projections/projector.h
-===================================================================
---- kstars.orig/kstars/projections/projector.h 2014-02-07 09:10:39.796083315 +0100
-+++ kstars/kstars/projections/projector.h 2014-02-07 09:10:39.788083131 +0100
-@@ -22,7 +22,7 @@
-
- #include <cstddef>
- #include <Eigen/Core>
--USING_PART_OF_NAMESPACE_EIGEN
-+using namespace Eigen;
-
- #include <cmath>
-
-Index: kstars/kstars/skyglpainter.cpp
-===================================================================
---- kstars.orig/kstars/skyglpainter.cpp 2014-02-07 09:10:39.796083315 +0100
-+++ kstars/kstars/skyglpainter.cpp 2014-02-07 09:10:39.792083223 +0100
-@@ -25,7 +25,7 @@
- #include <cstddef>
- #include <Eigen/Core>
- #include <Eigen/Geometry>
--USING_PART_OF_NAMESPACE_EIGEN
-+using namespace Eigen;
- using Eigen::Rotation2Df;
-
- #include <GL/gl.h>
-Index: kstars/kstars/skyglpainter.h
-===================================================================
---- kstars.orig/kstars/skyglpainter.h 2014-02-07 09:10:39.796083315 +0100
-+++ kstars/kstars/skyglpainter.h 2014-02-07 09:10:39.792083223 +0100
-@@ -22,7 +22,7 @@
-
- #include <cstddef>
- #include <Eigen/Core>
--USING_PART_OF_NAMESPACE_EIGEN
-+using namespace Eigen;
-
- #include "skypainter.h"
- #include "skyobjects/skyobject.h"
diff --git a/debian/patches/link_pthread.diff b/debian/patches/link_pthread.diff
index a96929c..88e210c 100644
--- a/debian/patches/link_pthread.diff
+++ b/debian/patches/link_pthread.diff
@@ -5,9 +5,9 @@ Last-Update: 2013-11-20
Index: kstars/kstars/CMakeLists.txt
===================================================================
---- kstars.orig/kstars/CMakeLists.txt 2014-02-07 09:10:50.332325022 +0100
-+++ kstars/kstars/CMakeLists.txt 2014-02-07 09:10:50.328324928 +0100
-@@ -485,6 +485,7 @@
+--- kstars.orig/kstars/CMakeLists.txt 2014-05-20 15:19:37.815232125 +0200
++++ kstars/kstars/CMakeLists.txt 2014-05-20 15:19:37.811232282 +0200
+@@ -490,6 +490,7 @@
${QT_QTDECLARATIVE_LIBRARY}
kdeclarative
${ZLIB_LIBRARIES}
diff --git a/debian/patches/series b/debian/patches/series
index 5dc4ed8..d56dfb4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-eigen3.patch
link_pthread.diff
--
kstars packaging
More information about the pkg-kde-commits
mailing list