diff --git a/debian/changelog b/debian/changelog index 02177e55f..944892bc0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,16 @@ cmake (2.8.3-1) UNRELEASED; urgency=low * debian/control: Bumped Standards-Version to 3.9.1, no further changes needed. + [ Modestas Vainius ] + * Drop patches which were merged upstream: + - debian/patches/hurd_platform.diff; + - FindGTK2_pangommconfig.diff; + - FindJNI_fix_libarch_determination.diff; + - cpack_installed_size.diff; + - add_libarchive_script.patch - better version merged upstream; + - fix-CTestTestFailedSubmit-xmlrpc.diff; + - fix_spelling_errors.patch. + -- Modestas Vainius Sat, 13 Nov 2010 01:07:46 +0200 cmake (2.8.2-2) unstable; urgency=low diff --git a/debian/patches/FindGTK2_pangommconfig.diff b/debian/patches/FindGTK2_pangommconfig.diff deleted file mode 100644 index d110e19c0..000000000 --- a/debian/patches/FindGTK2_pangommconfig.diff +++ /dev/null @@ -1,21 +0,0 @@ -Author: Sune Vuorela -Description: Find pangommconfig include directory in FindGTK2 - There is a small bug in FindGTK2.cmake that makes the include dirs not - set properly when using pangomm. Pangomm has, like many of the other - libraries, now two include dirs, one for the arch specific 'config' - header, and another dir for the arch independent headers. -Forwarded: http://public.kitware.com/Bug/view.php?id=10691 -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=579718 -Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;filename=cmake-find-gtk2-pangomm-config;att=1;bug=579718 -Last-Update: 2010-04-30 - ---- a/Modules/FindGTK2.cmake -+++ b/Modules/FindGTK2.cmake -@@ -439,6 +439,7 @@ foreach(_GTK2_component ${GTK2_FIND_COMP - _GTK2_FIND_LIBRARY (GTK2_CAIROMM_LIBRARY cairomm true true) - - _GTK2_FIND_INCLUDE_DIR(GTK2_PANGOMM_INCLUDE_DIR pangomm.h) -+ _GTK2_FIND_INCLUDE_DIR(GTK2_PANGOMMCONFIG_INCLUDE_DIR pangommconfig.h) - _GTK2_FIND_LIBRARY (GTK2_PANGOMM_LIBRARY pangomm true true) - - _GTK2_FIND_INCLUDE_DIR(GTK2_SIGC++_INCLUDE_DIR sigc++/sigc++.h) diff --git a/debian/patches/FindJNI_fix_libarch_determination.diff b/debian/patches/FindJNI_fix_libarch_determination.diff deleted file mode 100644 index 26496df0b..000000000 --- a/debian/patches/FindJNI_fix_libarch_determination.diff +++ /dev/null @@ -1,86 +0,0 @@ -From: Modestas Vainius -Subject: Fix libarch determination based on openjdk 1.6.0_18 + icedtea code - This new version is based on the openjdk 1.6.0_18 + icedtea patches: - - acinclude.m4 (JRE_ARCH_DIR) - - openjdk/jdk/make/common/shared/Platform.gmk (libarch) - This should fix libarch determination on armel and mipsel, add support for - hppa and sh. However, it would be more reliable to base this guess on the - first part of the GNU config.guess platform triplet but it is generally not - available for cmake yet. -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=544674 -Bug: http://public.kitware.com/Bug/view.php?id=9611 -Origin: vendor -Forwarded: yes -Last-Update: 2010-05-17 -Applied-Upstream: http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=963921f2a86a6cfa78c86dc7127ca117f540f199 - ---- a/Modules/FindJNI.cmake -+++ b/Modules/FindJNI.cmake -@@ -29,24 +29,49 @@ - # Expand {libarch} occurences to java_libarch subdirectory(-ies) and set ${_var} - MACRO(java_append_library_directories _var) - # Determine java arch-specific library subdir -- IF (CMAKE_SYSTEM_NAME MATCHES "Linux") -- # Based on openjdk/jdk/make/common/shared/Platform.gmk as of 6b16 -- # and kaffe as of 1.1.8 which uses the first part of the -- # GNU config.guess platform triplet. -- IF(CMAKE_SYSTEM_PROCESSOR MATCHES "^i[3-9]86$") -- SET(_java_libarch "i386") -- ELSEIF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") -- SET(_java_libarch "amd64" "x86_64") -- ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^ppc") -- SET(_java_libarch "ppc" "powerpc" "ppc64") -- ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^sparc") -- SET(_java_libarch "sparc" "sparcv9") -- ELSE(CMAKE_SYSTEM_PROCESSOR MATCHES "^i[3-9]86$") -- SET(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}") -- ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^i[3-9]86$") -- ELSE(CMAKE_SYSTEM_NAME MATCHES "Linux") -- SET(_java_libarch "i386" "amd64" "ppc") # previous default -- ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux") -+ # Mostly based on openjdk/jdk/make/common/shared/Platform.gmk as of openjdk -+ # 1.6.0_18 + icedtea patches. However, it would be much better to base the -+ # guess on the first part of the GNU config.guess platform triplet. -+ IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") -+ SET(_java_libarch "amd64") -+ ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^i.86$") -+ SET(_java_libarch "i386") -+ ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^alpha") -+ SET(_java_libarch "alpha") -+ ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") -+ # Subdir is "arm" for both big-endian (arm) and little-endian (armel). -+ SET(_java_libarch "arm") -+ ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^mips") -+ # mips* machines are bi-endian mostly so processor does not tell -+ # endianess of the underlying system. -+ SET(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}" "mips" "mipsel" "mipseb") -+ ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64") -+ SET(_java_libarch "ppc64") -+ ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)") -+ SET(_java_libarch "ppc") -+ ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^sparc") -+ # Both flavours can run on the same processor -+ SET(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}" "sparc" "sparcv9") -+ ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(parisc|hppa)") -+ SET(_java_libarch "parisc" "parisc64") -+ ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^s390") -+ # s390 binaries can run on s390x machines -+ SET(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}" "s390" "s390x") -+ ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^sh") -+ SET(_java_libarch "sh") -+ ELSE(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") -+ SET(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}") -+ ENDIF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") -+ -+ # Append default list architectures if CMAKE_SYSTEM_PROCESSOR was empty or -+ # system is non-Linux (where the code above has not been well tested) -+ IF(NOT _java_libarch OR NOT (CMAKE_SYSTEM_NAME MATCHES "Linux")) -+ LIST(APPEND _java_libarch "i386" "amd64" "ppc") -+ ENDIF(NOT _java_libarch OR NOT (CMAKE_SYSTEM_NAME MATCHES "Linux")) -+ -+ # Sometimes ${CMAKE_SYSTEM_PROCESSOR} is added to the list to prefer -+ # current value to a hardcoded list. Remove possible duplicates. -+ LIST(REMOVE_DUPLICATES _java_libarch) - - FOREACH(_path ${ARGN}) - IF(_path MATCHES "{libarch}") diff --git a/debian/patches/add_libarchive_script.patch b/debian/patches/add_libarchive_script.patch deleted file mode 100644 index 3e86f2ffd..000000000 --- a/debian/patches/add_libarchive_script.patch +++ /dev/null @@ -1,75 +0,0 @@ -Description: add Findlibarchive.cmake needed to build with system libarchive -Author: Kai Wasserbäch -Forwarded: yes -Bug: http://public.kitware.com/Bug/view.php?id=10923 -Origin: vendor -Last-Update: 2010-07-01 -Applied-Upstream: http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=01d2057a - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -265,7 +265,8 @@ MACRO (CMAKE_BUILD_UTILITIES) - ENDIF() - IF(CMAKE_USE_SYSTEM_LIBARCHIVE) - FIND_PACKAGE(libarchive) -- SET(CMAKE_TAR_LIBRARIES libarchive) -+ SET(CMAKE_TAR_LIBRARIES ${LIBARCHIVE_LIBRARY}) -+ SET(CMAKE_TAR_INCLUDES ${LIBARCHIVE_INCLUDE_DIR}) - ELSE(CMAKE_USE_SYSTEM_LIBARCHIVE) - SET(HAVE_LIBZ 1) - SET(HAVE_ZLIB_H 1) ---- /dev/null -+++ b/Modules/Findlibarchive.cmake -@@ -0,0 +1,41 @@ -+# - Try to find libarchive -+# Once done this will define -+# -+# LIBARCHIVE_FOUND - system has libarchive -+# LIBARCHIVE_INCLUDE_DIR - the libarchive include directory -+# LIBARCHIVE_LIBRARY - Link this to use libarchive -+# HAVE_LIBARCHIVE_GZIP_SUPPORT - whether libarchive has been compiled with gzip support -+# HAVE_LIBARCHIVE_LZMA_SUPPORT - whether libarchive has been compiled with lzma support -+# HAVE_LIBARCHIVE_XZ_SUPPORT - whether libarchive has been compiled with xz support -+# -+# Copyright (c) 2006, Pino Toscano, -+# -+# Redistribution and use is allowed according to the terms of the BSD license. -+# For details see the accompanying COPYING-CMAKE-SCRIPTS file. -+ -+include(CheckLibraryExists) -+ -+if (LIBARCHIVE_LIBRARY AND LIBARCHIVE_INCLUDE_DIR) -+ # in cache already -+ set(LIBARCHIVE_FOUND TRUE) -+else (LIBARCHIVE_LIBRARY AND LIBARCHIVE_INCLUDE_DIR) -+ find_path(LIBARCHIVE_INCLUDE_DIR archive.h -+ ${GNUWIN32_DIR}/include -+ ) -+ -+ find_library(LIBARCHIVE_LIBRARY NAMES archive libarchive archive2 libarchive2 -+ PATHS -+ ${GNUWIN32_DIR}/lib -+ ) -+ -+ if (LIBARCHIVE_LIBRARY) -+ check_library_exists(${LIBARCHIVE_LIBRARY} archive_write_set_compression_gzip "" HAVE_LIBARCHIVE_GZIP_SUPPORT) -+ check_library_exists(${LIBARCHIVE_LIBRARY} archive_write_set_compression_lzma "" HAVE_LIBARCHIVE_LZMA_SUPPORT) -+ check_library_exists(${LIBARCHIVE_LIBRARY} archive_write_set_compression_xz "" HAVE_LIBARCHIVE_XZ_SUPPORT) -+ endif (LIBARCHIVE_LIBRARY) -+ -+ include(FindPackageHandleStandardArgs) -+ find_package_handle_standard_args(LibArchive DEFAULT_MSG LIBARCHIVE_INCLUDE_DIR LIBARCHIVE_LIBRARY HAVE_LIBARCHIVE_GZIP_SUPPORT) -+ -+ mark_as_advanced(LIBARCHIVE_INCLUDE_DIR LIBARCHIVE_LIBRARY HAVE_LIBARCHIVE_GZIP_SUPPORT HAVE_LIBARCHIVE_LZMA_SUPPORT) -+endif (LIBARCHIVE_LIBRARY AND LIBARCHIVE_INCLUDE_DIR) ---- a/Tests/CMakeTests/ModuleNoticesTest.cmake.in -+++ b/Tests/CMakeTests/ModuleNoticesTest.cmake.in -@@ -22,6 +22,8 @@ string(REPLACE "\r\r" "\r" notice_regex - # Modules that do not require our notice. - set(notice_exceptions - FindCUDA.cmake # MIT License, distributed here from upstream project -+ Findlibarchive.cmake # Debian-Patch: taken from kdeutils, different until -+ # upstream accepts it. - ) - - # Load the list of modules to check. diff --git a/debian/patches/cpack_installed_size.diff b/debian/patches/cpack_installed_size.diff deleted file mode 100644 index ba4db7ed1..000000000 --- a/debian/patches/cpack_installed_size.diff +++ /dev/null @@ -1,23 +0,0 @@ -Description: CPack: units of the deb Installed-Size field are rounded up bytes / 1024 - Units of the Installed-Size field in debs are estimated installed size in - bytes, divided by 1024 and rounded up. See Debian Polucy 5.6.20 for more - information: - http://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-Installed-Size -Author: Simone Rossetto -Author: Modestas Vainius -Bug: http://public.kitware.com/Bug/view.php?id=10296 -Forwarded: yes -Last-Update: 2010-05-17 -Applied-Upstream: http://cmake.org/gitweb?p=cmake.git;a=commit;h=8110c099449c3c78414429a40ba8ba4f9c149538 - ---- a/Source/CPack/cmCPackDebGenerator.cxx -+++ b/Source/CPack/cmCPackDebGenerator.cxx -@@ -121,7 +121,7 @@ int cmCPackDebGenerator::CompressFiles(c - totalSize += cmSystemTools::FileLength(fileIt->c_str()); - } - } -- out << "Installed-Size: " << totalSize << "\n"; -+ out << "Installed-Size: " << (totalSize + 1023) / 1024 << "\n"; - out << "Maintainer: " << maintainer << "\n"; - out << "Description: " << desc << "\n"; - out << std::endl; diff --git a/debian/patches/fix-CTestTestFailedSubmit-xmlrpc.diff b/debian/patches/fix-CTestTestFailedSubmit-xmlrpc.diff deleted file mode 100644 index 64db3e18d..000000000 --- a/debian/patches/fix-CTestTestFailedSubmit-xmlrpc.diff +++ /dev/null @@ -1,22 +0,0 @@ -Subject: pass the CTestTestFailedSubmit-xmlrpc test when there is "Submission problem" in the output - This is at least applicable to XMLRPC. Full error message is below: - ------ - Submission problem: Curl failed to perform HTTP POST request. curl_easy_perform() says: malformed (-504) - . - Problems when submitting via XML-RPC - ------ -Author: Modestas Vainius -Forwarded: no -Origin: vendor -Last-Update: 2010-07-02 - ---- a/Tests/CMakeLists.txt -+++ b/Tests/CMakeLists.txt -@@ -1413,6 +1413,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION= - set(regex "${regex}|The requested URL returned error") - set(regex "${regex}|libcurl was built with SSL disabled. https: not supported)") - set(regex "${regex}|Submission method .xmlrpc. not compiled into CTest") -+ set(regex "${regex}|Submission problem") - set(regex "${regex}|Submission successful)") - - set(ctest_coverage_labels_args "") diff --git a/debian/patches/fix_spelling_errors.patch b/debian/patches/fix_spelling_errors.patch deleted file mode 100644 index 843545590..000000000 --- a/debian/patches/fix_spelling_errors.patch +++ /dev/null @@ -1,324 +0,0 @@ -Author: Kai Wasserbäch -Origin: vendor -Last-Update: 2010-07-02 -Subject: Fix all the spelling errors reported by Lintian. -Forwarded: yes -Bug: http://public.kitware.com/Bug/view.php?id=10928 -Applied-Upstream: http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9203e918 ---- - Modules/CPackRPM.cmake | 4 ++-- - Modules/FindCUDA.cmake | 4 ++-- - Modules/FindSWIG.cmake | 2 +- - Modules/FindwxWidgets.cmake | 4 ++-- - Source/CPack/cpack.cxx | 2 +- - Source/CTest/cmCTestCoverageHandler.cxx | 6 +++--- - Source/CTest/cmCTestRunScriptCommand.h | 2 +- - Source/CTest/cmCTestSubmitHandler.cxx | 2 +- - Source/CursesDialog/form/fld_info.c | 2 +- - Source/CursesDialog/form/fld_user.c | 4 ++-- - Source/CursesDialog/form/frm_user.c | 4 ++-- - Source/cmCTest.cxx | 2 +- - Source/cmIncludeDirectoryCommand.cxx | 2 +- - Source/cmLocalGenerator.cxx | 2 +- - Source/cmProjectCommand.h | 2 +- - Source/cmSetCommand.cxx | 2 +- - Source/cmTryRunCommand.cxx | 2 +- - Source/cmake.cxx | 2 +- - Tests/CMakeTests/FindBaseTest.cmake.in | 2 +- - Utilities/cmcurl/curl/multi.h | 2 +- - Utilities/cmcurl/url.c | 2 +- - 21 files changed, 28 insertions(+), 28 deletions(-) - ---- a/Modules/CPackRPM.cmake -+++ b/Modules/CPackRPM.cmake -@@ -81,7 +81,7 @@ - # CPACK_RPM_PACKAGE_DEBUG - # Mandatory : NO - # Default : - --# May be set when invoking cpack in order to trace debug informations -+# May be set when invoking cpack in order to trace debug information - # during CPack RPM run. For example you may launch CPack like this - # cpack -D CPACK_RPM_PACKAGE_DEBUG=1 -G RPM - # CPACK_RPM_USER_BINARY_SPECFILE -@@ -260,7 +260,7 @@ ENDIF(NOT CPACK_RPM_PACKAGE_VENDOR) - - # CPACK_RPM_PACKAGE_DESCRIPTION - # The variable content may be either --# - explicitely given by tthe user or -+# - explicitly given by the user or - # - filled with the content of CPACK_PACKAGE_DESCRIPTION_FILE - # if it is defined - # - set to a default value ---- a/Modules/FindCUDA.cmake -+++ b/Modules/FindCUDA.cmake -@@ -165,7 +165,7 @@ - # and will link in the resulting object file automatically. - # - # This script will also generate a separate cmake script that is used at --# build time to invoke nvcc. This is for serveral reasons. -+# build time to invoke nvcc. This is for several reasons. - # - # 1. nvcc can return negative numbers as return values which confuses - # Visual Studio into thinking that the command succeeded. The script now -@@ -811,7 +811,7 @@ endfunction() - ############################################################################## - # This helper macro populates the following variables and setups up custom - # commands and targets to invoke the nvcc compiler to generate C or PTX source --# dependant upon the format parameter. The compiler is invoked once with -M -+# dependent upon the format parameter. The compiler is invoked once with -M - # to generate a dependency file and a second time with -cuda or -ptx to generate - # a .cpp or .ptx file. - # INPUT: ---- a/Modules/FindSWIG.cmake -+++ b/Modules/FindSWIG.cmake -@@ -5,7 +5,7 @@ - # SWIG_EXECUTABLE - the path to the swig executable - # SWIG_VERSION - the version number of the swig executable - # --# All informations are collected from the SWIG_EXECUTABLE so the -+# All information is collected from the SWIG_EXECUTABLE so the - # version to be found can be changed from the command line by - # means of setting SWIG_EXECUTABLE - # ---- a/Modules/FindwxWidgets.cmake -+++ b/Modules/FindwxWidgets.cmake -@@ -57,14 +57,14 @@ - # FIND_PACKAGE(wxWidgets COMPONENTS base core gl net) - # IF(wxWidgets_FOUND) - # INCLUDE(${wxWidgets_USE_FILE}) --# # and for each of your dependant executable/library targets: -+# # and for each of your dependent executable/library targets: - # TARGET_LINK_LIBRARIES( ${wxWidgets_LIBRARIES}) - # ENDIF(wxWidgets_FOUND) - # - # If wxWidgets is required (i.e., not an optional part): - # FIND_PACKAGE(wxWidgets REQUIRED base core gl net) - # INCLUDE(${wxWidgets_USE_FILE}) --# # and for each of your dependant executable/library targets: -+# # and for each of your dependent executable/library targets: - # TARGET_LINK_LIBRARIES( ${wxWidgets_LIBRARIES}) - - #============================================================================= ---- a/Source/CPack/cpack.cxx -+++ b/Source/CPack/cpack.cxx -@@ -203,7 +203,7 @@ int main (int argc, char *argv[]) - if ( verbose ) - { - log.SetVerbose(verbose); -- cmCPack_Log(&log, cmCPackLog::LOG_OUTPUT, "Enable Verbse" << std::endl); -+ cmCPack_Log(&log, cmCPackLog::LOG_OUTPUT, "Enable Verbose" << std::endl); - } - if ( debug ) - { ---- a/Source/CTest/cmCTestCoverageHandler.cxx -+++ b/Source/CTest/cmCTestCoverageHandler.cxx -@@ -429,7 +429,7 @@ int cmCTestCoverageHandler::ProcessHandl - //std::string fullBinaryDir = binaryDir + "/"; - cmCTestLog(this->CTest, HANDLER_OUTPUT, std::endl); - cmCTestLog(this->CTest, HANDLER_OUTPUT, -- " Acumulating results (each . represents one file):" << std::endl); -+ " Accumulating results (each . represents one file):" << std::endl); - cmCTestLog(this->CTest, HANDLER_OUTPUT, " "); - - std::vector errorsWhileAccumulating; -@@ -508,7 +508,7 @@ int cmCTestCoverageHandler::ProcessHandl - cmCTestCoverageHandlerContainer::SingleFileCoverageVector::size_type cc; - std::string line; - cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, -- "Actually perfoming coverage for: " << fullFileName << std::endl); -+ "Actually performing coverage for: " << fullFileName << std::endl); - for ( cc= 0; cc < fcov.size(); cc ++ ) - { - if ( !cmSystemTools::GetLineFromStream(ifs, line) && -@@ -593,7 +593,7 @@ int cmCTestCoverageHandler::ProcessHandl - int untested = 0; - std::string line; - cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, -- "Actually perfoming coverage for: " << i->c_str() << std::endl); -+ "Actually performing coverage for: " << i->c_str() << std::endl); - while (cmSystemTools::GetLineFromStream(ifs, line)) - { - covLogFile << "\t\t" ---- a/Source/CTest/cmCTestRunScriptCommand.h -+++ b/Source/CTest/cmCTestRunScriptCommand.h -@@ -68,7 +68,7 @@ public: - "Runs a script or scripts much like if it was run from ctest -S. " - "If no argument is provided then the current script is run using " - "the current settings of the variables. If NEW_PROCESS is specified " -- "then each script will be run in a seperate process." -+ "then each script will be run in a separate process." - "If RETURN_VALUE is specified the return value of the last script " - "run will be put into var."; - } ---- a/Source/CTest/cmCTestSubmitHandler.cxx -+++ b/Source/CTest/cmCTestSubmitHandler.cxx -@@ -589,7 +589,7 @@ bool cmCTestSubmitHandler::TriggerUsingH - << turl.c_str() << std::endl); - cmCTestLog(this->CTest, ERROR_MESSAGE, " Error message was: " - << error_buffer << std::endl); -- *this->LogFile << "\tTrigerring failed with error: " << error_buffer -+ *this->LogFile << "\tTriggering failed with error: " << error_buffer - << std::endl - << " Error message was: " << error_buffer - << std::endl; ---- a/Source/CursesDialog/form/fld_info.c -+++ b/Source/CursesDialog/form/fld_info.c -@@ -69,7 +69,7 @@ int field_info(const FIELD *field, - | int *drows, int *dcols, - | int *maxgrow) - | --| Description : Retrieve informations about a dynamic fields current -+| Description : Retrieve information about a dynamic fields current - | dynamic parameters. - | - | Return Values : E_OK - success ---- a/Source/CursesDialog/form/fld_user.c -+++ b/Source/CursesDialog/form/fld_user.c -@@ -39,7 +39,7 @@ MODULE_ID("$Id$") - | Function : int set_field_userptr(FIELD *field, void *usrptr) - | - | Description : Set the pointer that is reserved in any field to store --| application relevant informations -+| application relevant information - | - | Return Values : E_OK - on success - +--------------------------------------------------------------------------*/ -@@ -54,7 +54,7 @@ int set_field_userptr(FIELD * field, voi - | Function : void *field_userptr(const FIELD *field) - | - | Description : Return the pointer that is reserved in any field to --| store application relevant informations. -+| store application relevant information. - | - | Return Values : Value of pointer. If no such pointer has been set, - | NULL is returned ---- a/Source/CursesDialog/form/frm_user.c -+++ b/Source/CursesDialog/form/frm_user.c -@@ -39,7 +39,7 @@ MODULE_ID("$Id$") - | Function : int set_form_userptr(FORM *form, void *usrptr) - | - | Description : Set the pointer that is reserved in any form to store --| application relevant informations -+| application relevant information - | - | Return Values : E_OK - on success - +--------------------------------------------------------------------------*/ -@@ -54,7 +54,7 @@ int set_form_userptr(FORM * form, void * - | Function : void *form_userptr(const FORM *form) - | - | Description : Return the pointer that is reserved in any form to --| store application relevant informations. -+| store application relevant information. - | - | Return Values : Value of pointer. If no such pointer has been set, - | NULL is returned ---- a/Source/cmCTest.cxx -+++ b/Source/cmCTest.cxx -@@ -2121,7 +2121,7 @@ int cmCTest::Run(std::vectorAddTestsForDashboardType(targ)) - { - performSomeTest = false; ---- a/Source/cmIncludeDirectoryCommand.cxx -+++ b/Source/cmIncludeDirectoryCommand.cxx -@@ -63,7 +63,7 @@ bool cmIncludeDirectoryCommand - // " /foo/bar - // /boo/hoo /dingle/berry " - // --// ideally that should be three seperate arguments but when sucking the -+// ideally that should be three separate arguments but when sucking the - // output from a program and passing it into a command the cleanup doesn't - // always happen - // ---- a/Source/cmLocalGenerator.cxx -+++ b/Source/cmLocalGenerator.cxx -@@ -3045,7 +3045,7 @@ bool cmLocalGenerator::CheckDefinition(s - if(define.find_first_of("#") != define.npos) - { - cmOStringStream e; -- e << "WARNING: Peprocessor definitions containing '#' may not be " -+ e << "WARNING: Preprocessor definitions containing '#' may not be " - << "passed on the compiler command line because many compilers " - << "do not support it.\n" - << "CMake is dropping a preprocessor definition: " << define << "\n" ---- a/Source/cmProjectCommand.h -+++ b/Source/cmProjectCommand.h -@@ -66,7 +66,7 @@ public: - "Optionally you can specify which languages your project supports. " - "Example languages are CXX (i.e. C++), C, Fortran, etc. " - "By default C and CXX are enabled. E.g. if you do not have a " -- "C++ compiler, you can disable the check for it by explicitely listing " -+ "C++ compiler, you can disable the check for it by explicitly listing " - "the languages you want to support, e.g. C. By using the special " - "language \"NONE\" all checks for any language can be disabled."; - } ---- a/Source/cmSetCommand.cxx -+++ b/Source/cmSetCommand.cxx -@@ -99,7 +99,7 @@ bool cmSetCommand - } - } - -- // collect any values into a single semi-colon seperated value list -+ // collect any values into a single semi-colon separated value list - if(static_cast(args.size()) > - static_cast(1 + ignoreLastArgs)) - { ---- a/Source/cmTryRunCommand.cxx -+++ b/Source/cmTryRunCommand.cxx -@@ -361,7 +361,7 @@ void cmTryRunCommand::DoNotRunExecutable - - std::string errorMessage = "TRY_RUN() invoked in cross-compiling mode, " - "please set the following cache variables " -- "appropriatly:\n"; -+ "appropriately:\n"; - errorMessage += " " + this->RunResultVariable + " (advanced)\n"; - if (out!=0) - { ---- a/Source/cmake.cxx -+++ b/Source/cmake.cxx -@@ -954,7 +954,7 @@ void CMakeCommandUsage(const char* progr - << " echo [string]... - displays arguments as text\n" - << " echo_append [string]... - displays arguments as text but no new " - "line\n" -- << " environment - display the current enviroment\n" -+ << " environment - display the current environment\n" - << " make_directory dir - create a directory\n" - << " md5sum file1 [...] - compute md5sum of files\n" - << " remove_directory dir - remove a directory and its contents\n" ---- a/Tests/CMakeTests/FindBaseTest.cmake.in -+++ b/Tests/CMakeTests/FindBaseTest.cmake.in -@@ -55,7 +55,7 @@ if(NOT "${FOO_H_5}" STREQUAL "${_HEADER_ - message(FATAL_ERROR "Did not find \"${_HEADER_FULL}\"\ngot ${FOO_H_5} instead !") - endif(NOT "${FOO_H_5}" STREQUAL "${_HEADER_FULL}") - --# by explicitely disabling CMAKE_FIND_ROOT_PATH again it shouldn't be found -+# by explicitly disabling CMAKE_FIND_ROOT_PATH again it shouldn't be found - find_file(FOO_H_6 ${_HEADER} NO_CMAKE_FIND_ROOT_PATH) - if(FOO_H_6) - message(FATAL_ERROR "${_HEADER} found: ${FOO_H_6}, it should not exist !") ---- a/Utilities/cmcurl/curl/multi.h -+++ b/Utilities/cmcurl/curl/multi.h -@@ -181,7 +181,7 @@ CURL_EXTERN CURLMcode curl_multi_cleanup - * curl_multi_cleanup(). - * - * The 'CURLMsg' struct is meant to be very simple and only contain -- * very basic informations. If more involved information is wanted, -+ * very basic information. If more involved information is wanted, - * we will provide the particular "transfer handle" in that struct - * and that should/could/would be used in subsequent - * curl_easy_getinfo() calls (or similar). The point being that we ---- a/Utilities/cmcurl/url.c -+++ b/Utilities/cmcurl/url.c -@@ -3983,7 +3983,7 @@ static CURLcode SetupConnection(struct c - conn->bits.tcpconnect = FALSE; - - /* if the connection was closed by the server while exchanging -- authentication informations, retry with the new set -+ authentication information, retry with the new set - authentication information */ - if(conn->bits.proxy_connect_closed) { - /* reset the error buffer */ diff --git a/debian/patches/hurd_platform.diff b/debian/patches/hurd_platform.diff deleted file mode 100644 index cc63ee855..000000000 --- a/debian/patches/hurd_platform.diff +++ /dev/null @@ -1,27 +0,0 @@ -From: Pino Toscano -Subject: Fix platform file for GNU/Hurd - Currently (both in cmake 2.6.x and cmake 2.8 as of its latest rc5), the - GNU.cmake platform file used for GNU/Hurd systems is not complete. In - particular, it needs the rpath-link flag definition, needed for properly - compiling in all the cmake setups; in particular, its miss causes the failure - of the ExportImport unit test, which instead works correctly with the proposed - patch. Also, the patch provides some more definitions, a bit close to the - Linux oones (given the base toolchain is quite close anyway, GNU-based). -Bug: http://public.kitware.com/Bug/view.php?id=9873 -Forwarded: http://public.kitware.com/Bug/view.php?id=9873 -Origin: other, http://public.kitware.com/Bug/file_download.php?file_id=2644&type=bug -Applied-Upstream: http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=90467d62 - ---- a/Modules/Platform/GNU.cmake -+++ b/Modules/Platform/GNU.cmake -@@ -4,5 +4,10 @@ - SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared") - SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") - SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":") -+SET(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,") - SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,") -+SET(CMAKE_SHARED_LIBRARY_SONAME_Fortran_FLAG "-Wl,-soname,") -+SET(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic") -+SET(CMAKE_EXE_EXPORTS_CXX_FLAG "-Wl,--export-dynamic") -+ - INCLUDE(Platform/UnixPaths) diff --git a/debian/patches/series b/debian/patches/series index 36683ce0b..65ed17c85 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,8 +1 @@ -hurd_platform.diff -FindGTK2_pangommconfig.diff -FindJNI_fix_libarch_determination.diff -cpack_installed_size.diff FindPython_fix_#569321_and_#580503.diff -add_libarchive_script.patch -fix-CTestTestFailedSubmit-xmlrpc.diff -fix_spelling_errors.patch