From b64e06ccc63725f044cb2c12b57a824213f62893 Mon Sep 17 00:00:00 2001 From: Felix Geyer Date: Sun, 15 Jan 2017 15:00:24 +0000 Subject: [PATCH] Import cmake_3.7.2-1.debian.tar.xz [dgit import tarball cmake 3.7.2-1 cmake_3.7.2-1.debian.tar.xz] --- NEWS | 9 + changelog | 1675 ++++++++++++++++++ cmake-curses-gui.install | 2 + cmake-curses-gui.maintscript | 1 + cmake-data.docs | 1 + cmake-data.emacsen-compat | 1 + cmake-data.emacsen-install | 28 + cmake-data.emacsen-remove | 11 + cmake-data.emacsen-startup | 15 + cmake-data.install | 18 + cmake-dbg.maintscript | 1 + cmake-doc.doc-base | 7 + cmake-doc.install | 1 + cmake-qt-gui.install | 5 + cmake-qt-gui.maintscript | 1 + cmake.install | 9 + cmake.maintscript | 4 + compat | 1 + control | 113 ++ copyright | 452 +++++ gbp.conf | 2 + not-installed | 3 + patches/FindBoost_add_-lpthread_#563479.diff | 48 + patches/fix-ftbfs-on-kfreebsd.patch | 31 + patches/mips-rld-map-rel.patch | 475 +++++ patches/qt_import_dir_variable.diff | 25 + patches/series | 4 + rules | 77 + source/format | 1 + source/lintian-overrides | 2 + tests/control | 44 + tests/findmodules | 9 + tests/findmodules_data/CMakeLists.txt | 10 + tests/testsuite | 11 + tests/testsuite-ninja | 11 + watch | 6 + 36 files changed, 3114 insertions(+) create mode 100644 NEWS create mode 100644 changelog create mode 100644 cmake-curses-gui.install create mode 100644 cmake-curses-gui.maintscript create mode 100644 cmake-data.docs create mode 100644 cmake-data.emacsen-compat create mode 100644 cmake-data.emacsen-install create mode 100644 cmake-data.emacsen-remove create mode 100644 cmake-data.emacsen-startup create mode 100644 cmake-data.install create mode 100644 cmake-dbg.maintscript create mode 100644 cmake-doc.doc-base create mode 100644 cmake-doc.install create mode 100644 cmake-qt-gui.install create mode 100644 cmake-qt-gui.maintscript create mode 100644 cmake.install create mode 100644 cmake.maintscript create mode 100644 compat create mode 100644 control create mode 100644 copyright create mode 100644 gbp.conf create mode 100644 not-installed create mode 100644 patches/FindBoost_add_-lpthread_#563479.diff create mode 100644 patches/fix-ftbfs-on-kfreebsd.patch create mode 100644 patches/mips-rld-map-rel.patch create mode 100644 patches/qt_import_dir_variable.diff create mode 100644 patches/series create mode 100755 rules create mode 100644 source/format create mode 100644 source/lintian-overrides create mode 100644 tests/control create mode 100755 tests/findmodules create mode 100644 tests/findmodules_data/CMakeLists.txt create mode 100755 tests/testsuite create mode 100755 tests/testsuite-ninja create mode 100644 watch diff --git a/NEWS b/NEWS new file mode 100644 index 00000000..b063e805 --- /dev/null +++ b/NEWS @@ -0,0 +1,9 @@ +cmake (2.8.7-4) unstable; urgency=low + + From now on, pass either -DPythonInterp_FIND_VERSION= or + -DPythonLibs_FIND_VERSION= respectively in order to tell cmake to + look for the specific Python version. However, if an explicit Python version + is requested via find_package(), it will override the one specified on the + command line. + + -- Modestas Vainius Fri, 16 Mar 2012 22:15:23 +0200 diff --git a/changelog b/changelog new file mode 100644 index 00000000..3aeb4312 --- /dev/null +++ b/changelog @@ -0,0 +1,1675 @@ +cmake (3.7.2-1) unstable; urgency=medium + + * New upstream release. + + -- Felix Geyer Sun, 15 Jan 2017 16:00:24 +0100 + +cmake (3.7.1-1) unstable; urgency=medium + + * New upstream release. + * Don't try to link against libuv on hurd. (Closes: #844374) + + -- Felix Geyer Sun, 04 Dec 2016 01:01:26 +0100 + +cmake (3.7.0-1) unstable; urgency=medium + + * New upstream release. + * Remove libjapser from the autopkgtest, the package has been removed + from the archive. + + -- Felix Geyer Sun, 13 Nov 2016 19:35:16 +0100 + +cmake (3.7.0~rc3-1) experimental; urgency=medium + + * New upstream release. + + -- Felix Geyer Sun, 06 Nov 2016 11:59:35 +0100 + +cmake (3.7.0~rc2-1) experimental; urgency=medium + + * New upstream release. + * Drop CMakeParseImplicitLinkInfo_Exclude_libclang_rt.patch, fixed upstream. + * Refresh patches. + * Add libuv1-dev to Build-Depends, required by new release. + * Update Uploaders. (Closes: #840858) + + -- Felix Geyer Sun, 30 Oct 2016 23:21:54 +0100 + +cmake (3.6.2-2) unstable; urgency=medium + + * Add mips-rld-map-rel.patch to solve segfaults caused by new + DT_MIPS_RLD_MAP_REL tag and RPATH removers (Closes: #820334). + Thanks James Cowgill for the patch. + * Refresh patches. + + -- Lisandro Damián Nicanor Pérez Meyer Fri, 14 Oct 2016 22:29:17 -0300 + +cmake (3.6.2-1) unstable; urgency=medium + + * New upstream release. + * Fix broken binaries when using clang with -fsanitize. (Closes: #835426) + - Add CMakeParseImplicitLinkInfo_Exclude_libclang_rt.patch, + cherry-picked from upstream. + + -- Felix Geyer Sun, 11 Sep 2016 18:25:36 +0200 + +cmake (3.6.1-1) unstable; urgency=medium + + * New upstream release. + * Drop FindImageMagick_find_program.patch, the underlying issue has been + fixed upstream. + + -- Felix Geyer Sun, 21 Aug 2016 11:13:07 +0200 + +cmake (3.6.0-1) experimental; urgency=medium + + * New upstream release. + * Drop patches that have been applied upstream: + - FindLibArchive_Support_libarchive_3.2.patch + - file_Sort_GLOB_results_to_make_it_deterministic.patch + * Fix detection of ImageMagick. + - Add FindImageMagick_find_program.patch + * Add new autopkgtest which checks if various Find modules are wokring, + + -- Felix Geyer Sun, 10 Jul 2016 10:49:22 +0200 + +cmake (3.5.2-2) unstable; urgency=medium + + * Make FindLibArchive compatible with libarchive 3.2. (Closes: #828092) + - Add FindLibArchive_Support_libarchive_3.2.patch + * Backport patch to make file(GLOB) order deterministic. (Closes: #824263) + - Add file_Sort_GLOB_results_to_make_it_deterministic.patch + + -- Felix Geyer Tue, 28 Jun 2016 19:39:56 +0200 + +cmake (3.5.2-1) unstable; urgency=medium + + * New upstream release. + * Add cvs to autopkgtest Depends. (Closes: #819775) + + -- Felix Geyer Fri, 22 Apr 2016 21:11:37 +0200 + +cmake (3.5.1-1) unstable; urgency=medium + + * New upstream release. + - Fixes FindCUDA regression in separate compilation. (Closes: #818937) + * Update copyright file. + + -- Felix Geyer Tue, 29 Mar 2016 22:16:11 +0200 + +cmake (3.5.0-1) unstable; urgency=medium + + * New upstream release. + - Fixes fltk_wrap_ui segmentation fault. (Closes: #809535) + * Pass correct buildsystem to dh_auto_test, fixes FTBFS. (Closes: #818040) + * Change Vcs-* and Homepage to https URLs. + * Migrate to dbgsym debug package. + + -- Felix Geyer Sun, 13 Mar 2016 15:16:37 +0100 + +cmake (3.4.1-2) unstable; urgency=medium + + * Upload to unstable. + + -- Felix Geyer Mon, 14 Dec 2015 21:41:03 +0100 + +cmake (3.4.1-1) experimental; urgency=medium + + * New upstream release. + + -- Felix Geyer Thu, 03 Dec 2015 18:45:35 +0100 + +cmake (3.4.0-1) experimental; urgency=medium + + * New upstream release. + * Drop patches that have been applied upstream: + - FindJNI.cmake.mips.patch + - fix-hdf5-hl.patch + - FindJNI-Add-support-for-x32-architecture-on-Linux.patch + - Features_Extract_strings_from_test_binary_more_reliably.patch + - FindPkgConfig_remove_variable_dereference.patch + - FindPython_Add_versions_3.5_and_3.6.patch + * Point watch file to the https URL. + * Stop hardcoding the major version in cmake-data.install. + * Remove upgrade maintainer scripts from before wheezy. + + -- Felix Geyer Tue, 17 Nov 2015 18:27:32 +0100 + +cmake (3.3.2-2) unstable; urgency=medium + + * Search for Python 3.5 and 3.6. (Closes: #802826) + - Add FindPython_Add_versions_3.5_and_3.6.patch + * Add tighter build-depends on dpkg-dev and debhelper for Build-Profiles + support. + + -- Felix Geyer Sat, 07 Nov 2015 19:13:27 +0100 + +cmake (3.3.2-1) unstable; urgency=medium + + * Upload to unstable. + * New upstream release. + * Drop Debian menu entries. + * Make compiler feature testing more reliable. + - Fixes testsuite failure on alpha. (Closes: #789807) + - Features_Extract_strings_from_test_binary_more_reliably.patch + * Fix FindPkgConfig when no minimum version has been set. + - FindPkgConfig_remove_variable_dereference.patch + * Remove inactive uploaders from the list. + + -- Felix Geyer Sun, 20 Sep 2015 21:36:39 +0200 + +cmake (3.3.1-2) experimental; urgency=medium + + * Set the team mailing list as maintainer. + * Add a stage1 build profile that disables building cmake-qt-gui. + (Closes: #738161) + * Add autopkgtests which run the upstream testsuite against the system cmake. + * Add support for x32 in FindJNI. (Closes: #792262) + - FindJNI-Add-support-for-x32-architecture-on-Linux.patch + + -- Felix Geyer Fri, 28 Aug 2015 18:41:24 +0200 + +cmake (3.3.1-1) experimental; urgency=medium + + * New upstream release. + - Fixes bashism in Modules/Squish4RunTestCase.sh. (Closes: #772218) + * Drop patches that have been applied upstream: + - cpack-doc-typo.patch + - protect-tests-from-makeflags.patch + - custom-sphinx-flags.patch + - fix-mips-endian.patch + - openjdk-8-detection.patch + * Move bash_completion from /etc to /usr/share. + - Stop using dh_bash-completion. It still installs files to /etc and + dh_install works just fine. + + -- Felix Geyer Fri, 21 Aug 2015 11:57:13 +0200 + +cmake (3.2.2-2) unstable; urgency=medium + + * Make cmake.bash-completion use wildcards for the minor version + thus avoiding installing the file as a script (Closes: #785267). + + -- Lisandro Damián Nicanor Pérez Meyer Wed, 13 May 2015 23:04:05 -0300 + +cmake (3.2.2-1) unstable; urgency=medium + + [ Mario Lang ] + * New upstream release (Closes: #780704). + - Fixes version detection in the OpenSSL module. (Closes: #784443) + * Add myself to Uploaders. + * Build-Depend on liblzma-dev and libjsoncpp-dev. + * Drop patches merged upstream: + - fix-FindImageMagick-1.diff + - fix-FindImageMagick-2.diff + - FindJNI_ppc64le.diff + - hurd_host_system_processor.diff + * Refresh patches: + - FindBoost_add_-lpthread_#563479.diff + - FindJNI.cmake.mips.patch + - fix-ftbfs-on-kfreebsd.patch + - fix-hdf5-hl.patch + - qt_import_dir_variable.diff + * Bump Standards-Version to 3.9.6. + * Fix "Typo in cpack documentation" by adding new patch cpack-doc-typo.patch + (Closes: #760298) + * debian/cmake-data.install: Install new manpage cmake-compile-features.7 + + [ Felix Geyer ] + * Build cmake-qt-gui against Qt 5 again. + * Add protect-tests-from-makeflags.patch, cherry-picked from upstream. + - Fixes running the test suite in parallel from dh_auto_test. + * Make builds reproducible. + - Add custom-sphinx-flags.patch, cherry-picked from upstream. + - Pass the date from d/changelog to sphinx. + * Add libcurl-ssl-dev as an alternative build-dependency to + libcurl4-openssl-dev. (Closes: #785128) + * Properly detect mipsel as little endian architecture. (Closes: #785126) + - Add fix-mips-endian.patch + * Fix detection of openjdk 8. (Closes: #772631) + - Add openjdk-8-detection.patch + + -- Felix Geyer Wed, 13 May 2015 19:02:05 +0200 + +cmake (3.0.2-1) unstable; urgency=medium + + * New upstream release. + - Adds support for OpenRISC (or1k). (Closes: #749004) + * Detect the processor when running on Hurd. (Closes: #761060) + - Add hurd_host_system_processor.diff, cherry-picked from upstream. + * Revert cmake-qt-gui to Qt 4 for now as qtbase 5 fails to build on some + architectures. + + -- Felix Geyer Sun, 14 Sep 2014 19:16:38 +0200 + +cmake (3.0.1-1) experimental; urgency=medium + + * New upstream release. + * Drop patches (fixed upstream): + - fix-bootstrap-test-1.diff + - fix-bootstrap-test-2.diff + + -- Felix Geyer Sat, 09 Aug 2014 21:11:50 +0200 + +cmake (3.0.0-1) experimental; urgency=medium + + * New upstream release. (Closes: #743231) + - Uses multiarch libdir only when prefix is /usr. (Closes: #739876) + - Doesn't crash on bad generator name. (Closes: #747306) + - Provides a FindLua module that supports versions 5.0 - 5.3. + (Closes: #739285) + - Fixes parsing CMakeLists.txt in UTF-8 with BOM encoding. (Closes: #593327) + - Call cmake-gui for edit_cache when using the ninja generator. + (Closes: #712241) + * Drop patches (fixed upstream): + - install_to_multiarch_libdir_on_kfreebsd_hurd.diff + - FindPHP4_fix_typo.diff + - FindJNI_amd64_ppc_biarch.diff + - fix-FindFreetype.diff + - FindRuby_support_Ruby_2.diff + - fix-FindFreetype-version.diff + * Refresh patches: + - FindJNI.cmake.mips.patch + - FindJNI_ppc64le.diff + * Fix running the test suite. + - Cherry-pick upstream fix in fix-bootstrap-test-1.diff and + fix-bootstrap-test-2.diff + * Build the sphinx documentation and man pages. + - Build-depend on python-sphinx. + * Update install files. + * Pass --list-missing to dh_install. + * Use sphinxdoc debhelper sequence. + * Add -Wl,--as-needed to LDFLAGS to avoid overlinking. + * Drop custom cmake-gui manpage, upstream provides one now. + * Build cmake-qt-gui against Qt 5. + * Drop obsolete lintian override cmake-data: extra-license-file. + + [ Lisandro Damián Nicanor Pérez Meyer ] + * Update debian/copyright. + + -- Felix Geyer Thu, 07 Aug 2014 23:38:00 +0200 + +cmake (2.8.12.2-2) unstable; urgency=high + + * Search for Python 3.4 in FindPython{Interp,Libs}. + - Add search_for_python3.4.diff + * Don't create docs symlinks from arch-dep to arch-indep packages. + (Closes: #760823) + * Move the rm_conffile calls to cmake.maintscript. + + -- Felix Geyer Mon, 08 Sep 2014 22:18:32 +0200 + +cmake (2.8.12.2-1) unstable; urgency=medium + + [ Felix Geyer ] + * New upstream release. + * Add Lisandro and myself to uploaders. + * Correctly pass CXXFLAGS with CPPFLAGS to bootstrap. + * Suggest ninja-build as cmake provides a generator for ninja. + (Closes: #743229) + * Fix JNI detection on ppc64el. + - Add FindJNI_ppc64le.diff, cherry-picked from upstream. + * Drop ancient Breaks/Replaces. + * Add lintian override for source-is-missing tags. + These are just binary test files used by the test suite to verify that + changing the RPATH works fine. + * Drop some redundant build options from debian/rules. + * Drop multiarch_findgtk2_fix.diff, was already fixed upstream in 2.8.11. + + [ Lisandro Damián Nicanor Pérez Meyer ] + * Update debian/copyright. + + -- Felix Geyer Thu, 07 Aug 2014 20:16:56 +0200 + +cmake (2.8.12.1-1.6) unstable; urgency=low + + * Non-maintainer upload. + * Fix HDF5 macro for HL and Fortran_HL components (closes: #756108). + + -- Gilles Filippini Wed, 30 Jul 2014 12:51:57 +0200 + +cmake (2.8.12.1-1.5) unstable; urgency=medium + + * Non-maintainer upload. + * Detect the version string of Freetype 2.5. (Closes: #732182) + - Add fix-FindFreetype-version.diff, cherry-picked from upstream. + * Detect the multi-arch ImageMagick include dirs. (Closes: #747907) + - Add fix-FindImageMagick-1.diff and fix-FindImageMagick-2.diff, + cherry-picked from upstream. + + -- Felix Geyer Tue, 22 Jul 2014 21:18:39 +0200 + +cmake (2.8.12.1-1.4) unstable; urgency=medium + + * Non-maintainer upload. + * Add support for mips64 mips64el mipsn32 mipsn32el in + Modules/FindJNI.cmake. + Add FindJNI.cmake.mips.patch. + Patch by Yunqiang Su. + Closes: #747174. + + -- Anibal Monsalve Salazar Mon, 26 May 2014 12:34:45 +0100 + +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 Fri, 23 May 2014 09:25:22 +0100 + +cmake (2.8.12.1-1.2) unstable; urgency=low + + * Non-maintainer upload. + * Backport patch to support Ruby 2.0 and 2.1 in FindRuby.cmake. + (closes: #739826, #730095) + + -- Bas Couwenberg Sun, 30 Mar 2014 21:57:27 +0200 + +cmake (2.8.12.1-1.1) unstable; urgency=high + + * Non-maintainer upload. + * Make sure to find freetype headers in their new location (without an + extra freetype/ directory, fix-FindFreetype.diff). (Closes: #731089) + + -- Cyril Brulebois Sun, 15 Dec 2013 10:30:54 +0000 + +cmake (2.8.12.1-1) unstable; urgency=low + + * New upstream release: + - Automoc no longer ignores ADD_DEFINITIONS. (Closes: #728793) + * Migrate to emacs policy v2.0: cmake-data no longer needs to depend on + emacsen-common but pretty recent debhelper is needed at build time. + * Drop fixup_manpages.diff patch: merged upstream. + + -- Modestas Vainius Thu, 07 Nov 2013 00:56:52 +0200 + +cmake (2.8.12-2) unstable; urgency=low + + * Fix FTBFS on kFreeBSD (fix-ftbfs-on-kfreebsd.patch). + + -- Modestas Vainius Mon, 04 Nov 2013 00:31:57 +0200 + +cmake (2.8.12-1) unstable; urgency=low + + * New upstream release: + - no longer contains workaround for GCC 2.96 bugs; (Closes: #717144) + - cmake -E touch no longer truncates time to seconds. (Closes: #699657) + * Enable bash-completion. (Closes: #722236) + * Switch to using libcurl4-openssl-dev rather than GnuTLS variant. cmake and + all its dependencies appear to be licence compatible. The main reason for + the switch is that OpenSSL variant appear to be less troublesome. + (Closes: #716798) + * Follow emacsen policy 5C and link cmake-mode.el source file next to + compiled one. Thanks to Kevin Ryde. (Closes: #710570) + * Add compiled cmake-mode.elc to load-path and do not barf in emacs if + cmake-data was removed but not purged. Thanks to Kevin Ryde. + (Closes: #710573) + * Remove the whole emacs compiled directory rather than just .elc file. + Thanks to Kevin Ryde. (Closes: #710572) + * Fix a code typo in PHP4 (patch FindPHP4_fix_typo.diff). Thanks to Mathieu + Malaterre for the patch. (Closes: #722475) + * Properly find Java when kernel is 64bit, userland - 32bit (amd64/ppc64). + (patch: FindJNI_amd64_ppc_biarch.diff) (Closes: #718290) + * Bump Standards-Version to 3.9.5: no further changes needed. + * Fix spelling mistakes in manpages (patch: fixup_manpages.diff). + + -- Modestas Vainius Sun, 03 Nov 2013 20:42:54 +0200 + +cmake (2.8.11.2-1) unstable; urgency=low + + * New upstream release. + * Use canonical URL in the Vcs-Git control field. + + -- Modestas Vainius Thu, 04 Jul 2013 23:27:07 +0300 + +cmake (2.8.11.1-1) unstable; urgency=low + + * New upstream tweak release: + - this release fixes tests which used to fail when cmake build path + contained regex metacharacters. As a result, cmake should no longer FTBFS + on Debian buildds which have '+' symbol in the build path. + + -- Modestas Vainius Sun, 16 Jun 2013 00:58:09 +0300 + +cmake (2.8.11-2) unstable; urgency=low + + * Build with BZip2 support, thanks to Pino Toscano for heads up! + * Bump Standards-Version to 3.9.4: no changes needed. + + -- Modestas Vainius Sun, 19 May 2013 22:47:11 +0300 + +cmake (2.8.11-1) unstable; urgency=low + + * New upstream release. + * Add multiarch-python-include-dirs.diff to support multi-arch capable + python. Stolen from Ubuntu. + * FindQt4: define QT_IMPORTS_DIR variable even if it is not present on + the system (i.e. there are no plugins currently installed). Stolen + from Ubuntu. Patch qt_import_dir_variable.diff. + + -- Modestas Vainius Sun, 19 May 2013 12:38:26 +0300 + +cmake (2.8.11~rc3-1) experimental; urgency=low + + * New upstream release. + + -- Modestas Vainius Sun, 21 Apr 2013 11:09:05 +0300 + +cmake (2.8.11~rc1-1) experimental; urgency=low + + * New upstream release. (Closes: #700225) + * Make cmake recommend make and gcc rather than suggest them. + * Make cmake suggest codeblocks and eclipse. + * Drop XMLrpc support. It has been disabled upstream for a while now. + (Closes: #687326) + * Bump Standards-Version to 3.9.4: no changes needed. + * Replace FindBoost_add_-lpthread_#563479.diff patch with a better version + from upstream BTS and make it apply to current FindBoost. + * Drop FindPostgreSQL_665721.diff patch, merged upstream. + * Refresh multiarch_findgtk2_fix.diff patch. + + -- Modestas Vainius Sat, 16 Mar 2013 20:41:24 +0200 + +cmake (2.8.9-1) unstable; urgency=low + + * New upstream release (no upstream changes since RC3). + * Make FindPostgreSQL find headers on Debian. Thanks to Pere Nubiola i + Radigales and Gregor Jasny. (Closes: #665721) + Patch: FindPostgreSQL_665721.diff + * Refresh patches. + * Install to multiarch libdir on kFreeBSD and Hurd like on Linux. Thanks + to John Stamp (Closes: #684956) + Patch: install_to_multiarch_libdir_on_kfreebsd_hurd.diff + + -- Modestas Vainius Sat, 18 Aug 2012 23:13:37 +0300 + +cmake (2.8.9~rc3-1) unstable; urgency=low + + * New upstream release: + - fixes COMPONENT option. (Closes: #681428) + * Remove obsolete /etc/emacs/site-start.d/50cmake.el conffile (predates + squeeze). (Closes: #681625) + + -- Modestas Vainius Sat, 04 Aug 2012 10:41:40 +0300 + +cmake (2.8.9~rc1-1) unstable; urgency=low + + * New upstream release. + * Remove patches, merged upstream: + - backport_findpkgconfig_set_found_variable.diff; + - backport_module_no_soname.diff; + - manpage_fixes.diff. + * Drop cmake-{qt,curses}-gui.lintian-overrides, not needed with newer lintian. + * Enable hardening flags (by appending CPPFLAGS to C(XX)FLAGS). + + -- Modestas Vainius Wed, 27 Jun 2012 21:34:06 +0300 + +cmake (2.8.8-3) unstable; urgency=low + + * Backport a no-soname feature from CMake (2.8.9) master tree. Just set a + NO_SONAME property on the shared library or module target in order to skip + addition of the SONAME field to the shared object. This makes it possible to + build Debian Python policy compliant modules with CMake. (Closes: #668982) + + -- Modestas Vainius Wed, 02 May 2012 21:50:09 +0300 + +cmake (2.8.8-2) unstable; urgency=low + + * FindPkgConfig.cmake: properly set documented PKG_CONFIG_FOUND variable + (patch backport_findpkgconfig_set_found_variable.diff). (Closes: #669627) + + -- Modestas Vainius Sun, 29 Apr 2012 09:55:50 +0300 + +cmake (2.8.8-1) unstable; urgency=low + + * New upstream release: + - do not segfault when adding symbols to ZIP. (Closes: #666456) + Fixed by upstream commit: 768cf9183 + * Remove patches merged/backported from upstream: + - backport_findpython_fixes.diff + - backport_findruby_improvements.diff + - backport_support_cxxtest4.diff + - manpage_fixes.diff + - mipsel_is_little_endian.diff + - paths_in_regex_espace_metachars.diff + * Refresh FindBoost_add_-lpthread_#563479.diff patch. + * Readd manpage_fixes.diff patch with new man page fixes. + + -- Modestas Vainius Thu, 19 Apr 2012 22:32:10 +0300 + +cmake (2.8.7-4) unstable; urgency=low + + * Backport a bunch of FindPython* related commits from cmake master. It + is now possible to force a specific python version via command line again. + The interface has changed though, see NEWS entry. (Closes: #663188) + Patch: backport_findpython_fixes.diff + * Backport a bunch of FindRuby improvements from cmake master. It should be + able to properly find ruby 1.9.1 as packaged in Debian now. + (Closes: #643949) + Patch: backport_findruby_improvements.diff + * Add support for CxxTest 4 in FindCxxTest (backport a patch from cmake + master). (Closes: #662982) Thanks to Simone Rossetto. + Patch: backport_support_cxxtest4.diff + * Bump Standards-Version to 3.9.3: no changes needed. + * Mark cmake Multi-Arch: foreign. The change was stolen from Ubuntu + cmake_2.8.7-0ubuntu3 package. Thanks to Steve Langasek. + + -- Modestas Vainius Fri, 16 Mar 2012 23:49:28 +0200 + +cmake (2.8.7-3) unstable; urgency=medium + + * Fix some tests not to fail if absolute build path contains regex + metacharacters like +. This makes the package binNMUable again. + (patch paths_in_regex_espace_metachars.diff) + * Drop support_cppflags.diff patch because this particular solution was + rejected by upstream. This reopens #653916. + + -- Modestas Vainius Mon, 27 Feb 2012 00:56:14 +0200 + +cmake (2.8.7-2) unstable; urgency=low + + * Properly detect mipsel as little endian architecture. Fixes FTBFS (patch + mipsel_is_little_endian.diff). + * Bump debhelper compat level to 9 in order to receive build flags + automagically. + + -- Modestas Vainius Sun, 19 Feb 2012 13:44:42 +0200 + +cmake (2.8.7-1) unstable; urgency=low + + * New upstream release. (Closes: #658427) + * Disable CTestTestUpload test because it requires Internet access. Thanks to + Felix Geyer. (Closes: #634603) + * Remove multiarch_lib_dirs_should_be_implicit.diff patch, merged upstream. + * Refresh other patches. + * Respect CPPFLAGS environment variable when building C/C++ sources (patch + support_cppflags.diff). (Closes: #653916) + * Fix various typos and formatting errors in manpages (patch + manpage_fixes.diff). + * Update install files: add usr/share/aclocal/cmake.m4. + + -- Modestas Vainius Sat, 18 Feb 2012 15:33:35 +0200 + +cmake (2.8.5-1) unstable; urgency=low + + * New upstream release: + - fixes UseSWIG. (Closes: #631497) + * Drop screen-256color-bce.diff - merged upstream. + * Drop spelling_formatting_fixes.diff - merged upstream. + * Make sure CMake considers /lib/ as implicit and keeps it out of + automatic R(UN)PATH (patch multiarch_lib_dirs_should_be_implicit.diff). + * Refresh FindBoost_add_-lpthread_#563479.diff patch. + + -- Modestas Vainius Sat, 09 Jul 2011 15:18:39 +0300 + +cmake (2.8.5~rc2-1) unstable; urgency=low + + * New upstream release. + * No longer repack upstream tarball and drop dfsg suffix from the version + number. The tarball is DFSG clean now. + * Drop fixup_manpages.diff patch, merged upstream. + * Drop backport_test_order_fix.diff patch, was backported from upstream. + * Drop multiarch_basic_support.diff patch, merged upstream. + * Refresh screen-256color-bce.diff patch. + * Add spelling_formatting_fixes.diff which fixes a couple of new + spelling / formatting errors. + * Override incorrect menu-icon-missing lintian warning properly. + + -- Modestas Vainius Sun, 19 Jun 2011 17:33:45 +0300 + +cmake (2.8.4+dfsg.1-5) unstable; urgency=medium + + * Fix multiarch regex to support armel and (hopefully) all other possible + linux architectures (patch multiarch_basic_support.diff updated). + * Support multiarch paths on kfreebsd and hurd (patch + multiarch_basic_support.diff updated). (Closes: #630167) + * Urgency=medium, the bugs above make cmake almost unusable on armel and + kfreebsd. + + -- Modestas Vainius Sat, 11 Jun 2011 22:47:18 +0300 + +cmake (2.8.4+dfsg.1-4) unstable; urgency=low + + * Drop multiarch_library_directory_hack.diff patch. A better solution has + been implemented (see below). + * Add multiarch implementation from upstream (patch + multiarch_basic_support.diff, taken from upstream bug #12037). New + implementation does not need dpkg-dev 1.16, it is entirely backwards + compatible with previous releases and in addition, it implements multiarch + support for find_package(). + * Adapt multiarch_findgtk2_fix.diff patch to work with + multiarch_basic_support.diff. + + -- Modestas Vainius Thu, 09 Jun 2011 01:18:19 +0300 + +cmake (2.8.4+dfsg.1-3) unstable; urgency=low + + * Merge 2.8.2+dfsg.1-0+squeeze1 changes. + * Do not start cmake description synopsis with an article. + * Generate colour Makefiles when $TERM is set to 'screen-256color-bce'. + Thanks to Davide Mancusi for the patch (screen-256color-bce.diff). + (Closes: #627853) + * Add libxmlrpc-core-c3-dev as a preferred alternative to libxmlrpc-c3-dev + in Build-Depends. libxmlrpc-c3-dev has become a transitional package. + * Bump Standards-Version to 3.9.2: no changes needed. + * Switch Vcs-* debian/control fields to anonscm.debian.org. + * Fix find_library() to find libraries in multiarch library paths (patch + multiarch_library_directory_hack.diff). While the patch is not a good fix + (hackish by nature, no cross-compilation support etc.), it should do the + job in majority of cases. Also require dpkg-dev >= 1.16 at both build + time (Build-Depends) and runtime (cmake Depends) because the patch needs + dpkg-architecture -qDEB_HOST_MULTIARCH. (Closes: #618932) + * Make FindGTK2.cmake work with Debian multiarch + (patch multiarch_findgtk2_fix.diff). (LP: #751940) + + -- Modestas Vainius Wed, 08 Jun 2011 00:15:00 +0300 + +cmake (2.8.4+dfsg.1-2) unstable; urgency=low + + * Add backport_test_order_fix.diff to restore conpatibility with earlier + versions with respect to the test run order. (Closes: #615054) + + -- Modestas Vainius Fri, 25 Feb 2011 19:12:33 +0200 + +cmake (2.8.4+dfsg.1-1) unstable; urgency=low + + * 2.8.4-2 ended up in unstable by accident :-( Fix distribution field + accordingly. + * Remove files licensed under proprietary licence from the original tarball. + (Closes: #614390) Generate a new tarball with +dfsg.1 suffix. Thanks to + Vasily Gurevich for heads up. + + -- Modestas Vainius Wed, 23 Feb 2011 23:12:02 +0200 + +cmake (2.8.4-2) unstable; urgency=low + + [ Kai Wasserbäch ] + * debian/watch: Remove trailing backslash. + + [ Modestas Vainius ] + * Merge 2.8.3-5. + + -- Modestas Vainius Sun, 20 Feb 2011 14:53:41 +0200 + +cmake (2.8.4-1) experimental; urgency=low + + * New upstream release. + + [ Kai Wasserbäch ] + * Dropped obsolete patches (merged or taken from upstream): + - backport_fix_asm_support.diff + - FindTCL_fix_#600245.diff + - FindPython_fix_#569321_and_#580503.diff (Please note, that upstream's + solution is slightly different from what Debian had initially!) + * debian/patches/FindBoost_add_-lpthread_#563479.diff: Added. + (Closes: #563479) + * debian/README.Debian: Deleted, we're shipping an unmodified version of the + Python modules again. + * debian/README.source: Deleted, not needed with "3.0 (quilt)". + * debian/control: + - Changed my E-Mail address. + - Bumped B-D on debhelper. + * debian/compat: now "8". + * debian/rules: Updated for debhelper v8. + + [ Modestas Vainius ] + * Disable git-import-orig in debian/watch. One extra command is not a good + enough reason to lose control of packaging to non-trivial black-box tools. + * Use less error-prone way of setting build flags. + * Do not set MINGW_CC_LINUX2WIN_EXECUTABLE build flag. Workaround is no + longer needed with ccache 3.0 or later. + * Add verify-build-flags target to debian/rules. It can be used to verify if + build flags are still valid (i.e. present in any of CMakeLists.txt). + * Remove obsolete build flags from debian/rules: + - BUILD_WXDialog; + - TARGET_VERSION; + - TARGET_SOVERSION; + - BUILD_DOXYGEN. + * Support parallel building at bootstrap phase. + * Enable more verbosiness when bootstraping. + * Add more spelling fixes to fixup_manpages.diff patch. + + -- Modestas Vainius Sat, 19 Feb 2011 20:07:33 +0200 + +cmake (2.8.3-5) unstable; urgency=low + + * Check if /usr/share/doc/$pkgname is a directory before attempting to remove + it in {cmake,cmake-doc,cmake-dbg,cmake-*-gui}.postinst. (Closes: #614202) + + -- Modestas Vainius Sun, 20 Feb 2011 14:16:34 +0200 + +cmake (2.8.3-4) unstable; urgency=low + + * Release to unstable. + + -- Modestas Vainius Sat, 19 Feb 2011 14:43:46 +0200 + +cmake (2.8.3-3) experimental; urgency=low + + * Install documentation to /usr/share/cmake-data instead as it's the "base" + package rather than cmake. Also link doc directories to it. + * The job of replacing directories with symlinks apparently is a tough one. + Create a symlink manually in the postinst of the affected (!cmake-data) + packages. + + -- Modestas Vainius Sun, 02 Jan 2011 14:10:18 +0200 + +cmake (2.8.3-2) experimental; urgency=low + + [ Kai Wasserbäch ] + * debian/source/local-options: Added "unapply-patches". + * debian/watch: Added git-import-orig invocation. + * debian/gbp.conf: Added, to ensure we use pristine-tar. + * debian/patches/FindTCL_fix_#600245.diff: Added. (Closes: #600245) + + [ Modestas Vainius ] + * Install cmake documentation into /usr/share/doc/cmake/ and link doc + directories of the rest binary packages to it (needs debhelper 7.4.2). + (LP: #669197) + * Backport a patch from 2.8.4 to fix ASM support. Thanks to Leon Nardella for + heads up. (Closes: #608510, LP: #695335) + + -- Modestas Vainius Sun, 02 Jan 2011 12:45:38 +0200 + +cmake (2.8.3-1) experimental; urgency=low + + * New upstream release. + + [ Kai Wasserbäch ] + * debian/patches/fix_spelling_errors.patch: Added Applied-Upstream header. + * 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. + * Adapt FindPython_fix_#569321_and_#580503.diff patch to upstream changes. + * Bump libarchive-dev Build-Depends to 2.8.0. cmake needs symbols which + appeared in that version. (Closes: #595275) + * Add fixup_manpages.diff patch to fix small issues with cmake mangpages + (found by lintian). + + -- Modestas Vainius Sat, 13 Nov 2010 02:16:34 +0200 + +cmake (2.8.2+dfsg.1-0+squeeze1) stable-proposed-updates; urgency=low + + * Regenerate original tarball removing files provided under proprietary + licence. (Closes: #614390) They were not actually used. Mention removed + files in the debian/copyright. + + -- Modestas Vainius Fri, 04 Mar 2011 22:16:29 +0200 + +cmake (2.8.2-2) unstable; urgency=low + + [ Kai Wasserbäch ] + * debian/control: + - Added libarchive-dev to Build-Depends. + - Don't {,B-}D on procps on Hurd, already provided by hurd. + - Added Homepage field (fixes no-homepage-field). + - Added new binary package cmake-doc and moved all additional + documentation there (registered with doc-base now). + * debian/rules: Use system libarchive. + * debian/patches: + - add_libarchive_script.patch: Added to allow building with the system's + libarchive. + - fix_spelling_errors.patch: Added. Thanks to Lintian for finding them. + + [ Modestas Vainius ] + * Build with CTEST_USE_XMLRPC to re-enable XMLRPC support in CTest and add + fix-CTestTestFailedSubmit-xmlrpc.diff patch to fix a (wrongly) failing test + in that case. + * Add cmake-dbg package. + * Add cmake to cmake-doc Suggests. + * Start package synopsis with lowercase letter where applicable. + + -- Modestas Vainius Mon, 12 Jul 2010 02:14:05 +0300 + +cmake (2.8.2-1) unstable; urgency=low + + * New upstream release: + - Detects Clang compiler (Closes: #560693). + + [ Kai Wasserbäch ] + * debian/patches/debian/patches/FindPython_fix_#569321_and_#580503.diff: + Added. (Closes: #569321, #580503) + * debian/cmake-data.NEWS: Document the changes of the new patch, so nobody + gets surprised. + + [ Modestas Vainius ] + * Update patches: + - kFreeBSD_Hurd_fixes.diff - remove, merged upstream. + * Bump Standards-Version to 3.9.0: + - replace Conflicts: cmake (<= 2.6.2-1) with Breaks in cmake-data; + - add Breaks: cmake (<= 2.6.2-1) to cmake-gui-curses. + * Remove deprecated references to /usr/share/common-licenses/BSD from + debian/copyright. + * Add packaging copyright to debian/copyright. + * Include copyright information for Utilities/xml/* in the debian/copyright. + + -- Modestas Vainius Wed, 30 Jun 2010 11:20:53 +0300 + +cmake (2.8.1-5) unstable; urgency=low + + [ Kai Wasserbäch ] + * debian/control: added myself to Uploaders with Modestas' permission. + + [ Modestas Vainius ] + * Add procps to Build-Depends and cmake Depends. cmake sometimes uses ps + binary. + * Fix FindJNI patch (again): avoid using tricky bits of cmake IF() command + syntax. This should fix FindJNI on architectures which do not need special + CMAKE_SYSTEM_PROCESSOR handling (e.g. ia64). + + -- Modestas Vainius Sat, 29 May 2010 02:54:42 +0300 + +cmake (2.8.1-4) unstable; urgency=low + + * Further improve FinJNI.cmake. This should fix some inconsistencies on s390. + * Add cpack_installed_size.diff to fix generation of Installed-Size field for + deb packages. Thanks to Simone Rossetto for heads up and initial patch. + + -- Modestas Vainius Mon, 17 May 2010 01:24:41 +0300 + +cmake (2.8.1-3) unstable; urgency=medium + + * Add patches: + - FindJNI_fix_libarch_determination.dif - rewrite _java_libarch + determination code in FindJNI.cmake (based on OpenJDK 1.6.0_18 + icedtea + patches). This should fix invalid _java_libarch detection on mipsel and + armel (Closes: #544674). + - FindGTK2_pangommconfig.diff - look for Pangomm Config include directory + in FindGTK2.cmake (Closes: #579718). Thanks to Sune Vuorela for the + patch. + * Add gcc and make to cmake Suggests (Closes: #577516). + * Rename (to kFreeBSD_Hurd_fixes.diff) and improve kFreeBSD_fixes.diff to fix + FTBFS on GNU/Hurd as well. + * Urgency=medium to minimize negative impact on KDE transition. + + -- Modestas Vainius Wed, 05 May 2010 11:49:57 +0300 + +cmake (2.8.1-2) unstable; urgency=low + + * Add kFreeBSD_fixes.diff patch to fix FTBFS on kfreebsd-* (failure of the + CTestTestTimeout test). + + -- Modestas Vainius Thu, 18 Mar 2010 01:45:08 +0200 + +cmake (2.8.1-1) unstable; urgency=low + + * New upstream release. + * Remove DMUA entry from debian/control. No longer needed. + * Enable building in parallel (--parallel). + * Update debian/patches: + - drop bootstraptest_increase_timeout.diff - merged upstream; + - hurd_platform.diff - adapt to upstream changes. + * Forcefully set MINGW_CC_LINUX2WIN_EXECUTABLE to empty value. It breaks + otherwise valid Simple_Mingw_Linux2Win test when ccache is enabled. + * Update install files. + * Update Standards-Version to 3.8.4: no changes needed. + * Change my email address to modax@debian.org. + + -- Modestas Vainius Wed, 17 Mar 2010 17:51:38 +0200 + +cmake (2.8.0-5) unstable; urgency=low + + * Skip the unpredictably long and rather pointless BootstrapTest + (Closes: #558001). + + -- Modestas Vainius Thu, 26 Nov 2009 14:20:46 +0200 + +cmake (2.8.0-4) unstable; urgency=medium + + * Replace bootstraptest_increase_timeout.diff with upstream version. My + previous patch didn't work. + * Revert previous "Build with g++-4.4 on hppa" change. It was not needed, build + with default compiler on hppa. + * Remove obsolete hack for parisc64 from debian/rules. It didn't work after + switch to dh v7 anyway. + * It should build on hppa now (Closes: #556653). So urgency=medium. + + -- Modestas Vainius Wed, 25 Nov 2009 11:37:34 +0200 + +cmake (2.8.0-3) unstable; urgency=medium + + * Set HOME to current build directory when running test suite. This should + fix failures of kwsys.testRegistry and FindPackageTest tests on the + buildds. + * Increase timeout of BootstrapTest to 2 hours so it no longer times out + on s390 or armel (patch bootstraptest_increase_timeout.diff). + * Fix GNU.cmake file used on Hurd. Thanks to Pino Toscano for the patch. + * Build with g++-4.4 on hppa. May solve FTBFS (segfault likely due to + miscompilation) reported in #556653. + * Urgency medium due to likely RC bug fix (#556653). + + -- Modestas Vainius Sun, 22 Nov 2009 20:49:29 +0200 + +cmake (2.8.0-2) experimental; urgency=low + + * Reenable test suite. + + -- Modestas Vainius Sun, 22 Nov 2009 00:38:54 +0200 + +cmake (2.8.0-1) unstable; urgency=low + + * New upstream release. + * Disable test suite for now. + + -- Modestas Vainius Sat, 14 Nov 2009 01:59:25 +0200 + +cmake (2.8.0~rc6-1) experimental; urgency=low + + * New upstream development release. + * Switch debian/rules to use dh v7: + - bump debhelper build depends to 7.3; + - also drop unused Dart handling in the process; + - enable test suite. + * Add myself as Maintainer, A. Maitland Bottoms as Uploader (with + permission). + + -- Modestas Vainius Tue, 10 Nov 2009 23:46:25 +0200 + +cmake (2.8.0~rc5-1) experimental; urgency=low + + * New upstream development release. + - FindJNI.cmake does no longer get confused about multiple JVM installs + (Closes: #553151). + * Switch to dpkg-source format 3.0 (quilt): + - drop build dependency on quilt; + - drop quilt.make snippet include from debian/rules. + * Build with CMAKE_USE_RELATIVE_PATHS=ON. + * Drop tcp8.4 from build depends. Not needed. + + -- Modestas Vainius Fri, 06 Nov 2009 22:47:17 +0200 + +cmake (2.8.0~rc3-1) experimental; urgency=low + + * New upstream development release. + - ctest no longer segfaults on such a invalid input (Closes: #528530). + * Drop all patches: + - FindQt4.cmake2.6.diff - remove, no longer needed as original bug has been + fixed since 2.6; + - FindQt3.cmake.diff - remove, merged upstream; + - findmpeg2-addpath.diff - remove, bug fixed upstream (in other way); + - kfreebsd-Platform.diff - remove, merged upstream; + - executables-dont-need-fpic.diff - remove, merged upstream; + - manpage_friendly_docs.diff - remove, merged upstream; + - fix_bashisms.diff - remove, merged upstream; + - FindPerlLibs.cmake-perl-5.10.diff - remove, fixed upstream differently; + - FindJNI.cmake-more-arches.diff - remove, was taken from upstream; + - FindVTK.cmake-vtk-5.4.diff - remove, was taken from upstream. + * Update install files. + * Call dpkg with --print-architecture rather than obsolete + --print-installation-architecture. + * Fix lintian override cmake-data: extra-license-file. + * Remove obsolete README.Debian. + * cmake-curses-gui should not provide cmake-gui. + + -- Modestas Vainius Sun, 11 Oct 2009 15:09:42 +0300 + +cmake (2.6.4-3) unstable; urgency=low + + * Bump Standards-Version to 3.8.3, no changes needed. + * Add ${misc:Depends} to Depends fields of packages. + * Improve debian/watch: + - make it scan remote directories recursively; + - make it work with new upstream RC release mangling. + * Remove Pierre Habouzit from Uploaders by his own request. + * Backport FindJNI.cmake from CMake 2.8 CVS in order to make it arch + independent on Linux. New FindJNI.cmake also supports most Linux arches and + is capable of finding Sun Java, OpenJDK, Kaffe and GCJ (if latter is + default-java) JVMs. Support for Debian specific /usr/lib/jvm/default-java is + also included. Patch FindJNI.cmake-more-arches.diff (Closes: #544674). + * Backport Modules/FindVTK.cmake from CMake 2.8 CVS. It adds support for VTK + 5.4. Patch FindVTK.cmake-vtk-5.4.diff (Closes: #546030). + * Update debian/copyright with more details (Closes: #544290). + * Make cmake-curses-gui and cmake-qt-gui packages provide 'cmake-gui'. + + -- Modestas Vainius Wed, 30 Sep 2009 20:51:13 +0300 + +cmake (2.6.4-2) unstable; urgency=low + + * Prefer *-qt3 binary names to generic ones in FinqQt3.cmake + (Closes: #538864). + * Fix bashisms in CMake scripts (Closes: #530056). + * Merge in 2.6.0-6 debian/changelog. + * Use quilt.make rather than custom quilt patch implementation. + * Make debian/rules dpkg-buildpackage -jX safe and support parallel + in DEB_BUILD_OPTIONS (Closes: #538826). + * Add FindPerlLibs.cmake-perl-5.10.diff patch which adds perl 5.10 support in + FindPerlLibs.cmake (Closes: #541609). Thanks to Joshua Rubin. + + -- Modestas Vainius Fri, 21 Aug 2009 19:35:21 +0300 + +cmake (2.6.4-1) unstable; urgency=low + + * New upstream release. + * Resync patches: + - relative_path_fixes2.diff - removed, merged upstream; + - FindQt4_qt4_lupdate_lrelease.diff - removed, merged upstream. + * Bump Standards-Version to 3.8.1. No changes needed. + * Remove deprecated dh_desktop from debian/rules. + * Update manpage_friendly_docs.diff patch to fix more lintian warnings. + + -- Modestas Vainius Sat, 02 May 2009 01:28:29 +0300 + +cmake (2.6.3-2) unstable; urgency=low + + * Remove do-not-use-lib64.diff, no longer needed (according to upstream). + * Remove reinstate-arm.diff, merged upstream. + * Upload to unstable. + + -- Modestas Vainius Sat, 07 Mar 2009 15:13:56 +0200 + +cmake (2.6.3-1) experimental; urgency=low + + * New upstream release. + * Update debian/patches: + - remove find_package_support_prefix_lib_cmake.diff, merged upstream; + - adopt FindQt4.cmake2.6.diff; + - refresh do-not-use-lib64.diff; + - remove relative_path_fixes.diff, merged upstream; + - refresh relative_path_fixes2.diff; + - remove manpage-generation-fixes.diff, merged upstream; + - refresh FindQt4_qt4_lupdate_lrelease.diff; + - remove FindMPEG2_include_FindSDL_fix.diff, merged upstream; + * Use dh_prep instead of deprecated dh_clean -k (fixes lintian warning). + * Call dh_desktop in the binary targets (fixes lintian warning). + * Install cmake-gui docs to the cmake-qt-gui package. + * Enable binary-indep target. + * Add manpage_friendly_docs.diff patch to make some bits of documentation + manpage friendly (eliminate warnings). + * Fix installation of lintian overrides (move dh_lintian to binary targets). + + -- Modestas Vainius Tue, 24 Feb 2009 00:26:34 +0200 + +cmake (2.6.2-4) unstable; urgency=low + + * Release to unstable. No other changes. + + -- Modestas Vainius Sun, 15 Feb 2009 23:33:47 +0200 + +cmake (2.6.2-3) experimental; urgency=low + + * Fix typo in cmake-qt-gui description. + * Merge patch from upstream to support /lib/cmake search path in + find_package() config mode. This enables reduction of /usr/lib cluttering + (find_package_support_prefix_lib_cmake.diff). + * Tighten libqt4-dev build depend to version (>= 4.4.0) (Closes: #508349). + + -- Modestas Vainius Wed, 24 Dec 2008 00:45:20 +0200 + +cmake (2.6.2-2) experimental; urgency=low + + * Add Vcs fields. + * Add patches: + - FindQt4_qt4_lupdate_lrelease.diff - prefer lupdate-qt4 to lupdate and + lrelease-qt4 to lrelease. This is specific to Debian Qt4. + Thanks to Ludovico Cavedon (Closes: #487528). + - FindMPEG2_include_FindSDL_fix.diff - fix FindSQL include in the + MPEG2 module. Thanks to Leopold Palomo Avellaneda (Closes: #500770). + * Try sorting out emacsen mess once again (Closes: #481391): + - depend on emacsen-common; + - old-prerm will most likely fail spewing emacsen-common error message + when upgrading from previous version but this is OK. Add a custom + prerm script which recovers from the problem and notifies the user to + ignore the error message. + * Rewrite cmake cache initialization code. Pass initial cmake flags via + file (--init= argument to the bootstrap script). + * Make build verbose again. + * Prepare for multiple binary packages: switch to install files and to + debhelper v7 (due to more convenient install file handling), install + everything to debian/tmp initially. + * Add new binary packages: + - cmake-data - split off data files needed for each cmake flavour to run. + Move emacsen stuff in here too; + - cmake-curses-gui - splif off ccmake here from the cmake package; + - cmake-qt-gui - build & install Qt4 based GUI (cmake-gui). Add menu file + and manual page (Closes: #482787). Update debian/copyright. + * Dynamically link against system libraries available in Debian + (Closes: #502441). + * Remove left-over debian/doxygen.config. + * Rename debian/docs to debian/cmake-data.docs and clean it up. Do not + install ChangeLog.txt. It is size and usefulness ratio is too low to + justify inclusion in the binary package. + + -- Modestas Vainius Sat, 01 Nov 2008 14:07:08 +0200 + +cmake (2.6.2-1) experimental; urgency=low + + * New upstream release. + * New co-maintainer: + - add myself to Uploaders. + - add DM-Upload-Allowed: yes to debian/control. + * Refresh patches: + - FindQt4.cmake2.6.diff + - do-not-use-lib64.diff + * Add patches from upstream CVS: + - relative_path_fixes.diff - fixes a couple of major bugs in Makefile + generation when CMAKE_USE_RELATIVE_PATHS is ON. This brings + CMAKE_USE_RELATIVE_PATHS=ON to a very usable state. + - manpage-generation-fixes.diff - fixes a few manual page generation + issues. This resolves all lintian warnings and info tags related + to the cmake manual pages. + * Bump Standards-Version to 3.8.0: + - add README.source which directs the reader to quilt README.source. + * Use dh_lintian: + - rename cmake.lintian to cmake.lintian-overrides; + - bump debhelper compat level to 6; + - build depend on debhelper (>= 6.0.7~). + * Fix path in the lintian override so it is effective again. + * Make cmake.menu conform to the current Debian Menu System standard. + * Drop unused old manual pages from debian/. They are provided by upstream + now. + * Add debian/watch. + + -- Modestas Vainius Mon, 13 Oct 2008 19:24:49 +0300 + +cmake (2.6.0-6) unstable; urgency=medium + + * Dynamically link against system libraries available in Debian. + Thanks to Michal Čihař (Closes: #502441). + * Urgency medium due to security issue above. + * Add Vcs fields. + * Add myself to Uploaders. + + -- Modestas Vainius Thu, 16 Oct 2008 22:18:14 +0300 + +cmake (2.6.0-5) unstable; urgency=medium + + * Fix build-deps: libncursesw5-dev doesn't work, just use the non wide one. + This will build ccmake again (Closes: #481392). + + -- Pierre Habouzit Tue, 29 Jul 2008 11:05:17 +0200 + +cmake (2.6.0-4) unstable; urgency=low + + * Really remove dependency on emacsen-common (Closes: #471975). + + -- Pierre Habouzit Wed, 14 May 2008 21:01:42 +0200 + +cmake (2.6.0-3) unstable; urgency=low + + * Remove dependency on emacsen-common (Closes: #471975): + emacs guys, I was asked in a previous bug (#427763) to byte-compile the + cmake extension, the policy mandates a dependency upon emacs which is + silly, and depending upon emacsen-common breaks the whole thing. A + pre-depends would be insane, WHY ON EARTH is the emacs policy so horribly + broken ? Until someone answers that, cmake will stay in the previous state + with byte-compilation, and without any emacs dependency. + + * Add patches/reinstate-arm.diff to fix FTBFS on arm platforms + (Closes: #481016) + + -- Pierre Habouzit Tue, 13 May 2008 10:18:12 +0200 + +cmake (2.6.0-2) unstable; urgency=low + + * Upload to unstable this time. + * Depend upon emacsen-common (Closes: #471975). + + -- Pierre Habouzit Mon, 12 May 2008 18:13:33 +0200 + +cmake (2.6.0-1) experimental; urgency=low + + * Update patches/FindQt4.cmake2.6.diff (Closes: #479907). + * Add patches/executables-dont-need-fpic.diff (Closes: #478404). + * Bump Standards-Version to 3.7.3. + + -- Pierre Habouzit Mon, 12 May 2008 17:11:04 +0200 + +cmake (2.6.0~rc8-1.1) experimental; urgency=low + + * Non-maintainer upload with permission from DadCoder. + Happy Prague visit. + * Fix FindQt4.cmake (Closes: #477110) + + -- Sune Vuorela Sun, 20 Apr 2008 22:58:33 +0200 + +cmake (2.6.0~rc8-1) experimental; urgency=low + + * New upstream rc release. + * Update patches: + + drop findmpeg2-robustness.diff. + + drop hurd-SA_SIGINFO.diff. + + drop nsis-support.diff. + + -- Pierre Habouzit Fri, 18 Apr 2008 20:49:30 +0200 + +cmake (2.4.8-1) unstable; urgency=low + + [ Pierre Habouzit ] + * New upstream release (Closes: 462335). + * remove patches/hurd-Platform.diff, merged upstream. + + [ Rafael Laboissiere ] + * debian/rules, debian/cmake.emacsen-{startup,install,remove}: Allow + byte-compilation of cmake-mode.el at install time and put in the + emacsen startup directory just the necessary initialization code + of cmake-mode (Closes: 427763) + + -- Pierre Habouzit Fri, 25 Jan 2008 10:19:47 +0100 + +cmake (2.4.7-1) unstable; urgency=low + + * New upstream release. + * Drop patches/findqt4-binaries-order.diff (Closes: #433105). + + -- Pierre Habouzit Thu, 19 Jul 2007 18:58:37 +0200 + +cmake (2.4.6-1) unstable; urgency=low + + * Upload to unstable. + * Make FindMPEG2.cmake more robust (Closes: 419134). + + -- Pierre Habouzit Mon, 18 Jun 2007 10:24:58 +0100 + +cmake (2.4.6-0) experimental; urgency=low + + * New upstream release (experimental upload, 2.4.5 must propagate): + + Ruby NAMES now includes ruby1.8 (Closes: 407481). + + * Add patch to support NSIS on linux properly, + thanks to Michal Čihař (Closes: 408846). + + -- Pierre Habouzit Wed, 13 Jun 2007 12:39:42 +0200 + +cmake (2.4.5-2) unstable; urgency=low + + * Add myself to Uploaders. + * Ack my NMU (Closes: 419007, 407155, 407304). + * Move to quilt, split diff.gz into patches, to avoid losing them. + + * debian/rules: + + add quilt snipplets. + + remove commented dh_ calls. + + remove old cruft, make it shorter. + + Avoid subshells, use makeism's rather than shell if/then/else. + + * Lintian warnings: + + use debian/compat rather than DH_COMPAT. + + add an override for the extra-license-file that in fact is a template. + + -- Pierre Habouzit Thu, 07 Jun 2007 11:09:46 +0200 + +cmake (2.4.5-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Disable lib64 paths in FindLibrary, as it's not needed in debian and + yields incorrect results (Closes: #419007). + * Apply Hurd Porter patch to deal with undefined SA_SIGINFO + (Closes: #407304). + * Reintroduce lost GNU.cmake (Closes: #407155). + + -- Pierre Habouzit Tue, 05 Jun 2007 13:28:35 +0200 + +cmake (2.4.5-1) unstable; urgency=low + + * New upstream bugfix release (Closes: #401071) + Fix for seg fault when a macro runs a bad command BUG# 3815 + Fix fix for foo.dll.lib that does not break -L/usr/lib in link names + Fix problem with LIBRARY_OUTPUT_PATH and linking to a dll foo.dll.lib instead of foo.lib + Do not depend on optimized libraries for a debug build and visa versa. + Fix target name matching custom command output conflict. + Fix FindQt3 so that it does not find qt4 + Fix FindKDE4 so that it only looks for kde4-config + + -- A. Maitland Bottoms Mon, 4 Dec 2006 16:29:44 -0500 + +cmake (2.4.4-1) unstable; urgency=low + + * New upstream release + * Upstream fixes parsing bug (Closes: #392624) + + -- A. Maitland Bottoms Sat, 25 Nov 2006 19:49:38 -0500 + +cmake (2.4.3-3) unstable; urgency=low + + * Have FindMPEG2 look in paths used in Debian (Closes: #391831) + * Make FindQt4 more reliable (Closes: #392473) + + -- A. Maitland Bottoms Fri, 10 Nov 2006 11:27:35 -0500 + +cmake (2.4.3-2) unstable; urgency=low + + * Remove recommends line (Closes: #392013, #392044) + + -- A. Maitland Bottoms Tue, 10 Oct 2006 21:33:40 -0400 + +cmake (2.4.3-1) unstable; urgency=low + + * New upstream release + * recognize .F90 as a fortran source extension (Closes: #376587) + * don't install cmake .vim files (Closes: #366663) + * don't depend upon emacs, let dh_installemacsen handle it (Closes: #378998) + + -- A. Maitland Bottoms Sat, 5 Aug 2006 17:06:11 -0400 + +cmake (2.4.2-1) unstable; urgency=low + + * New upstream release (Closes: #338324) + * Put cmake .vim files into /usr/share/vim/addons/plugin/ + where they can be used. (Closes: #366663) + * Install cmake-mode.el so it can be used. (Closes: #366664) + * Ensure cmake FindKDE locates KDE libraries on Debian + based distributions. + + -- A. Maitland Bottoms Sun, 18 Jun 2006 16:34:11 -0400 + +cmake (2.2.3-1) unstable; urgency=low + + * New upstream release (Closes: #338324) + * support GNU/kFreeBSD in cmake (Closes: #340764) + + -- A. Maitland Bottoms Sun, 8 Jan 2006 10:48:14 -0500 + +cmake (2.0.6-2) unstable; urgency=low + + * Apply upstream patch to fix UseSWIG.cmake (Closes: #330581) + + -- A. Maitland Bottoms Wed, 28 Sep 2005 15:29:19 -0400 + +cmake (2.0.6-1) unstable; urgency=low + + * New upstream release + * g++ 4.0 Transition + + -- A. Maitland Bottoms Sun, 11 Sep 2005 14:51:36 -0400 + +cmake (2.0.5-1) unstable; urgency=low + + * New upstream release + + -- A. Maitland Bottoms Wed, 2 Mar 2005 09:22:44 -0500 + +cmake (2.0.3-1) unstable; urgency=low + + * New upstream release + * finds QT's moc, gets bug closing syntax right (Closes: #250000) + + -- A. Maitland Bottoms Thu, 12 Aug 2004 09:21:32 -0400 + +cmake (2.0.2-1) unstable; urgency=low + + * New upstream release + + -- A. Maitland Bottoms Wed, 23 Jun 2004 13:51:38 -0400 + +cmake (2.0.1-1) unstable; urgency=low + + * New upstream release with soname and soversion support + * find QT's moc (Closes: 250000) + + -- A. Maitland Bottoms Mon, 7 Jun 2004 22:08:50 -0400 + +cmake (1.8.2.1-1) unstable; urgency=low + + * From CVS to pick up soname and soversion support + + -- A. Maitland Bottoms Wed, 26 Nov 2003 21:46:54 -0500 + +cmake (1.8.1-1) unstable; urgency=low + + * New upstream release + * Add Gavin Baker's Take II on adding versioning support for shared libraries + + -- A. Maitland Bottoms Sun, 9 Nov 2003 09:43:02 -0500 + +cmake (1.6.7-2) unstable; urgency=low + + * Add Gavin Baker's Take II on adding versioning support for shared libraries + + -- A. Maitland Bottoms Mon, 23 Jun 2003 13:39:03 -0400 + +cmake (1.6.7-1) unstable; urgency=low + + * New upstream release + + -- A. Maitland Bottoms Mon, 23 Jun 2003 13:06:46 -0400 + +cmake (1.6.5-1) unstable; urgency=low + + * New upstream release + + -- A. Maitland Bottoms Mon, 24 Feb 2003 11:25:58 -0500 + +cmake (1.6.4-1) unstable; urgency=low + + * New upstream release, move up to tcl8.4 + + -- A. Maitland Bottoms Fri, 14 Feb 2003 16:06:12 -0500 + +cmake (1.4.7-1) unstable; urgency=low + + * New upstream release + * Build without dart-client network submission (Closes: #175579) + + -- A. Maitland Bottoms Mon, 06 Jan 2003 19:02:36 -0500 + +cmake (1.4.6-1) unstable; urgency=low + + * New upstream release + + -- A. Maitland Bottoms Thu, 24 Oct 2002 21:19:47 -0400 + +cmake (1.4.5-2) unstable; urgency=low + + * Don't put man page in /usr/man (Closes: #163901) + + -- A. Maitland Bottoms Thu, 17 Oct 2002 17:43:22 -0400 + +cmake (1.4.5-1) unstable; urgency=low + + * New upstream version. + + -- A. Maitland Bottoms Fri, 20 Sep 2002 23:33:49 -0400 + +cmake (1.4.3-3) unstable; urgency=low + + * Build with Dart, build in separate Build directory to make cleanup easier + * New upstream man page + * CMakeSetup no longer exists upstream, Debian menu now refers to ccmake + + -- A. Maitland Bottoms Tue, 6 Aug 2002 19:05:05 -0400 + +cmake (1.4.3-2) unstable; urgency=low + + * Oh no, not again. + * Use -ffunction-sections on parisc64 (closes: #155366) + + -- A. Maitland Bottoms Sat, 3 Aug 2002 21:45:37 -0400 + +cmake (1.4.3-1) unstable; urgency=low + + * New upstream. (Closes: #155296) + + -- A. Maitland Bottoms Sat, 3 Aug 2002 00:02:18 -0400 + +cmake (1.2-2) unstable; urgency=low + + * Use -ffunction-sections on parisc64 (closes: #133696) + + -- Maitland Bottoms Thu, 14 Feb 2002 18:36:25 +0000 + +cmake (1.2-1) unstable; urgency=low + + * New upstream. + + -- A. Maitland Bottoms Thu, 9 Jan 2002 17:20:12 -0500 + +cmake (1.0-1) unstable; urgency=low + + * Newer upstream. (Need to keep up with VTK 4 build needs) + * Patched support for DESTDIR in install targets + * Patched option to disable use of -rpath using CMAKE_SKIP_RPATH + * include cmake-mode.el + + -- A. Maitland Bottoms Thu, 9 Jan 2002 17:20:12 -0500 + +cmake (0.98-1) unstable; urgency=low + + * Newer upstream, includes curses interface: ccmake + * Patched to support make install DESTDIR=foo + + -- A. Maitland Bottoms Mon, 17 Dec 2001 19:54:32 -0500 + +cmake (0.96-1) unstable; urgency=low + + * Initial Release. + (Closes: #121610) + + -- A. Maitland Bottoms Wed, 28 Nov 2001 08:45:22 -0500 + + +cmake (2.0.5-1) unstable; urgency=low + + * New upstream release + + -- A. Maitland Bottoms Wed, 2 Mar 2005 09:22:44 -0500 + +cmake (2.0.3-1) unstable; urgency=low + + * New upstream release + * finds QT's moc, gets bug closing syntax right (Closes: #250000) + + -- A. Maitland Bottoms Thu, 12 Aug 2004 09:21:32 -0400 + +cmake (2.0.2-1) unstable; urgency=low + + * New upstream release + + -- A. Maitland Bottoms Wed, 23 Jun 2004 13:51:38 -0400 + +cmake (2.0.1-1) unstable; urgency=low + + * New upstream release with soname and soversion support + * find QT's moc (Closes: 250000) + + -- A. Maitland Bottoms Mon, 7 Jun 2004 22:08:50 -0400 + +cmake (1.8.2.1-1) unstable; urgency=low + + * From CVS to pick up soname and soversion support + + -- A. Maitland Bottoms Wed, 26 Nov 2003 21:46:54 -0500 + +cmake (1.8.1-1) unstable; urgency=low + + * New upstream release + * Add Gavin Baker's Take II on adding versioning support for shared libraries + + -- A. Maitland Bottoms Sun, 9 Nov 2003 09:43:02 -0500 + +cmake (1.6.7-2) unstable; urgency=low + + * Add Gavin Baker's Take II on adding versioning support for shared libraries + + -- A. Maitland Bottoms Mon, 23 Jun 2003 13:39:03 -0400 + +cmake (1.6.7-1) unstable; urgency=low + + * New upstream release + + -- A. Maitland Bottoms Mon, 23 Jun 2003 13:06:46 -0400 + +cmake (1.6.5-1) unstable; urgency=low + + * New upstream release + + -- A. Maitland Bottoms Mon, 24 Feb 2003 11:25:58 -0500 + +cmake (1.6.4-1) unstable; urgency=low + + * New upstream release, move up to tcl8.4 + + -- A. Maitland Bottoms Fri, 14 Feb 2003 16:06:12 -0500 + +cmake (1.4.7-1) unstable; urgency=low + + * New upstream release + * Build without dart-client network submission (Closes: #175579) + + -- A. Maitland Bottoms Mon, 06 Jan 2003 19:02:36 -0500 + +cmake (1.4.6-1) unstable; urgency=low + + * New upstream release + + -- A. Maitland Bottoms Thu, 24 Oct 2002 21:19:47 -0400 + +cmake (1.4.5-2) unstable; urgency=low + + * Don't put man page in /usr/man (Closes: #163901) + + -- A. Maitland Bottoms Thu, 17 Oct 2002 17:43:22 -0400 + +cmake (1.4.5-1) unstable; urgency=low + + * New upstream version. + + -- A. Maitland Bottoms Fri, 20 Sep 2002 23:33:49 -0400 + +cmake (1.4.3-3) unstable; urgency=low + + * Build with Dart, build in separate Build directory to make cleanup easier + * New upstream man page + * CMakeSetup no longer exists upstream, Debian menu now refers to ccmake + + -- A. Maitland Bottoms Tue, 6 Aug 2002 19:05:05 -0400 + +cmake (1.4.3-2) unstable; urgency=low + + * Oh no, not again. + * Use -ffunction-sections on parisc64 (closes: #155366) + + -- A. Maitland Bottoms Sat, 3 Aug 2002 21:45:37 -0400 + +cmake (1.4.3-1) unstable; urgency=low + + * New upstream. (Closes: #155296) + + -- A. Maitland Bottoms Sat, 3 Aug 2002 00:02:18 -0400 + +cmake (1.2-2) unstable; urgency=low + + * Use -ffunction-sections on parisc64 (closes: #133696) + + -- Maitland Bottoms Thu, 14 Feb 2002 18:36:25 +0000 + +cmake (1.2-1) unstable; urgency=low + + * New upstream. + + -- A. Maitland Bottoms Thu, 9 Jan 2002 17:20:12 -0500 + +cmake (1.0-1) unstable; urgency=low + + * Newer upstream. (Need to keep up with VTK 4 build needs) + * Patched support for DESTDIR in install targets + * Patched option to disable use of -rpath using CMAKE_SKIP_RPATH + * include cmake-mode.el + + -- A. Maitland Bottoms Thu, 9 Jan 2002 17:20:12 -0500 + +cmake (0.98-1) unstable; urgency=low + + * Newer upstream, includes curses interface: ccmake + * Patched to support make install DESTDIR=foo + + -- A. Maitland Bottoms Mon, 17 Dec 2001 19:54:32 -0500 + +cmake (0.96-1) unstable; urgency=low + + * Initial Release. + (Closes: #121610) + + -- A. Maitland Bottoms Wed, 28 Nov 2001 08:45:22 -0500 + + diff --git a/cmake-curses-gui.install b/cmake-curses-gui.install new file mode 100644 index 00000000..92f628d7 --- /dev/null +++ b/cmake-curses-gui.install @@ -0,0 +1,2 @@ +usr/bin/ccmake +usr/share/man/man1/ccmake.1 diff --git a/cmake-curses-gui.maintscript b/cmake-curses-gui.maintscript new file mode 100644 index 00000000..068e1b22 --- /dev/null +++ b/cmake-curses-gui.maintscript @@ -0,0 +1 @@ +symlink_to_dir /usr/share/doc/cmake-curses-gui /usr/share/doc/cmake-data 2.8.12.2-2~ diff --git a/cmake-data.docs b/cmake-data.docs new file mode 100644 index 00000000..1dfb58f9 --- /dev/null +++ b/cmake-data.docs @@ -0,0 +1 @@ +CMakeLogo.gif diff --git a/cmake-data.emacsen-compat b/cmake-data.emacsen-compat new file mode 100644 index 00000000..573541ac --- /dev/null +++ b/cmake-data.emacsen-compat @@ -0,0 +1 @@ +0 diff --git a/cmake-data.emacsen-install b/cmake-data.emacsen-install new file mode 100644 index 00000000..e7f0356e --- /dev/null +++ b/cmake-data.emacsen-install @@ -0,0 +1,28 @@ +#!/bin/sh +# +# emacsen install script for the Debian GNU/Linux cmake package + +FLAVOR=$1 +PACKAGE=cmake-data + +ELDIR=/usr/share/emacs/site-lisp/ +ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE} +ELFILE="cmake-mode.el" +FLAGS="-batch -no-site-file -l path.el -f batch-byte-compile" + +if [ ${FLAVOR} != emacs ]; then + echo install/${PACKAGE}: Byte-compiling for ${FLAVOR} + + install -m 755 -d ${ELCDIR} + + # Source file symlink (emacsen policy 5C) + ln -s "${ELDIR}/${ELFILE}" "${ELCDIR}/${ELFILE}" + + # Compile cmake-mode.el + cd ${ELCDIR} + cat << EOF > path.el +(setq load-path (cons "." load-path) byte-compile-warnings nil) +EOF + ${FLAVOR} ${FLAGS} ${ELFILE} + rm -f path.el +fi diff --git a/cmake-data.emacsen-remove b/cmake-data.emacsen-remove new file mode 100644 index 00000000..52191ea7 --- /dev/null +++ b/cmake-data.emacsen-remove @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +FLAVOR=$1 +PACKAGE=cmake-data +ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE} + +if [ ${FLAVOR} != emacs ]; then + echo remove/${PACKAGE}: Purging byte-compiled files for ${FLAVOR} + rm -rf "${ELCDIR}" +fi diff --git a/cmake-data.emacsen-startup b/cmake-data.emacsen-startup new file mode 100644 index 00000000..96fa7bab --- /dev/null +++ b/cmake-data.emacsen-startup @@ -0,0 +1,15 @@ +;; -*-emacs-lisp-*- +;; +;; Emacs startup file for the Debian GNU/Linux cmake package + +(if (file-exists-p "/usr/share/emacs/site-lisp/cmake-mode.el") + (progn + (debian-pkg-add-load-path-item (concat "/usr/share/" + (symbol-name debian-emacs-flavor) + "/site-lisp/cmake-data")) + (autoload 'cmake-mode "cmake-mode") + (setq auto-mode-alist + (append '(("CMakeLists\\.txt\\'" . cmake-mode) + ("\\.cmake\\'" . cmake-mode)) + auto-mode-alist))) + (message "cmake-data removed but not purged, skipping setup")) diff --git a/cmake-data.install b/cmake-data.install new file mode 100644 index 00000000..d97adb7f --- /dev/null +++ b/cmake-data.install @@ -0,0 +1,18 @@ +usr/share/aclocal/cmake.m4 +usr/share/cmake-*/ +usr/share/cmake-*/editors/emacs/cmake-mode.el usr/share/emacs/site-lisp +usr/share/man/man7/cmake-buildsystem.7 +usr/share/man/man7/cmake-commands.7 +usr/share/man/man7/cmake-compile-features.7 +usr/share/man/man7/cmake-developer.7 +usr/share/man/man7/cmake-generator-expressions.7 +usr/share/man/man7/cmake-generators.7 +usr/share/man/man7/cmake-language.7 +usr/share/man/man7/cmake-modules.7 +usr/share/man/man7/cmake-packages.7 +usr/share/man/man7/cmake-policies.7 +usr/share/man/man7/cmake-properties.7 +usr/share/man/man7/cmake-qt.7 +usr/share/man/man7/cmake-server.7 +usr/share/man/man7/cmake-toolchains.7 +usr/share/man/man7/cmake-variables.7 diff --git a/cmake-dbg.maintscript b/cmake-dbg.maintscript new file mode 100644 index 00000000..ab59ae62 --- /dev/null +++ b/cmake-dbg.maintscript @@ -0,0 +1 @@ +symlink_to_dir /usr/share/doc/cmake-dbg /usr/share/doc/cmake-data 2.8.12.2-2~ diff --git a/cmake-doc.doc-base b/cmake-doc.doc-base new file mode 100644 index 00000000..862c4bad --- /dev/null +++ b/cmake-doc.doc-base @@ -0,0 +1,7 @@ +Document: cmake +Title: Reference of CMake the Cross-Platform Makefile Generator. +Section: Programming + +Format: HTML +Index: /usr/share/doc/cmake-data/html/index.html +Files: /usr/share/doc/cmake-data/html/* diff --git a/cmake-doc.install b/cmake-doc.install new file mode 100644 index 00000000..8b7cbc50 --- /dev/null +++ b/cmake-doc.install @@ -0,0 +1 @@ +usr/share/doc/cmake/html usr/share/doc/cmake-data/ diff --git a/cmake-qt-gui.install b/cmake-qt-gui.install new file mode 100644 index 00000000..f78d514c --- /dev/null +++ b/cmake-qt-gui.install @@ -0,0 +1,5 @@ +usr/bin/cmake-gui +usr/share/applications/CMake.desktop +usr/share/man/man1/cmake-gui.1 +usr/share/mime/packages/cmakecache.xml +usr/share/icons/hicolor/*/apps/CMakeSetup.png diff --git a/cmake-qt-gui.maintscript b/cmake-qt-gui.maintscript new file mode 100644 index 00000000..e89fa9d8 --- /dev/null +++ b/cmake-qt-gui.maintscript @@ -0,0 +1 @@ +symlink_to_dir /usr/share/doc/cmake-qt-gui /usr/share/doc/cmake-data 2.8.12.2-2~ diff --git a/cmake.install b/cmake.install new file mode 100644 index 00000000..2b872c6e --- /dev/null +++ b/cmake.install @@ -0,0 +1,9 @@ +usr/bin/cmake +usr/bin/cpack +usr/bin/ctest +usr/share/man/man1/cmake.1 +usr/share/man/man1/cpack.1 +usr/share/man/man1/ctest.1 +usr/share/cmake-*/completions/cmake usr/share/bash-completion/completions/ +usr/share/cmake-*/completions/cpack usr/share/bash-completion/completions/ +usr/share/cmake-*/completions/ctest usr/share/bash-completion/completions/ diff --git a/cmake.maintscript b/cmake.maintscript new file mode 100644 index 00000000..7a88708f --- /dev/null +++ b/cmake.maintscript @@ -0,0 +1,4 @@ +symlink_to_dir /usr/share/doc/cmake /usr/share/doc/cmake-data 2.8.12.2-2~ +rm_conffile /etc/bash_completion.d/cmake 3.2.2-3~ +rm_conffile /etc/bash_completion.d/cpack 3.2.2-3~ +rm_conffile /etc/bash_completion.d/ctest 3.2.2-3~ diff --git a/compat b/compat new file mode 100644 index 00000000..ec635144 --- /dev/null +++ b/compat @@ -0,0 +1 @@ +9 diff --git a/control b/control new file mode 100644 index 00000000..8cb84786 --- /dev/null +++ b/control @@ -0,0 +1,113 @@ +Source: cmake +Section: devel +Priority: optional +Maintainer: Debian CMake Team +Uploaders: Lisandro Damián Nicanor Pérez Meyer , + Felix Geyer +Build-Depends: debhelper (>= 9.20160114~), + dpkg-dev (>= 1.17.14~), + libarchive-dev (>= 2.8.0), + libbz2-dev, + libcurl4-openssl-dev | libcurl-ssl-dev, + libexpat1-dev, + libjsoncpp-dev, + liblzma-dev, + libncurses5-dev, + libuv1-dev, + procps [!hurd-any], + python-sphinx, + qtbase5-dev , + zlib1g-dev +Standards-Version: 3.9.6 +Vcs-Git: https://anonscm.debian.org/git/pkg-cmake/cmake.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-cmake/cmake.git/ +Homepage: https://cmake.org/ + +Package: cmake +Architecture: any +Multi-Arch: foreign +Pre-Depends: dpkg (>= 1.17.5~) +Depends: cmake-data (= ${source:Version}), + procps [!hurd-any], + ${misc:Depends}, + ${shlibs:Depends} +Recommends: gcc, make +Suggests: codeblocks, eclipse, ninja-build +Description: cross-platform, open-source make system + CMake is used to control the software compilation process using + simple platform and compiler independent configuration files. CMake + generates native makefiles and workspaces that can be used in the + compiler environment of your choice. CMake is quite sophisticated: it + is possible to support complex environments requiring system + configuration, pre-processor generation, code generation, and template + instantiation. + . + CMake was developed by Kitware as part of the NLM Insight + Segmentation and Registration Toolkit project. The ASCI VIEWS project + also provided support in the context of their parallel computation + environment. Other sponsors include the Insight, VTK, and VXL open + source software communities. + +Package: cmake-data +Architecture: all +Depends: ${misc:Depends} +Conflicts: emacsen-common (<< 2.0.0) +Description: CMake data files (modules, templates and documentation) + This package provides CMake architecture independent data files (modules, + templates, documentation etc.). Unless you have cmake installed, you probably + do not need this package. + +Package: cmake-curses-gui +Architecture: any +Pre-Depends: dpkg (>= 1.17.5~) +Depends: cmake (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} +Description: curses based user interface for CMake (ccmake) + CMake is used to control the software compilation process using simple + platform and compiler independent configuration files. CMake generates native + makefiles and workspaces that can be used in the compiler environment of your + choice. + . + This package provides the CMake curses interface. Project configuration + settings may be specified interactively through this GUI. Brief instructions + are provided at the bottom of the terminal when the program is running. The + main executable file for this GUI is "ccmake". + +Package: cmake-qt-gui +Architecture: any +Build-Profiles: +Pre-Depends: dpkg (>= 1.17.5~) +Depends: cmake (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} +Provides: cmake-gui +Description: Qt based user interface for CMake (cmake-gui) + CMake is used to control the software compilation process using simple + platform and compiler independent configuration files. CMake generates native + makefiles and workspaces that can be used in the compiler environment of your + choice. + . + This package provides the CMake Qt based GUI. Project configuration + settings may be specified interactively. Brief instructions are provided at + the bottom of the window when the program is running. The main executable + file for this GUI is "cmake-gui". + +Package: cmake-doc +Architecture: all +Section: doc +Depends: ${misc:Depends}, ${sphinxdoc:Depends}, cmake-data (= ${source:Version}) +Recommends: doc-base +Breaks: cmake (<= 2.8.2-1), + cmake-curses-gui (<= 2.8.2-1), + cmake-data (<= 2.8.2-1), + cmake-qt-gui (<= 2.8.2-1) +Replaces: cmake (<= 2.8.2-1), + cmake-curses-gui (<= 2.8.2-1), + cmake-data (<= 2.8.2-1), + cmake-qt-gui (<= 2.8.2-1) +Suggests: cmake +Description: extended documentation in various formats for CMake + CMake is used to control the software compilation process using simple + platform and compiler independent configuration files. CMake generates native + makefiles and workspaces that can be used in the compiler environment of your + choice. + . + This package provides additional documentation in various formats like HTML or + plain text. diff --git a/copyright b/copyright new file mode 100644 index 00000000..59381ebb --- /dev/null +++ b/copyright @@ -0,0 +1,452 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: cmake +Source: http://www.cmake.org/files/v*/ + +Files: * +Copyright: 2000-2011 Kitware, Inc., Insight Software Consortium +License: BSD-3-clause +Comments: CMake was initially developed by Kitware with the following + sponsorship: + * National Library of Medicine at the National Institutes of Health + as part of the Insight Segmentation and Registration Toolkit (ITK). + . + * US National Labs (Los Alamos, Livermore, Sandia) ASC Parallel + Visualization Initiative. + . + * National Alliance for Medical Image Computing (NAMIC) is funded by the + National Institutes of Health through the NIH Roadmap for Medical Research, + Grant U54 EB005149. + . + * Kitware, Inc. + +Files: debian/* +Copyright: 2001-2006 A. Maitland Bottoms + 2007-2008 Pierre Habouzit + 2008-2010 Modestas Vainius + 2010 Kai Wasserbäch + 2014 Felix Geyer +License: BSD-3-clause + +Files: Source/cmFortranParserTokens.h +Copyright: 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc. +License: GPL-3+with_exception + +Files: Source/cmFortranParser.cxx +Copyright: 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc. + 2000-2015 Kitware, Inc., Insight Software Consortium + 2000-2006 Erik Edelmann +License: GPL-3+with_exception + +Files: Source/cmDependsJavaParser.cxx + Source/cmCommandArgumentParserTokens.h + Source/cmExprParserTokens.h + Source/cmExprParser.cxx + Source/cmCommandArgumentParser.cxx + Source/cmDependsJavaParserTokens.h +Copyright: 2000-2009 Kitware, Inc., Insight Software Consortium + 1984, 1989, 1990, 2000-2006 Free Software Foundation, Inc. +License: GPL-2+with_exception + +Files: Source/cmcldeps.cxx +Copyright: 2011 Google Inc. +License: Apache-2.0 + +Files: Utilities/cmlibarchive/libarchive/* +Copyright: 2007-2010 Joerg Sonnenberger + 2003-2011 Tim Kientzle + 2003-2008 Miklos Vajna + 2009-2012 Michihiro NAKAJIMA + 2011-2012 libarchive Project + 2011 Andres Mejia + 2001 The NetBSD Foundation, Inc. + 2007 Kai Wang + 2008 Anselm Strauss + 2010 Nokia Corporation and/or its subsidiary(-ies). + 2006 Rudolf Marek SYSGO s.r.o. + 2002 Thomas Moestl + 2009 Andreas Henriksson + 1994 The Regents of the University of California + 1996-2008 PostgreSQL Global Development Group + 2003-2007 Kees Zeelenberg + 2012 Ondrej Holy +License: BSD-2-clause + +Files: Utilities/cmlibarchive/libarchive/archive_read_support_filter_compress.c + Utilities/cmlibarchive/libarchive/archive_write_add_filter_compress.c +Copyright: 2003-2007 Tim Kientzle + 1985-1986 1992-1993 The Regents of the University of California + 2008 Joerg Sonnenberger +License: BSD-3-clause + +Files: Utilities/cmcurl/* +Copyright: 1998-2007 Daniel Stenberg + 1996 Internet Software Consortium +License: ISC + +Files: Utilities/cmcompress/* +Copyright: 1985-1986 The Regents of the University of California +License: BSD-4-clause + +Files: Source/CursesDialog/* +Copyright: 1998 Free Software Foundation, Inc. + 2000-2009 Kitware + 2000-2009 Insight Software Consortium +License: MIT-like + +Files: Utilities/cmzlib/* +Copyright: 1995-2005 Jean-loup Gailly + 1995-2005 Mark Adler +License: zlib + +License: BSD-3-clause + Copyright (c) 2002 Kitware, Inc., Insight Consortium + All rights reserved. + . + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + . + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + . + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + . + * The names of Kitware, Inc., the Insight Consortium, or the names of + any consortium members, or of any contributors, may not be used to + endorse or promote products derived from this software without + specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS'' + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR + ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +License: MIT-like + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without + restriction, including without limitation the rights to use, + copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following + conditions: + . + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. + +License: BSD-4-clause + Copyright (c) 1988, 1993 + The Regents of the University of California. All rights reserved. + . + This code is derived from software contributed to Berkeley by + Guido van Rossum. + . + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: + This product includes software developed by the University of + California, Berkeley and its contributors. + 4. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + +License: GPL-2+with_exception + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. + . + As a special exception, you may create a larger work that contains + part or all of the Bison parser skeleton and distribute that work + under terms of your choice, so long as that work isn't itself a + parser generator using the skeleton or a modified version thereof + as a parser skeleton. Alternatively, if you modify or redistribute + the parser skeleton itself, you may (at your option) remove this + special exception, which will cause the skeleton and the resulting + Bison output files to be licensed under the GNU General Public + License without this special exception. + . + On Debian systems, the complete text of the GNU General Public License + version 2 can be found in /usr/share/common-licenses/GPL-2 + +License: GPL-3+with_exception + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + On Debian systems, the complete text of the GNU General Public License + version 2 can be found in /usr/share/common-licenses/GPL-3 + . + As a special exception, you may create a larger work that contains + part or all of the Bison parser skeleton and distribute that work + under terms of your choice, so long as that work isn't itself a + parser generator using the skeleton or a modified version thereof + as a parser skeleton. Alternatively, if you modify or redistribute + the parser skeleton itself, you may (at your option) remove this + special exception, which will cause the skeleton and the resulting + Bison output files to be licensed under the GNU General Public + License without this special exception. + +License: Apache-2.0 + Version 2.0, January 2004 + . + http://www.apache.org/licenses/ + . + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + . + 1. Definitions. + . + "License" shall mean the terms and conditions for use, reproduction, and + distribution as defined by Sections 1 through 9 of this document. + . + "Licensor" shall mean the copyright owner or entity authorized by the + copyright owner that is granting the License. + . + "Legal Entity" shall mean the union of the acting entity and all other + entities that control, are controlled by, or are under common control with + that entity. For the purposes of this definition, "control" means (i) the + power, direct or indirect, to cause the direction or management of such + entity, whether by contract or otherwise, or (ii) ownership of fifty percent + (50%) or more of the outstanding shares, or (iii) beneficial ownership of such + entity. + . + "You" (or "Your") shall mean an individual or Legal Entity exercising + permissions granted by this License. + . + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation source, and + configuration files. + . + "Object" form shall mean any form resulting from mechanical transformation or + translation of a Source form, including but not limited to compiled object + code, generated documentation, and conversions to other media types. + . + "Work" shall mean the work of authorship, whether in Source or Object form, + made available under the License, as indicated by a copyright notice that is + included in or attached to the work (an example is provided in the Appendix + below). + . + "Derivative Works" shall mean any work, whether in Source or Object form, that + is based on (or derived from) the Work and for which the editorial revisions, + annotations, elaborations, or other modifications represent, as a whole, an + original work of authorship. For the purposes of this License, Derivative Works + shall not include works that remain separable from, or merely link (or bind by + name) to the interfaces of, the Work and Derivative Works thereof. + . + "Contribution" shall mean any work of authorship, including the original + version of the Work and any modifications or additions to that Work or + Derivative Works thereof, that is intentionally submitted to Licensor for + inclusion in the Work by the copyright owner or by an individual or Legal + Entity authorized to submit on behalf of the copyright owner. For the purposes + of this definition, "submitted" means any form of electronic, verbal, or + written communication sent to the Licensor or its representatives, including + but not limited to communication on electronic mailing lists, source code + control systems, and issue tracking systems that are managed by, or on behalf + of, the Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise designated + in writing by the copyright owner as "Not a Contribution." + . + "Contributor" shall mean Licensor and any individual or Legal Entity on behalf + of whom a Contribution has been received by Licensor and subsequently + incorporated within the Work. + . + 2. Grant of Copyright License. Subject to the terms and conditions of this + License, each Contributor hereby grants to You a perpetual, worldwide, + non-exclusive, no-charge, royalty-free, irrevocable copyright license to + reproduce, prepare Derivative Works of, publicly display, publicly perform, + sublicense, and distribute the Work and such Derivative Works in Source or + Object form. + . + 3. Grant of Patent License. Subject to the terms and conditions of this + License, each Contributor hereby grants to You a perpetual, worldwide, + non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this + section) patent license to make, have made, use, offer to sell, sell, import, + and otherwise transfer the Work, where such license applies only to those + patent claims licensable by such Contributor that are necessarily infringed by + their Contribution(s) alone or by combination of their Contribution(s) with + the Work to which such Contribution(s) was submitted. If You institute patent + litigation against any entity (including a cross-claim or counterclaim in a + lawsuit) alleging that the Work or a Contribution incorporated within the Work + constitutes direct or contributory patent infringement, then any patent + licenses granted to You under this License for that Work shall terminate as of + the date such litigation is filed. + . + 4. Redistribution. You may reproduce and distribute copies of the Work or + Derivative Works thereof in any medium, with or without modifications, and in + Source or Object form, provided that You meet the following conditions: + . + You must give any other recipients of the Work or Derivative Works a copy of + this License; and + You must cause any modified files to carry prominent notices stating that You + changed the files; and + You must retain, in the Source form of any Derivative Works that You + distribute, all copyright, patent, trademark, and attribution notices from the + Source form of the Work, excluding those notices that do not pertain to any + part of the Derivative Works; and + If the Work includes a "NOTICE" text file as part of its distribution, then + any Derivative Works that You distribute must include a readable copy of the + attribution notices contained within such NOTICE file, excluding those notices + that do not pertain to any part of the Derivative Works, in at least one of + the following places: within a NOTICE text file distributed as part of the + Derivative Works; within the Source form or documentation, if provided along + with the Derivative Works; or, within a display generated by the Derivative + Works, if and wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and do not modify the + License. You may add Your own attribution notices within Derivative Works that + You distribute, alongside or as an addendum to the NOTICE text from the Work, + provided that such additional attribution notices cannot be construed as + modifying the License. + . + You may add Your own copyright statement to Your modifications and may provide + additional or different license terms and conditions for use, reproduction, or + distribution of Your modifications, or for any such Derivative Works as a + whole, provided Your use, reproduction, and distribution of the Work otherwise + complies with the conditions stated in this License. + . + 5. Submission of Contributions. Unless You explicitly state otherwise, any + Contribution intentionally submitted for inclusion in the Work by You to the + Licensor shall be under the terms and conditions of this License, without any + additional terms or conditions. Notwithstanding the above, nothing herein + shall supersede or modify the terms of any separate license agreement you may + have executed with Licensor regarding such Contributions. + . + 6. Trademarks. This License does not grant permission to use the trade names, + trademarks, service marks, or product names of the Licensor, except as + required for reasonable and customary use in describing the origin of the Work + and reproducing the content of the NOTICE file. + . + 7. Disclaimer of Warranty. Unless required by applicable law or agreed to in + writing, Licensor provides the Work (and each Contributor provides its + Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied, including, without limitation, any warranties + or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any risks + associated with Your exercise of permissions under this License. + . + 8. Limitation of Liability. In no event and under no legal theory, whether in + tort (including negligence), contract, or otherwise, unless required by + applicable law (such as deliberate and grossly negligent acts) or agreed to in + writing, shall any Contributor be liable to You for damages, including any + direct, indirect, special, incidental, or consequential damages of any + character arising as a result of this License or out of the use or inability + to use the Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all other + commercial damages or losses), even if such Contributor has been advised of + the possibility of such damages. + . + 9. Accepting Warranty or Additional Liability. While redistributing the Work + or Derivative Works thereof, You may choose to offer, and charge a fee for, + acceptance of support, warranty, indemnity, or other liability obligations + and/or rights consistent with this License. However, in accepting such + obligations, You may act only on Your own behalf and on Your sole + responsibility, not on behalf of any other Contributor, and only if You agree + to indemnify, defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason of your + accepting any such warranty or additional liability. + +License: BSD-2-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + . + 1) Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + . + 2) Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +License: zlib + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + . + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + . + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + +License: ISC + Permission to use, copy, modify, and distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + . + THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS + ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE + CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL + DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR + PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS + ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + SOFTWARE. diff --git a/gbp.conf b/gbp.conf new file mode 100644 index 00000000..cec628c7 --- /dev/null +++ b/gbp.conf @@ -0,0 +1,2 @@ +[DEFAULT] +pristine-tar = True diff --git a/not-installed b/not-installed new file mode 100644 index 00000000..a37c4b26 --- /dev/null +++ b/not-installed @@ -0,0 +1,3 @@ +usr/share/doc/cmake/Copyright.txt +usr/share/doc/cmake/cmcompress/Copyright.txt +usr/share/doc/cmake/cmsys/Copyright.txt diff --git a/patches/FindBoost_add_-lpthread_#563479.diff b/patches/FindBoost_add_-lpthread_#563479.diff new file mode 100644 index 00000000..9b56b7e8 --- /dev/null +++ b/patches/FindBoost_add_-lpthread_#563479.diff @@ -0,0 +1,48 @@ +Subject: Add -lpthread when using Boost::Thread. +Author: Philip Lowman +Author: Modestas Vainius +Origin: other, http://public.kitware.com/Bug/file_download.php?file_id=3929&type=bug +Last-Update: 2013-03-16 +Bug: http://cmake.org/Bug/view.php?id=10692 +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=563479 +Forwarded: http://cmake.org/Bug/file_download.php?file_id=3629&type=bug + +--- + Modules/FindBoost.cmake | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +--- a/Modules/FindBoost.cmake ++++ b/Modules/FindBoost.cmake +@@ -861,6 +861,22 @@ function(_Boost_MISSING_DEPENDENCIES com + endif() + endmacro() + ++function(_Boost_consider_adding_pthreads _outvar) ++ # On Unix platforms (excluding cygwin) add pthreads to Boost_LIBRARIES ++ # if the user is searching for the boost-thread component. ++ if(UNIX AND NOT CYGWIN) ++ list(FIND Boost_FIND_COMPONENTS thread _using_boost_thread) ++ if(_using_boost_thread GREATER -1) ++ find_library(BOOST_THREAD_LIBRARY NAMES pthread ++ DOC "The threading library used by boost-thread" ++ ) ++ if(BOOST_THREAD_LIBRARY) ++ set(${_outvar} ${ARGN} ${BOOST_THREAD_LIBRARY} PARENT_SCOPE) ++ endif() ++ endif() ++ endif() ++endfunction() ++ + # + # End functions/macros + # +@@ -1748,6 +1764,9 @@ if(Boost_FOUND) + list(APPEND Boost_LIBRARIES ${Boost_${UPPERCOMPONENT}_LIBRARY}) + endif() + endforeach() ++ ++ # Add pthread library on UNIX if thread component was found ++ _Boost_consider_adding_pthreads(Boost_LIBRARIES ${Boost_LIBRARIES}) + else() + if(Boost_FIND_REQUIRED) + message(SEND_ERROR "Unable to find the requested Boost libraries.\n${Boost_ERROR_REASON}") diff --git a/patches/fix-ftbfs-on-kfreebsd.patch b/patches/fix-ftbfs-on-kfreebsd.patch new file mode 100644 index 00000000..70824115 --- /dev/null +++ b/patches/fix-ftbfs-on-kfreebsd.patch @@ -0,0 +1,31 @@ +From: Modestas Vainius +Subject: Fix FTBFS on GNU/kFreeBSD (and likely Gnu/Hurd) +Forwarded: yes +Origin: vendor + +The original failure [1] was caused by the fact that cxxabi.h execinfo.h etc. +includes where guarded more restrictively (e.g. additionally by __linux) than +the code which needs them (just by e.g. +KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE). kFreeGNU has some of these headers +hence extend __linux ifdef to kFreeBSD and GNU Hurd as well. + +Ideally, the code should be fixed to have the same level of ifdef protection in +all places. + +[1] https://buildd.debian.org/status/fetch.php?pkg=cmake&arch=kfreebsd-amd64&ver=2.8.12-1&stamp=1383507045 + +--- + Source/kwsys/SystemInformation.cxx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/Source/kwsys/SystemInformation.cxx ++++ b/Source/kwsys/SystemInformation.cxx +@@ -123,7 +123,7 @@ typedef int siginfo_t; + # endif + #endif + +-#if defined(__linux) || defined (__sun) || defined(_SCO_DS) ++#if defined(__linux) || defined (__sun) || defined(_SCO_DS) || defined(__GLIBC__) || defined(__GNU__) + # include + # include + # include diff --git a/patches/mips-rld-map-rel.patch b/patches/mips-rld-map-rel.patch new file mode 100644 index 00000000..6484399c --- /dev/null +++ b/patches/mips-rld-map-rel.patch @@ -0,0 +1,475 @@ +From c51099bb1018191964e5ee05e17f133233160806 Mon Sep 17 00:00:00 2001 +From: James Cowgill +Date: Thu, 13 Oct 2016 11:00:00 +0100 +Subject: [PATCH] MIPS: Handle DT_MIPS_RLD_MAP_REL tag when removing RPath from + ELFs + +This is a combination of 5 commits. + +elf: remove tag switch from ELF_Dyn ByteSwap function +elf: add DynamicEntryList methods and rpath tag constants +cmSystemTools: rewrite RemoveRPath using DyanmicEntryList methods +cmSystemTools, elf: handle DT_MIPS_RLD_REL_MAP in RemoveRPath +elf: Remove GetDynamicEntryCount and ReadBytes methods + +diff --git a/Source/cmELF.cxx b/Source/cmELF.cxx +index 2d86674..0655da9 100644 +--- a/Source/cmELF.cxx ++++ b/Source/cmELF.cxx +@@ -132,18 +132,13 @@ public: + + // Forward to the per-class implementation. + virtual unsigned int GetNumberOfSections() const = 0; +- virtual unsigned int GetDynamicEntryCount() = 0; + virtual unsigned long GetDynamicEntryPosition(int j) = 0; ++ virtual cmELF::DynamicEntryList GetDynamicEntries() = 0; ++ virtual std::vector EncodeDynamicEntries( ++ const cmELF::DynamicEntryList&) = 0; + virtual StringEntry const* GetDynamicSectionString(unsigned int tag) = 0; + virtual void PrintInfo(std::ostream& os) const = 0; + +- bool ReadBytes(unsigned long pos, unsigned long size, char* buf) +- { +- this->Stream.seekg(pos); +- this->Stream.read(buf, size); +- return !this->Stream.fail(); +- } +- + // Lookup the SONAME in the DYNAMIC section. + StringEntry const* GetSOName() + { +@@ -246,10 +241,13 @@ public: + return static_cast(this->ELFHeader.e_shnum); + } + +- // Get the file position and size of a dynamic section entry. +- unsigned int GetDynamicEntryCount() CM_OVERRIDE; ++ // Get the file position of a dynamic section entry. + unsigned long GetDynamicEntryPosition(int j) CM_OVERRIDE; + ++ cmELF::DynamicEntryList GetDynamicEntries() CM_OVERRIDE; ++ std::vector EncodeDynamicEntries(const cmELF::DynamicEntryList&) ++ CM_OVERRIDE; ++ + // Lookup a string from the dynamic section with the given tag. + StringEntry const* GetDynamicSectionString(unsigned int tag) CM_OVERRIDE; + +@@ -289,6 +287,10 @@ public: + } + + private: ++ // ByteSwap(ELF_Dyn) assumes d_val and d_ptr are the same size ++ typedef char dyn_size_assert ++ [sizeof(ELF_Dyn().d_un.d_val) == sizeof(ELF_Dyn().d_un.d_ptr) ? 1 : -1]; ++ + void ByteSwap(ELF_Ehdr& elf_header) + { + cmELFByteSwap(elf_header.e_type); +@@ -323,121 +325,7 @@ private: + void ByteSwap(ELF_Dyn& dyn) + { + cmELFByteSwap(dyn.d_tag); +- switch (dyn.d_tag) { +- case DT_NULL: /* dyn.d_un ignored */ +- break; +- case DT_NEEDED: +- cmELFByteSwap(dyn.d_un.d_val); +- break; +- case DT_PLTRELSZ: +- cmELFByteSwap(dyn.d_un.d_val); +- break; +- case DT_PLTGOT: +- cmELFByteSwap(dyn.d_un.d_ptr); +- break; +- case DT_HASH: +- cmELFByteSwap(dyn.d_un.d_ptr); +- break; +- case DT_STRTAB: +- cmELFByteSwap(dyn.d_un.d_ptr); +- break; +- case DT_SYMTAB: +- cmELFByteSwap(dyn.d_un.d_ptr); +- break; +- case DT_RELA: +- cmELFByteSwap(dyn.d_un.d_ptr); +- break; +- case DT_RELASZ: +- cmELFByteSwap(dyn.d_un.d_val); +- break; +- case DT_RELAENT: +- cmELFByteSwap(dyn.d_un.d_val); +- break; +- case DT_STRSZ: +- cmELFByteSwap(dyn.d_un.d_val); +- break; +- case DT_SYMENT: +- cmELFByteSwap(dyn.d_un.d_val); +- break; +- case DT_INIT: +- cmELFByteSwap(dyn.d_un.d_ptr); +- break; +- case DT_FINI: +- cmELFByteSwap(dyn.d_un.d_ptr); +- break; +- case DT_SONAME: +- cmELFByteSwap(dyn.d_un.d_val); +- break; +- case DT_RPATH: +- cmELFByteSwap(dyn.d_un.d_val); +- break; +- case DT_SYMBOLIC: /* dyn.d_un ignored */ +- break; +- case DT_REL: +- cmELFByteSwap(dyn.d_un.d_ptr); +- break; +- case DT_RELSZ: +- cmELFByteSwap(dyn.d_un.d_val); +- break; +- case DT_RELENT: +- cmELFByteSwap(dyn.d_un.d_val); +- break; +- case DT_PLTREL: +- cmELFByteSwap(dyn.d_un.d_val); +- break; +- case DT_DEBUG: +- cmELFByteSwap(dyn.d_un.d_ptr); +- break; +- case DT_TEXTREL: /* dyn.d_un ignored */ +- break; +- case DT_JMPREL: +- cmELFByteSwap(dyn.d_un.d_ptr); +- break; +-#ifdef T_BIND_NOW +- case T_BIND_NOW: /* dyn.d_un ignored */ +- break; +-#endif +-#ifdef DT_INIT_ARRAY +- case DT_INIT_ARRAY: +- cmELFByteSwap(dyn.d_un.d_ptr); +- break; +-#endif +-#ifdef DT_FINI_ARRAY +- case DT_FINI_ARRAY: +- cmELFByteSwap(dyn.d_un.d_ptr); +- break; +-#endif +-#ifdef DT_INIT_ARRAYSZ +- case DT_INIT_ARRAYSZ: +- cmELFByteSwap(dyn.d_un.d_val); +- break; +-#endif +-#ifdef DT_FINI_ARRAYSZ +- case DT_FINI_ARRAYSZ: +- cmELFByteSwap(dyn.d_un.d_val); +- break; +-#endif +-#ifdef DT_RUNPATH +- case DT_RUNPATH: +- cmELFByteSwap(dyn.d_un.d_val); +- break; +-#endif +-#ifdef DT_FLAGS +- case DT_FLAGS: +- cmELFByteSwap(dyn.d_un.d_val); +- break; +-#endif +-#ifdef DT_PREINIT_ARRAY +- case DT_PREINIT_ARRAY: +- cmELFByteSwap(dyn.d_un.d_ptr); +- break; +-#endif +-#ifdef DT_PREINIT_ARRAYSZ +- case DT_PREINIT_ARRAYSZ: +- cmELFByteSwap(dyn.d_un.d_val); +- break; +-#endif +- } ++ cmELFByteSwap(dyn.d_un.d_val); + } + + bool FileTypeValid(ELF_Half et) +@@ -636,30 +524,64 @@ bool cmELFInternalImpl::LoadDynamicSection() + } + + template +-unsigned int cmELFInternalImpl::GetDynamicEntryCount() ++unsigned long cmELFInternalImpl::GetDynamicEntryPosition(int j) + { + if (!this->LoadDynamicSection()) { + return 0; + } +- for (unsigned int i = 0; i < this->DynamicSectionEntries.size(); ++i) { +- if (this->DynamicSectionEntries[i].d_tag == DT_NULL) { +- return i; +- } ++ if (j < 0 || j >= static_cast(this->DynamicSectionEntries.size())) { ++ return 0; + } +- return static_cast(this->DynamicSectionEntries.size()); ++ ELF_Shdr const& sec = this->SectionHeaders[this->DynamicSectionIndex]; ++ return static_cast(sec.sh_offset + sec.sh_entsize * j); + } + + template +-unsigned long cmELFInternalImpl::GetDynamicEntryPosition(int j) ++cmELF::DynamicEntryList cmELFInternalImpl::GetDynamicEntries() + { ++ cmELF::DynamicEntryList result; ++ ++ // Ensure entries have been read from file + if (!this->LoadDynamicSection()) { +- return 0; ++ return result; + } +- if (j < 0 || j >= static_cast(this->DynamicSectionEntries.size())) { +- return 0; ++ ++ // Copy into public array ++ result.reserve(this->DynamicSectionEntries.size()); ++ for (typename std::vector::iterator di = ++ this->DynamicSectionEntries.begin(); ++ di != this->DynamicSectionEntries.end(); ++di) { ++ ELF_Dyn& dyn = *di; ++ result.push_back( ++ std::pair(dyn.d_tag, dyn.d_un.d_val)); + } +- ELF_Shdr const& sec = this->SectionHeaders[this->DynamicSectionIndex]; +- return static_cast(sec.sh_offset + sec.sh_entsize * j); ++ ++ return result; ++} ++ ++template ++std::vector cmELFInternalImpl::EncodeDynamicEntries( ++ const cmELF::DynamicEntryList& entries) ++{ ++ std::vector result; ++ result.reserve(sizeof(ELF_Dyn) * entries.size()); ++ ++ for (cmELF::DynamicEntryList::const_iterator it = entries.begin(); ++ it != entries.end(); it++) { ++ // Store the entry in an ELF_Dyn, byteswap it, then serialize to chars ++ ELF_Dyn dyn; ++ dyn.d_tag = static_cast(it->first); ++ dyn.d_un.d_val = static_cast(it->second); ++ ++ if (this->NeedSwap) { ++ ByteSwap(dyn); ++ } ++ ++ char* pdyn = reinterpret_cast(&dyn); ++ result.insert(result.end(), pdyn, pdyn + sizeof(ELF_Dyn)); ++ } ++ ++ return result; + } + + template +@@ -752,6 +674,15 @@ cmELF::StringEntry const* cmELFInternalImpl::GetDynamicSectionString( + //============================================================================ + // External class implementation. + ++const long cmELF::TagRPath = DT_RPATH; ++const long cmELF::TagRunPath = DT_RUNPATH; ++ ++#ifdef DT_MIPS_RLD_MAP_REL ++const long cmELF::TagMipsRldMapRel = DT_MIPS_RLD_MAP_REL; ++#else ++const long cmELF::TagMipsRldMapRel = 0; ++#endif ++ + cmELF::cmELF(const char* fname) + : Internal(CM_NULLPTR) + { +@@ -839,28 +770,31 @@ unsigned int cmELF::GetNumberOfSections() const + return 0; + } + +-unsigned int cmELF::GetDynamicEntryCount() const ++unsigned long cmELF::GetDynamicEntryPosition(int index) const + { + if (this->Valid()) { +- return this->Internal->GetDynamicEntryCount(); ++ return this->Internal->GetDynamicEntryPosition(index); + } + return 0; + } + +-unsigned long cmELF::GetDynamicEntryPosition(int index) const ++cmELF::DynamicEntryList cmELF::GetDynamicEntries() const + { + if (this->Valid()) { +- return this->Internal->GetDynamicEntryPosition(index); ++ return this->Internal->GetDynamicEntries(); + } +- return 0; ++ ++ return cmELF::DynamicEntryList(); + } + +-bool cmELF::ReadBytes(unsigned long pos, unsigned long size, char* buf) const ++std::vector cmELF::EncodeDynamicEntries( ++ const cmELF::DynamicEntryList& dentries) const + { + if (this->Valid()) { +- return this->Internal->ReadBytes(pos, size, buf); ++ return this->Internal->EncodeDynamicEntries(dentries); + } +- return false; ++ ++ return std::vector(); + } + + bool cmELF::GetSOName(std::string& soname) +diff --git a/Source/cmELF.h b/Source/cmELF.h +index 7e7c1d6..763a240 100644 +--- a/Source/cmELF.h ++++ b/Source/cmELF.h +@@ -7,6 +7,8 @@ + + #include + #include ++#include ++#include + + #if !defined(CMAKE_USE_ELF_PARSER) + #error "This file may be included only if CMAKE_USE_ELF_PARSER is enabled." +@@ -61,22 +63,27 @@ public: + int IndexInSection; + }; + ++ /** Represent entire dynamic section header */ ++ typedef std::vector > DynamicEntryList; ++ + /** Get the type of the file opened. */ + FileType GetFileType() const; + + /** Get the number of ELF sections present. */ + unsigned int GetNumberOfSections() const; + +- /** Get the number of DYNAMIC section entries before the first +- DT_NULL. Returns zero on error. */ +- unsigned int GetDynamicEntryCount() const; +- + /** Get the position of a DYNAMIC section header entry. Returns + zero on error. */ + unsigned long GetDynamicEntryPosition(int index) const; + +- /** Read bytes from the file. */ +- bool ReadBytes(unsigned long pos, unsigned long size, char* buf) const; ++ /** Get a copy of all the DYNAMIC section header entries. ++ Returns an empty vector on error */ ++ DynamicEntryList GetDynamicEntries() const; ++ ++ /** Encodes a DYNAMIC section header entry list into a char vector according ++ to the type of ELF file this is */ ++ std::vector EncodeDynamicEntries( ++ const DynamicEntryList& entries) const; + + /** Get the SONAME field if any. */ + bool GetSOName(std::string& soname); +@@ -91,6 +98,10 @@ public: + /** Print human-readable information about the ELF file. */ + void PrintInfo(std::ostream& os) const; + ++ /** Interesting dynamic tags. ++ If the tag is 0, it does not exist in the host ELF implementation */ ++ static const long TagRPath, TagRunPath, TagMipsRldMapRel; ++ + private: + friend class cmELFInternal; + bool Valid() const; +diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx +index 3d8fdf5..d800ef8 100644 +--- a/Source/cmSystemTools.cxx ++++ b/Source/cmSystemTools.cxx +@@ -2518,9 +2518,9 @@ bool cmSystemTools::RemoveRPath(std::string const& file, std::string* emsg, + std::swap(se[0], se[1]); + } + +- // Get the size of the dynamic section header. +- unsigned int count = elf.GetDynamicEntryCount(); +- if (count == 0) { ++ // Obtain a copy of the dynamic entries ++ cmELF::DynamicEntryList dentries = elf.GetDynamicEntries(); ++ if (dentries.empty()) { + // This should happen only for invalid ELF files where a DT_NULL + // appears before the end of the table. + if (emsg) { +@@ -2536,40 +2536,46 @@ bool cmSystemTools::RemoveRPath(std::string const& file, std::string* emsg, + zeroSize[i] = se[i]->Size; + } + +- // Get the range of file positions corresponding to each entry and +- // the rest of the table after them. +- unsigned long entryBegin[3] = { 0, 0, 0 }; +- unsigned long entryEnd[2] = { 0, 0 }; +- for (int i = 0; i < se_count; ++i) { +- entryBegin[i] = elf.GetDynamicEntryPosition(se[i]->IndexInSection); +- entryEnd[i] = elf.GetDynamicEntryPosition(se[i]->IndexInSection + 1); +- } +- entryBegin[se_count] = elf.GetDynamicEntryPosition(count); +- +- // The data are to be written over the old table entries starting at +- // the first one being removed. +- bytesBegin = entryBegin[0]; +- unsigned long bytesEnd = entryBegin[se_count]; ++ // Get size of one DYNAMIC entry ++ unsigned long const sizeof_dentry = ++ elf.GetDynamicEntryPosition(1) - elf.GetDynamicEntryPosition(0); + +- // Allocate a buffer to hold the part of the file to be written. +- // Initialize it with zeros. +- bytes.resize(bytesEnd - bytesBegin, 0); +- +- // Read the part of the DYNAMIC section header that will move. +- // The remainder of the buffer will be left with zeros which +- // represent a DT_NULL entry. +- char* data = &bytes[0]; +- for (int i = 0; i < se_count; ++i) { +- // Read data between the entries being removed. +- unsigned long sz = entryBegin[i + 1] - entryEnd[i]; +- if (sz > 0 && !elf.ReadBytes(entryEnd[i], sz, data)) { +- if (emsg) { +- *emsg = "Failed to read DYNAMIC section header."; ++ // Adjust the entry list as necessary to remove the run path ++ unsigned long entriesErased = 0; ++ for (cmELF::DynamicEntryList::iterator it = dentries.begin(); ++ it != dentries.end();) { ++ if (it->first == cmELF::TagRPath || it->first == cmELF::TagRunPath) { ++ it = dentries.erase(it); ++ entriesErased++; ++ continue; ++ } else { ++ if (cmELF::TagMipsRldMapRel != 0 && ++ it->first == cmELF::TagMipsRldMapRel) { ++ // Background: debuggers need to know the "linker map" which contains ++ // the addresses each dynamic object is loaded at. Most arches use ++ // the DT_DEBUG tag which the dynamic linker writes to (directly) and ++ // contain the location of the linker map, however on MIPS the ++ // .dynamic section is always read-only so this is not possible. MIPS ++ // objects instead contain a DT_MIPS_RLD_MAP tag which contains the ++ // address where the dyanmic linker will write to (an indirect ++ // version of DT_DEBUG). Since this doesn't work when using PIE, a ++ // relative equivalent was created - DT_MIPS_RLD_MAP_REL. Since this ++ // version contains a relative offset, moving it changes the ++ // calculated address. This may cause the dyanmic linker to write ++ // into memory it should not be changing. ++ // ++ // To fix this, we adjust the value of DT_MIPS_RLD_MAP_REL here. If ++ // we move it up by n bytes, we add n bytes to the value of this tag. ++ it->second += entriesErased * sizeof_dentry; + } +- return false; ++ ++ it++; + } +- data += sz; + } ++ ++ // Encode new entries list ++ bytes = elf.EncodeDynamicEntries(dentries); ++ bytesBegin = elf.GetDynamicEntryPosition(0); + } + + // Open the file for update. diff --git a/patches/qt_import_dir_variable.diff b/patches/qt_import_dir_variable.diff new file mode 100644 index 00000000..eebcc04f --- /dev/null +++ b/patches/qt_import_dir_variable.diff @@ -0,0 +1,25 @@ +From: Jonathan Riddell +Subject: FindQt4: define QT_IMPORTS_DIR variable even if it is not present on the system. +Date: 2012-01-18 16:00:49 UTC +Bug: http://public.kitware.com/Bug/view.php?id=14155 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/cmake/+bug/894805 +Forwarded: yes +Origin: vendor + +This happens when there are no plugins currently installed. + +--- + Modules/FindQt4.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/Modules/FindQt4.cmake ++++ b/Modules/FindQt4.cmake +@@ -736,7 +736,7 @@ if (QT_QMAKE_EXECUTABLE AND + if (QT_LIBRARY_DIR AND NOT QT_IMPORTS_DIR OR QT_QMAKE_CHANGED) + _qt4_query_qmake(QT_INSTALL_IMPORTS qt_imports_dir) + if(qt_imports_dir) +- set(QT_IMPORTS_DIR NOTFOUND) ++ set(QT_IMPORTS_DIR "${qt_imports_dir}") + foreach(qt_cross_path ${CMAKE_FIND_ROOT_PATH}) + set(qt_cross_paths ${qt_cross_paths} "${qt_cross_path}/imports") + endforeach() diff --git a/patches/series b/patches/series new file mode 100644 index 00000000..400dc0d2 --- /dev/null +++ b/patches/series @@ -0,0 +1,4 @@ +FindBoost_add_-lpthread_#563479.diff +qt_import_dir_variable.diff +fix-ftbfs-on-kfreebsd.patch +mips-rld-map-rel.patch diff --git a/rules b/rules new file mode 100755 index 00000000..eaaf6400 --- /dev/null +++ b/rules @@ -0,0 +1,77 @@ +#!/usr/bin/make -f + +export DEB_CXXFLAGS_MAINT_APPEND := $(shell dpkg-buildflags --get CPPFLAGS) +export DEB_CFLAGS_MAINT_APPEND := $(shell dpkg-buildflags --get CPPFLAGS) +export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed + +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + BOOTSTRAP_PARALLEL = --parallel=$(NUMJOBS) +endif + +LAST_CHANGE = $(shell dpkg-parsechangelog -S Date) +BUILD_DATE = $(shell LC_ALL=C date -u "+%B %d, %Y" -d "$(LAST_CHANGE)") + + +BUILD_FLAGS_FILE = build-flags.cmake +set_build_flag = echo 'set($(1) $(2) CACHE \ + $(if $(filter $(2),YES ON TRUE NO OFF FALSE),BOOL,STRING) \ + $(or $(3),"") FORCE)' >> $(BUILD_FLAGS_FILE) +verify_build_flag = @grep \ + --include=CMakeLists.txt --include=*.cmake \ + --exclude=$(BUILD_FLAGS_FILE) -rqs '\b$(1)\b' . || echo '$(1) flag is obsolete' + +$(BUILD_FLAGS_FILE) verify-build-flags: + $(call $(flag_action),CMAKE_SKIP_RPATH,ON,"Skip rpath") + $(call $(flag_action),CMAKE_USE_RELATIVE_PATHS,ON,"Use relative paths") + $(call $(flag_action),CMAKE_VERBOSE_MAKEFILE,ON,"Verbose build") + $(call $(flag_action),CMAKE_C_FLAGS,"$(CFLAGS)","C flags") + $(call $(flag_action),CMAKE_CXX_FLAGS,"$(CXXFLAGS)","C++ flags") + $(call $(flag_action),CMAKE_SKIP_BOOTSTRAP_TEST,ON,"Skip BootstrapTest") + $(call $(flag_action),BUILD_CursesDialog,ON,"Build curses GUI") +ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),) + $(call $(flag_action),BUILD_QtDialog,ON,"Build Qt GUI") +endif +ifeq ($(DEB_HOST_ARCH_OS),hurd) + $(call $(flag_action),CMAKE_USE_LIBUV,0,"Do not use libuv") +endif +# $(call $(flag_action),BUILD_DOCUMENTATION,ON) + +$(BUILD_FLAGS_FILE): flag_action := set_build_flag +verify-build-flags: flag_action := verify_build_flag +.PHONY: verify-build-flags + +override_dh_auto_configure: $(BUILD_FLAGS_FILE) + rm -rf Build && mkdir -p Build + cd Build && ../bootstrap --prefix=/usr --docdir=/share/doc/cmake --mandir=/share/man \ + --init=../$(BUILD_FLAGS_FILE) --system-libs \ + --sphinx-man --sphinx-html --sphinx-flags="-D today=\"$(BUILD_DATE)\"" \ + $(BOOTSTRAP_PARALLEL) --verbose + +override_dh_auto_test: + HOME="`pwd`/Build" dh_auto_test --buildsystem=cmake -- ARGS="-E CTestTestUpload" + +override_dh_auto_clean: + dh_auto_clean + rm -f $(BUILD_FLAGS_FILE) + +override_dh_install: + dh_install --list-missing + +override_dh_installdocs-arch: + # dh_installdocs --link-doc generates binNMU unsafe deps (Bug #747141) + dh_installdocs + +override_dh_installdocs-indep: + dh_installdocs --link-doc=cmake-data + +override_dh_sphinxdoc: + dh_sphinxdoc -pcmake-doc + +override_dh_strip: + dh_strip --dbgsym-migration='cmake-dbg (<< 3.5.0-1~)' + +%: + dh $@ --with=sphinxdoc --parallel --builddirectory=Build + +.PHONY: override_dh_auto_configure override_dh_auto_clean diff --git a/source/format b/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/source/lintian-overrides b/source/lintian-overrides new file mode 100644 index 00000000..f655f9a4 --- /dev/null +++ b/source/lintian-overrides @@ -0,0 +1,2 @@ +# binary test files used by the test suite to verify that changing the RPATH works fine +cmake source: source-is-missing Tests/CMakeTests/ELF/elf*.bin diff --git a/tests/control b/tests/control new file mode 100644 index 00000000..737eef1b --- /dev/null +++ b/tests/control @@ -0,0 +1,44 @@ +Tests: testsuite testsuite-ninja findmodules +Restrictions: allow-stderr +Depends: cmake, + ninja-build, + @builddeps@, + libasound2-dev, + libarmadillo-dev, + bison, + libboost-dev, + libbz2-dev, + libcups2-dev, + libcurl4-openssl-dev, + cvs, + doxygen, + libexpat1-dev, + flex, + libfreetype6-dev, + gettext, + libgif-dev, + git, + imagemagick, + libmagickcore-dev, + libmagick++-dev, + libmagickwand-dev, + libgnutls28-dev, + libgtk2.0-dev, + mercurial, + hspell, + icoutils, + libarchive-dev, + liblzma-dev, + libxml2-dev, + libxslt1-dev, + libopenscenegraph-dev, + perl, + libphysfs-dev, + pkg-config, + ruby-dev, + libprotobuf-dev, + protobuf-compiler, + subversion, + swig, + libtiff5-dev, + zlib1g-dev diff --git a/tests/findmodules b/tests/findmodules new file mode 100755 index 00000000..dd640566 --- /dev/null +++ b/tests/findmodules @@ -0,0 +1,9 @@ +#!/bin/sh + +set -ev + +SRCDIR="$(pwd)" + +cd "$ADTTMP" + +cmake "$SRCDIR/debian/tests/findmodules_data" diff --git a/tests/findmodules_data/CMakeLists.txt b/tests/findmodules_data/CMakeLists.txt new file mode 100644 index 00000000..2c0eb5cc --- /dev/null +++ b/tests/findmodules_data/CMakeLists.txt @@ -0,0 +1,10 @@ +cmake_minimum_required(VERSION 3.0) + +foreach(VTEST ALSA Armadillo BISON Boost BZip2 Cups CURL CVS Doxygen EXPAT FLEX + Freetype Gettext GIF Git GnuTLS GTK2 Hg HSPELL Icotool + LibArchive LibLZMA LibXml2 LibXslt OpenSceneGraph Perl PhysFS + PkgConfig Ruby Protobuf Subversion SWIG TIFF ZLIB) + find_package(${VTEST} REQUIRED) +endforeach() + +find_package(ImageMagick COMPONENTS convert MagickCore Magick++ MagickWand REQUIRED) diff --git a/tests/testsuite b/tests/testsuite new file mode 100755 index 00000000..0c2b4984 --- /dev/null +++ b/tests/testsuite @@ -0,0 +1,11 @@ +#!/bin/sh + +set -ev + +SRCDIR="$(pwd)" + +cd "$ADTTMP" + +cmake -DCMake_TEST_EXTERNAL_CMAKE=/usr/bin "$SRCDIR" +make VERBOSE=1 +CTEST_OUTPUT_ON_FAILURE=1 make test ARGS="-E CTestTestUpload -E BootstrapTest" diff --git a/tests/testsuite-ninja b/tests/testsuite-ninja new file mode 100755 index 00000000..5b9181db --- /dev/null +++ b/tests/testsuite-ninja @@ -0,0 +1,11 @@ +#!/bin/sh + +set -ev + +SRCDIR="$(pwd)" + +cd "$ADTTMP" + +cmake -DCMake_TEST_EXTERNAL_CMAKE=/usr/bin -GNinja "$SRCDIR" +ninja -v +CTEST_OUTPUT_ON_FAILURE=1 ctest -E CTestTestUpload -E BootstrapTest diff --git a/watch b/watch new file mode 100644 index 00000000..4c424f3f --- /dev/null +++ b/watch @@ -0,0 +1,6 @@ +version=3 + +# Track CMake 2.6.x releases including RCs +opts="uversionmangle=s/-[Rr][Cc]-?(\d+)/~rc$1/i" \ + https://cmake.org/files/v([\d.]+)/ \ + cmake-([\d.]+(?i:-RC-?\d+)?).tar.gz -- 2.30.2