Hello Modestas, Please find below the NMU debdiff for cmake_2.8.12.1-1.3. It fixes a regression that blocks #685112.
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=685112 Regards, Aníbal -- anibal.monsalvesala...@imgtec.com debdiff cmake_2.8.12.1-1.2.dsc cmake_2.8.12.1-1.3.dsc diff -Nru cmake-2.8.12.1/debian/changelog cmake-2.8.12.1/debian/changelog --- cmake-2.8.12.1/debian/changelog 2014-03-30 21:20:33.000000000 +0100 +++ cmake-2.8.12.1/debian/changelog 2014-05-23 09:26:23.000000000 +0100 @@ -1,3 +1,12 @@ +cmake (2.8.12.1-1.3) unstable; urgency=medium + + * Non-maintainer upload. + * multiarch-python-include-dirs.diff has bad side-effects + Drop multiarch-python-include-dirs.diff + Closes: #735248 + + -- Anibal Monsalve Salazar <ani...@debian.org> Fri, 23 May 2014 09:25:22 +0100 + cmake (2.8.12.1-1.2) unstable; urgency=low * Non-maintainer upload. diff -Nru cmake-2.8.12.1/debian/patches/multiarch-python-include-dirs.diff cmake-2.8.12.1/debian/patches/multiarch-python-include-dirs.diff --- cmake-2.8.12.1/debian/patches/multiarch-python-include-dirs.diff 2014-02-28 14:14:01.000000000 +0000 +++ cmake-2.8.12.1/debian/patches/multiarch-python-include-dirs.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,52 +0,0 @@ -Description: Python.h and pyconfig.h can be in different locations -Author: Dmitrijs Ledkovs <dmitrijs.ledk...@canonical.com> -Bug: http://public.kitware.com/Bug/view.php?id=14156 -Forwarded: yes -Origin: vendor - ---- a/Modules/FindPythonLibs.cmake -+++ b/Modules/FindPythonLibs.cmake -@@ -136,6 +136,27 @@ foreach(_CURRENT_VERSION ${_Python_VERSI - [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/include - [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/include - PATH_SUFFIXES -+ ${CMAKE_LIBRARY_ARCHITECTURE}/python${_CURRENT_VERSION}mu -+ ${CMAKE_LIBRARY_ARCHITECTURE}/python${_CURRENT_VERSION}m -+ ${CMAKE_LIBRARY_ARCHITECTURE}/python${_CURRENT_VERSION}u -+ ${CMAKE_LIBRARY_ARCHITECTURE}/python${_CURRENT_VERSION} -+ python${_CURRENT_VERSION}mu -+ python${_CURRENT_VERSION}m -+ python${_CURRENT_VERSION}u -+ python${_CURRENT_VERSION} -+ ) -+ -+ find_path(PYTHON_INCLUDE_DIR2 -+ NAMES pyconfig.h -+ PATHS -+ ${PYTHON_FRAMEWORK_INCLUDES} -+ [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/include -+ [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/include -+ PATH_SUFFIXES -+ ${CMAKE_LIBRARY_ARCHITECTURE}/python${_CURRENT_VERSION}mu -+ ${CMAKE_LIBRARY_ARCHITECTURE}/python${_CURRENT_VERSION}m -+ ${CMAKE_LIBRARY_ARCHITECTURE}/python${_CURRENT_VERSION}u -+ ${CMAKE_LIBRARY_ARCHITECTURE}/python${_CURRENT_VERSION} - python${_CURRENT_VERSION}mu - python${_CURRENT_VERSION}m - python${_CURRENT_VERSION}u -@@ -162,13 +183,14 @@ mark_as_advanced( - PYTHON_DEBUG_LIBRARY - PYTHON_LIBRARY - PYTHON_INCLUDE_DIR -+ PYTHON_INCLUDE_DIR2 - ) - - # We use PYTHON_INCLUDE_DIR, PYTHON_LIBRARY and PYTHON_DEBUG_LIBRARY for the - # cache entries because they are meant to specify the location of a single - # library. We now set the variables listed by the documentation for this - # module. --set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}") -+set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}" "${PYTHON_INCLUDE_DIR2}") - set(PYTHON_DEBUG_LIBRARIES "${PYTHON_DEBUG_LIBRARY}") - - # These variables have been historically named in this module different from diff -Nru cmake-2.8.12.1/debian/patches/series cmake-2.8.12.1/debian/patches/series --- cmake-2.8.12.1/debian/patches/series 2014-02-28 14:54:27.000000000 +0000 +++ cmake-2.8.12.1/debian/patches/series 2014-05-23 09:23:12.000000000 +0100 @@ -1,7 +1,6 @@ FindBoost_add_-lpthread_#563479.diff multiarch_findgtk2_fix.diff install_to_multiarch_libdir_on_kfreebsd_hurd.diff -multiarch-python-include-dirs.diff qt_import_dir_variable.diff FindPHP4_fix_typo.diff FindJNI_amd64_ppc_biarch.diff
signature.asc
Description: Digital signature
