diff -Nru cmake-3.2.2/debian/changelog cmake-3.2.2/debian/changelog --- cmake-3.2.2/debian/changelog 2015-05-14 04:04:10.000000000 +0200 +++ cmake-3.2.2/debian/changelog 2015-05-28 17:35:54.000000000 +0200 @@ -1,3 +1,18 @@ +cmake (3.2.2-2ubuntu1) wily; urgency=low + + * Merge from Debian unstable (LP: #1459727). Remaining changes: + - debian/cmake-data.install + debian/MultiArchCross.cmake + debian/patches/ubuntu_cmake-crosscompile.patch + Add MultiArchCross.cmake to installed files. + (help cmake to find libraries in multiarch path) + xnox says this is not yet ready to go upstream but he will work on it + - debian/patches/ubuntu_boost-multiarch.patch + find boost and python in multiarch path + this is a candidate for removal but needs rdepend testing + + -- Gianfranco Costamagna Thu, 28 May 2015 17:35:43 +0200 + cmake (3.2.2-2) unstable; urgency=medium * Make cmake.bash-completion use wildcards for the minor version @@ -44,6 +59,29 @@ -- Felix Geyer Wed, 13 May 2015 19:02:05 +0200 +cmake (3.0.2-1ubuntu2) vivid; urgency=medium + + * Fix install path of MultiArchCross.cmake to be cmake-3.0. + + -- Loïc Minier Fri, 31 Oct 2014 21:59:23 +0100 + +cmake (3.0.2-1ubuntu1) vivid; urgency=medium + + * Merge from Debian unstable (LP: #1357270). Remaining changes: + - debian/cmake-data.install + debian/MultiArchCross.cmake + debian/patches/ubuntu_cmake-crosscompile.patch + Add MultiArchCross.cmake to installed files. + (help cmake to find libraries in multiarch path) + xnox says this is not yet ready to go upstream but he will work on it + - debian/patches/ubuntu_boost-multiarch.patch + find boost and python in multiarch path + this is a candidate for removal but needs rdepend testing + * Drop multiarch-python-include-dirs.diff no longer required according + to bug report + + -- Jonathan Riddell Wed, 29 Oct 2014 16:40:41 +0000 + cmake (3.0.2-1) unstable; urgency=medium * New upstream release. @@ -180,6 +218,51 @@ -- Bas Couwenberg Sun, 30 Mar 2014 21:57:27 +0200 +cmake (2.8.12.2-0ubuntu6) utopic; urgency=medium + + * Add find_python3.4.patch to find Python 3.4 as that is what + Ubuntu ships by default (LP: #132355) + + -- Rohan Garg Tue, 14 Oct 2014 17:46:53 +0200 + +cmake (2.8.12.2-0ubuntu5) utopic; urgency=medium + + * ppc64el-jvm-config.diff: Allow "ppc64" as well as (for + backward-compatibility) "ppc64le" as the Java arch-specific library + subdirectory name on ppc64el, matching current OpenJDK. + + -- Colin Watson Thu, 24 Jul 2014 14:50:40 +0100 + +cmake (2.8.12.2-0ubuntu4) utopic; urgency=medium + + * Add changes from the 2.8.12.1-1.2 upload: + - Backport patch to support Ruby 2.0 and 2.1 in FindRuby.cmake. + (closes: #739826, #730095). + + -- Matthias Klose Tue, 29 Apr 2014 14:37:07 +0200 + +cmake (2.8.12.2-0ubuntu3) trusty; urgency=medium + + [ Iain Lane ] + * MultiArchCross.cmake: Look for uic and qdbus{cpp2xml,xml2cpp} in + /usr/lib/$DEB_BUILD_MULTIARCH/qt5/bin/. (LP: #1294186) + + -- Dimitri John Ledkov Wed, 19 Mar 2014 11:33:40 +0000 + +cmake (2.8.12.2-0ubuntu2) trusty; urgency=medium + + * Fix JNI detection on ppc64el. + + -- Matthias Klose Mon, 24 Feb 2014 15:46:34 +0100 + +cmake (2.8.12.2-0ubuntu1) trusty; urgency=medium + + * New upstream release + * Keep Ubuntu's fix_freetype_detection.diff over Debian's + fix-FindFreetype.diff + + -- Jonathan Riddell Mon, 10 Feb 2014 16:41:02 +0000 + cmake (2.8.12.1-1.1) unstable; urgency=high * Non-maintainer upload. @@ -188,6 +271,52 @@ -- Cyril Brulebois Sun, 15 Dec 2013 10:30:54 +0000 +cmake (2.8.12.1-1ubuntu5) trusty; urgency=medium + + * Honor environment variables for compilers, in Multiarched + toolchain. (LP: #1274430) + + -- Dimitri John Ledkov Thu, 30 Jan 2014 09:24:23 +0000 + +cmake (2.8.12.1-1ubuntu4) trusty; urgency=medium + + * Use find_program, instead of COMMAND conditional to fix correctly + setting a Debian cross-compiler. + + -- Dimitri John Ledkov Thu, 23 Jan 2014 13:30:53 +0000 + +cmake (2.8.12.1-1ubuntu3) trusty; urgency=low + + * Improve backwards compatibility of the previous upload: + - only set arch qualified compiler names, when those are present + - further restrict changing Qt5::* utils paths, when in the + debian-multiarch-cross-compilation branch. Ideally qtchooser should be + used, which should be able to pick between 3rdparty, system, or cross + utilities. + + -- Dimitri John Ledkov Thu, 19 Dec 2013 11:01:56 +0000 + +cmake (2.8.12.1-1ubuntu2) trusty; urgency=low + + * Make MultiArchCross file safe to include unconditionally multiple times. + * Tweak DetermineSystem, DetermineCompiler and FindPkgConfig to include + MultiArchCross and thus enable out of the box cross-compilation of + debian packages. + + -- Dimitri John Ledkov Fri, 13 Dec 2013 02:00:13 +0000 + +cmake (2.8.12.1-1ubuntu1) trusty; urgency=low + + * Merge from Debian, remaining changes: + - Add fix_freetype_detection.diff to fix the freetype detection so + kde-workspace builds again. (LP: #1256710) + - Make FindBoost look in Multi-Arch locations as well. + - Add a MultiArchCross.cmake toolchain file. + - Relax the cmake dependency on cmake-data to require the + matching upstream version (>= ${source:Upstream-Version}). + + -- Dmitrijs Ledkovs Mon, 09 Dec 2013 11:51:01 +0000 + cmake (2.8.12.1-1) unstable; urgency=low * New upstream release: @@ -198,6 +327,20 @@ -- Modestas Vainius Thu, 07 Nov 2013 00:56:52 +0200 +cmake (2.8.12.1-0ubuntu2) trusty; urgency=low + + * Add fix_freetype_detection.diff to fix the freetype detection so + kde-workspace builds again. (LP: #1256710) + + -- Philip Muškovac Sun, 01 Dec 2013 22:34:45 +0100 + +cmake (2.8.12.1-0ubuntu1) trusty; urgency=low + + * New upstream release LP: #1252259 + * Drop valid-interface-link-libraries.patch, applied upstream + + -- Harald Sitter Mon, 18 Nov 2013 13:49:08 +0100 + cmake (2.8.12-2) unstable; urgency=low * Fix FTBFS on kFreeBSD (fix-ftbfs-on-kfreebsd.patch). @@ -230,6 +373,45 @@ -- Modestas Vainius Sun, 03 Nov 2013 20:42:54 +0200 +cmake (2.8.12-0ubuntu2) trusty; urgency=low + + * Imported upstream fix to resolve FTBFS in projects using linker flags + (lp: #1247787). + + -- Stephen M. Webb Tue, 05 Nov 2013 10:13:10 -0500 + +cmake (2.8.12-0ubuntu1) trusty; urgency=low + + * New upstream release LP: #1246701 + + -- Harald Sitter Thu, 10 Oct 2013 12:54:39 +0200 + +cmake (2.8.11.2-1ubuntu5) saucy; urgency=low + + * Build the Qt gui on AArch64 now that Qt4 actually works. + + -- William Grant Mon, 14 Oct 2013 10:47:28 +1100 + +cmake (2.8.11.2-1ubuntu4) saucy; urgency=low + + * Do not build the Qt gui on AArch64. + + -- Matthias Klose Sat, 12 Oct 2013 14:24:20 +0200 + +cmake (2.8.11.2-1ubuntu2) saucy; urgency=low + + * Make FindBoost look in Multi-Arch locations as well. + + -- Dmitrijs Ledkovs Fri, 09 Aug 2013 12:59:00 +0100 + +cmake (2.8.11.2-1ubuntu1) saucy; urgency=low + + * Add a MultiArchCross.cmake toolchain file. + * Relax the cmake dependency on cmake-data to require the + matching upstream version (>= ${source:Upstream-Version}). + + -- Matthias Klose Wed, 07 Aug 2013 12:37:42 +0200 + cmake (2.8.11.2-1) unstable; urgency=low * New upstream release. diff -Nru cmake-3.2.2/debian/cmake-data.install cmake-3.2.2/debian/cmake-data.install --- cmake-3.2.2/debian/cmake-data.install 2015-05-14 02:22:47.000000000 +0200 +++ cmake-3.2.2/debian/cmake-data.install 2015-05-28 17:25:53.000000000 +0200 @@ -16,3 +16,4 @@ usr/share/man/man7/cmake-qt.7 usr/share/man/man7/cmake-toolchains.7 usr/share/man/man7/cmake-variables.7 +debian/MultiArchCross.cmake usr/share/cmake-3.0/Modules diff -Nru cmake-3.2.2/debian/control cmake-3.2.2/debian/control --- cmake-3.2.2/debian/control 2015-05-14 02:22:47.000000000 +0200 +++ cmake-3.2.2/debian/control 2015-05-28 17:25:53.000000000 +0200 @@ -1,7 +1,8 @@ Source: cmake Section: devel Priority: optional -Maintainer: Modestas Vainius +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Modestas Vainius Uploaders: A. Maitland Bottoms , Kai Wasserbäch , Lisandro Damián Nicanor Pérez Meyer , diff -Nru cmake-3.2.2/debian/MultiArchCross.cmake cmake-3.2.2/debian/MultiArchCross.cmake --- cmake-3.2.2/debian/MultiArchCross.cmake 1970-01-01 01:00:00.000000000 +0100 +++ cmake-3.2.2/debian/MultiArchCross.cmake 2015-05-28 17:25:53.000000000 +0200 @@ -0,0 +1,85 @@ +#NB! the meaning of DEB_BUILD and DEB_HOST is same as in dpkg-architecture & autoconf, i.e.: +# BUILD - the system type where compilation is executed +# HOST - the system type where results of the compilation will be executed +# +# We can reliably determine all variables with dpkg-architecture (take into account env overrides) +# however it will not be the indication that this was actually explicitely requested +#execute_process(dpkg-architecture -qDEB_BUILD_GNU_TYPE OUTPUT_VARIABLE CMAKE_DEB_BUILD_GNU_TYPE) +#execute_process(dpkg-architecture -qDEB_HOST_GNU_TYPE OUTPUT_VARIABLE CMAKE_DEB_HOST_GNU_TYPE) +#execute_process(dpkg-architecture -qDEB_HOST_MULTIARCH OUTPUT_VARIABLE CMAKE_DEB_HOST_MULTIARCH) +#execute_process(dpkg-architecture -qDEB_HOST_ARCH_OS OUTPUT_VARIABLE CMAKE_DEB_HOST_ARCH_OS) + +if(DEFINED ENV{DEB_BUILD_GNU_TYPE} AND DEFINED ENV{DEB_HOST_GNU_TYPE} AND DEFINED ENV{DEB_HOST_MULTIARCH} AND DEFINED ENV{DEB_BUILD_MULTIARCH} AND DEFINED ENV{DEB_HOST_ARCH_OS}) + set(CMAKE_DEB_BUILD_MULTIARCH $ENV{DEB_BUILD_MULTIARCH}) + set(CMAKE_DEB_HOST_MULTIARCH $ENV{DEB_HOST_MULTIARCH}) + set(CMAKE_DEB_BUILD_GNU_TYPE $ENV{DEB_BUILD_GNU_TYPE}) + set(CMAKE_DEB_HOST_GNU_TYPE $ENV{DEB_HOST_GNU_TYPE}) + set(CMAKE_DEB_HOST_ARCH_OS $ENV{DEB_HOST_ARCH_OS}) + + # NB! ${CMAKE_DEB_HOST_MULTIARCH}-gcc exists on the native system to + # do native compilation (just a symlink to gcc) + + # TODO probably also needs to honor e.g. $ENV{CC}=gcc-4.6 and prefix + # that with ${CMAKE_DEB_HOST_MULTIARCH} + if(NOT DEFINED CMAKE_C_COMPILER AND NOT DEFINED ENV{CC}) + find_program(CMAKE_C_COMPILER ${CMAKE_DEB_HOST_GNU_TYPE}-gcc) + endif() + if(NOT DEFINED CMAKE_CXX_COMPILER AND NOT DEFINED ENV{CXX}) + find_program(CMAKE_CXX_COMPILER ${CMAKE_DEB_HOST_GNU_TYPE}-g++) + endif() + if(NOT DEFINED CMAKE_Fortran_COMPILER AND NOT DEFINED ENV{FC}) + find_program(CMAKE_Fortran_COMPILER ${CMAKE_DEB_HOST_GNU_TYPE}-gfortran) + endif() + + if(NOT DEFINED CMAKE_LIBRARY_ARCHITECTURE) + SET(CMAKE_LIBRARY_ARCHITECTURE ${CMAKE_DEB_HOST_MULTIARCH}) + endif() + + if(NOT DEFINED CMAKE_INSTALL_LIBDIR) + SET(CMAKE_INSTALL_LIBDIR "lib/${CMAKE_LIBRARY_ARCHITECTURE}") + endif() + + if(NOT DEFINED CMAKE_SYSTEM_NAME) + if(CMAKE_DEB_HOST_ARCH_OS STREQUAL "linux-gnu") + SET(CMAKE_SYSTEM_NAME Linux) + endif() + + if(CMAKE_DEB_HOST_ARCH_OS STREQUAL "kfreebsd") + SET(CMAKE_SYSTEM_NAME GNU/kFreeBSD) + endif() + endif() + + if(CMAKE_DEB_HOST_GNU_TYPE AND CMAKE_DEB_BUILD_GNU_TYPE) + if(NOT ${CMAKE_DEB_HOST_GNU_TYPE} STREQUAL ${CMAKE_DEB_BUILD_GNU_TYPE}) + SET(CMAKE_CROSSCOMPILING TRUE) + SET(PKG_CONFIG_EXECUTABLE ${CMAKE_DEB_HOST_GNU_TYPE}-pkg-config) + if(NOT CMAKE_SCRIPT_MODE_FILE) + # These really do not belong here, qtchooser should be able to pick the right qt (3rdparty, system, or cross) + if (NOT TARGET Qt5::qmake) + add_executable(Qt5::qmake IMPORTED AND COMMAND "/usr/lib/$ENV{DEB_BUILD_MULTIARCH}/qt5/bin/qmake") + set_target_properties(Qt5::qmake PROPERTIES IMPORTED_LOCATION "/usr/lib/$ENV{DEB_BUILD_MULTIARCH}/qt5/bin/qmake") + endif() + if (NOT TARGET Qt5::moc) + add_executable(Qt5::moc IMPORTED AND COMMAND "/usr/lib/$ENV{DEB_BUILD_MULTIARCH}/qt5/bin/moc") + set_target_properties(Qt5::moc PROPERTIES IMPORTED_LOCATION "/usr/lib/$ENV{DEB_BUILD_MULTIARCH}/qt5/bin/moc") + endif() + if (NOT TARGET Qt5::rcc) + add_executable(Qt5::rcc IMPORTED AND COMMAND "/usr/lib/$ENV{DEB_BUILD_MULTIARCH}/qt5/bin/rcc") + set_target_properties(Qt5::rcc PROPERTIES IMPORTED_LOCATION "/usr/lib/$ENV{DEB_BUILD_MULTIARCH}/qt5/bin/rcc") + endif() + if (NOT TARGET Qt5::uic) + add_executable(Qt5::uic IMPORTED AND COMMAND "/usr/lib/$ENV{DEB_BUILD_MULTIARCH}/qt5/bin/uic") + set_target_properties(Qt5::uic PROPERTIES IMPORTED_LOCATION "/usr/lib/$ENV{DEB_BUILD_MULTIARCH}/qt5/bin/uic") + endif() + if (NOT TARGET Qt5::qdbuscpp2xml) + add_executable(Qt5::qdbuscpp2xml IMPORTED AND COMMAND "/usr/lib/$ENV{DEB_BUILD_MULTIARCH}/qt5/bin/qdbuscpp2xml") + set_target_properties(Qt5::qdbuscpp2xml PROPERTIES IMPORTED_LOCATION "/usr/lib/$ENV{DEB_BUILD_MULTIARCH}/qt5/bin/qdbuscpp2xml") + endif() + if (NOT TARGET Qt5::qdbusxml2cpp) + add_executable(Qt5::qdbusxml2cpp IMPORTED AND COMMAND "/usr/lib/$ENV{DEB_BUILD_MULTIARCH}/qt5/bin/qdbusxml2cpp") + set_target_properties(Qt5::qdbusxml2cpp PROPERTIES IMPORTED_LOCATION "/usr/lib/$ENV{DEB_BUILD_MULTIARCH}/qt5/bin/qdbusxml2cpp") + endif() + endif() + endif() + endif() +endif() diff -Nru cmake-3.2.2/debian/patches/series cmake-3.2.2/debian/patches/series --- cmake-3.2.2/debian/patches/series 2015-05-14 02:22:47.000000000 +0200 +++ cmake-3.2.2/debian/patches/series 2015-05-28 17:25:53.000000000 +0200 @@ -8,3 +8,5 @@ custom-sphinx-flags.patch fix-mips-endian.patch openjdk-8-detection.patch +ubuntu_cmake-crosscompile.patch +ubuntu_boost-multiarch.patch diff -Nru cmake-3.2.2/debian/patches/ubuntu_boost-multiarch.patch cmake-3.2.2/debian/patches/ubuntu_boost-multiarch.patch --- cmake-3.2.2/debian/patches/ubuntu_boost-multiarch.patch 1970-01-01 01:00:00.000000000 +0100 +++ cmake-3.2.2/debian/patches/ubuntu_boost-multiarch.patch 2015-05-28 17:25:53.000000000 +0200 @@ -0,0 +1,15 @@ +Description: make boost look into multiarch locations as well +Author: Dmitrijs Ledkovs + +Index: cmake-3.0.2/Modules/FindBoost.cmake +=================================================================== +--- cmake-3.0.2.orig/Modules/FindBoost.cmake ++++ cmake-3.0.2/Modules/FindBoost.cmake +@@ -889,6 +889,7 @@ else() + list(APPEND _boost_LIBRARY_SEARCH_DIRS + ${Boost_INCLUDE_DIR}/lib + ${Boost_INCLUDE_DIR}/../lib ++ ${Boost_INCLUDE_DIR}/../lib/${CMAKE_LIBRARY_ARCHITECTURE} + ${Boost_INCLUDE_DIR}/stage/lib + ) + if( Boost_NO_SYSTEM_PATHS ) diff -Nru cmake-3.2.2/debian/patches/ubuntu_cmake-crosscompile.patch cmake-3.2.2/debian/patches/ubuntu_cmake-crosscompile.patch --- cmake-3.2.2/debian/patches/ubuntu_cmake-crosscompile.patch 1970-01-01 01:00:00.000000000 +0100 +++ cmake-3.2.2/debian/patches/ubuntu_cmake-crosscompile.patch 2015-05-28 17:25:53.000000000 +0200 @@ -0,0 +1,80 @@ +Description: support cross-compilation on multi-arch systems +Author: Dimitri John Ledkov + +Index: cmake-3.0.2/Modules/CMakeDetermineSystem.cmake +=================================================================== +--- cmake-3.0.2.orig/Modules/CMakeDetermineSystem.cmake ++++ cmake-3.0.2/Modules/CMakeDetermineSystem.cmake +@@ -104,6 +104,13 @@ if(CMAKE_TOOLCHAIN_FILE) + message(FATAL_ERROR "Could not find toolchain file: ${CMAKE_TOOLCHAIN_FILE}") + set(CMAKE_TOOLCHAIN_FILE "NOTFOUND" CACHE FILEPATH "The CMake toolchain file" FORCE) + endif() ++else() ++ # on multiarch debian systems cross-compilation has standard names & ++ # paths thus we can auto-detect all settings required to enable ++ # cross-compilation on debian systems out of the box ++ if(EXISTS "/etc/debian_version") ++ include(${CMAKE_ROOT}/Modules/MultiArchCross.cmake OPTIONAL RESULT_VARIABLE _INCLUDED_MULTIARCH_TOOLCHAIN_FILE) ++ endif() + endif() + + +Index: cmake-3.0.2/Modules/CMakeDetermineCompiler.cmake +=================================================================== +--- cmake-3.0.2.orig/Modules/CMakeDetermineCompiler.cmake ++++ cmake-3.0.2/Modules/CMakeDetermineCompiler.cmake +@@ -12,6 +12,10 @@ + # (To distribute this file outside of CMake, substitute the full + # License text for the above reference.) + ++if(EXISTS "/etc/debian_version") ++ include(${CMAKE_ROOT}/Modules/MultiArchCross.cmake OPTIONAL RESULT_VARIABLE _INCLUDED_MULTIARCH_TOOLCHAIN_FILE) ++endif() ++ + macro(_cmake_find_compiler lang) + # Use already-enabled languages for reference. + get_property(_languages GLOBAL PROPERTY ENABLED_LANGUAGES) +Index: cmake-3.0.2/Modules/FindPkgConfig.cmake +=================================================================== +--- cmake-3.0.2.orig/Modules/FindPkgConfig.cmake ++++ cmake-3.0.2/Modules/FindPkgConfig.cmake +@@ -30,6 +30,10 @@ + ### Common stuff #### + set(PKG_CONFIG_VERSION 1) + ++if(EXISTS "/etc/debian_version") ++ include(${CMAKE_ROOT}/Modules/MultiArchCross.cmake OPTIONAL RESULT_VARIABLE _INCLUDED_MULTIARCH_TOOLCHAIN_FILE) ++endif() ++ + # find pkg-config, use PKG_CONFIG if set + if((NOT PKG_CONFIG_EXECUTABLE) AND (NOT "$ENV{PKG_CONFIG}" STREQUAL "")) + set(PKG_CONFIG_EXECUTABLE "$ENV{PKG_CONFIG}" CACHE FILEPATH "pkg-config executable") +Index: cmake-3.0.2/Modules/GNUInstallDirs.cmake +=================================================================== +--- cmake-3.0.2.orig/Modules/GNUInstallDirs.cmake ++++ cmake-3.0.2/Modules/GNUInstallDirs.cmake +@@ -72,6 +72,10 @@ + + # Installation directories + # ++if(EXISTS "/etc/debian_version") ++ include(${CMAKE_ROOT}/Modules/MultiArchCross.cmake OPTIONAL RESULT_VARIABLE _INCLUDED_MULTIARCH_TOOLCHAIN_FILE) ++endif() ++ + if(NOT DEFINED CMAKE_INSTALL_BINDIR) + set(CMAKE_INSTALL_BINDIR "bin" CACHE PATH "user executables (bin)") + endif() +Index: cmake-3.0.2/Modules/AutogenInfo.cmake.in +=================================================================== +--- cmake-3.0.2.orig/Modules/AutogenInfo.cmake.in ++++ cmake-3.0.2/Modules/AutogenInfo.cmake.in +@@ -13,6 +13,9 @@ set(AM_CMAKE_SOURCE_DIR "@CMAKE_SOURCE_D + set(AM_QT_MOC_EXECUTABLE "@_qt_moc_executable@") + set(AM_QT_UIC_EXECUTABLE "@_qt_uic_executable@") + set(AM_QT_RCC_EXECUTABLE "@_qt_rcc_executable@") ++if(DEFINED ENV{DEB_BUILD_MULTIARCH} AND DEFINED ENV{DEB_HOST_MULTIARCH} AND "@_qt_moc_executable@" MATCHES "/usr/lib/$ENV{DEB_HOST_MULTIARCH}/qt5/bin/moc") ++ set(AM_QT_MOC_EXECUTABLE "/usr/lib/$ENV{DEB_BUILD_MULTIARCH}/qt5/bin/moc") ++endif() + set(AM_CMAKE_CURRENT_SOURCE_DIR "@CMAKE_CURRENT_SOURCE_DIR@/") + set(AM_CMAKE_CURRENT_BINARY_DIR "@CMAKE_CURRENT_BINARY_DIR@/") + set(AM_QT_VERSION_MAJOR "@_target_qt_version@")