Merge cmake (main) from Debian unstable (main)

Bug #1357270 reported by Gianfranco Costamagna on 2014-08-15
This bug affects 1 person
Affects Status Importance Assigned to Milestone
cmake (Ubuntu)

Bug Description

attached the debdiff.

This merge allows probably to drop the
" * Keep Ubuntu's fix_freetype_detection.diff over Debian's fix-FindFreetype.diff"

because of the debian patch:
" - Add fix-FindFreetype-version.diff, cherry-picked from upstream."
that should fix the freetype 2.5 problem.

Related branches

Artur Rona (ari-tczew) on 2014-08-17
summary: - please merge cmake from debian
+ Merge cmake (main) from Debian unstable (main)
Changed in cmake (Ubuntu):
importance: Undecided → Wishlist
status: New → Confirmed
Iain Lane (laney) wrote :

Cheers - could you rebase this merge on top of -2 please?

ping me after that for sponsoring if you like (unsubscribing ~ubuntu-sponsors)

Here you are :)

description: updated
Sebastien Bacher (seb128) wrote :

that has been uploaded and is in unapproved queue, unsubscribing sponsors

Steve Langasek (vorlon) wrote :

This upload rejiggers a lot of the patches, and is arriving well after feature freeze. What testing has been done to ensure that the patches to the various .cmake rules don't regress builds for any of the packages in utopic which use cmake?

Hi Steve, do you have any list of packages that might be affected by this?

don't know: packages depending on freetype, packages depending on tcl/tk?

when I opened this bug we were one month ahead of the freeze, but now seems a little bit late for a merge, moreover I hope to see cmake 3.0 as soon as V opens

Iain Lane (laney) wrote :

I test-rebuilt a lot of rdeps as part of sponsoring and convinced myself enough that it was safe to upload.

It got rejected "Rejected by Jonathan Riddell: no gain for risk after feature freeze, please re-upload once v-series is open"

I think we should do that

Jonathan Riddell (jr) wrote :

Uploaded 3.0.2 based on the patch in this bug, thanks

Launchpad Janitor (janitor) wrote :
Download full text (4.8 KiB)

This bug was fixed in the package cmake - 3.0.2-1ubuntu1

cmake (3.0.2-1ubuntu1) vivid; urgency=medium

  * Merge from Debian unstable (LP: #1357270). Remaining changes:
    - debian/cmake-data.install
      Add MultiArchCross.cmake to installed files.
      (help cmake to find libraries in multiarch path)
      xnox says this is not yet ready to go upstream but he will work on it
    - debian/patches/ubuntu_boost-multiarch.patch
      find boost and python in multiarch path
      this is a candidate for removal but needs rdepend testing
  * Drop multiarch-python-include-dirs.diff no longer required according
    to bug report

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

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

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
  * 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.

cmake ( 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.

cmake ( 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 cma...


Changed in cmake (Ubuntu):
status: Confirmed → Fix Released
To post a comment you must log in.
This report contains Public information  Edit
Everyone can see this information.

Other bug subscribers