please merge cmake from debian

Bug #1459727 reported by Gianfranco Costamagna
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
cmake (Ubuntu)
Fix Released
Undecided
Unassigned

Bug Description

debdiff attached for review.

I started the merge since we are in the early development :)

Related branches

Revision history for this message
Gianfranco Costamagna (costamagnagianfranco) wrote :
Revision history for this message
Gianfranco Costamagna (costamagnagianfranco) wrote :

build ongoing on ppa:costamagnagianfranco/locutusofborg-ppa

Revision history for this message
Martin Pitt (pitti) wrote :

Looks good, thanks! Uploaded.

Changed in cmake (Ubuntu):
status: New → Fix Committed
Revision history for this message
Martin Pitt (pitti) wrote :

Note that this needs a MIR.

Revision history for this message
Launchpad Janitor (janitor) wrote :

This bug was fixed in the package cmake - 3.2.2-2ubuntu1

---------------
cmake (3.2.2-2ubuntu1) wily; urgency=low

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

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

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

 -- Gianfranco Costamagna <email address hidden> Thu, 28 May 2015 17:35:43 +0200

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

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.