[Pkg-cmake-commits] [cmake] 02/05: Merge tag 'upstream/3.6.1'

[Felix Geyer]

This is an automated email from the git hooks/post-receive script.

fgeyer pushed a commit to branch master
in repository cmake.

commit c6213f749c833f051cbe110793de3010bed06bdb
Merge: 5aef43d 696fa2e
Author: Felix Geyer <fgeyer at debian.org>
Date:   Sat Aug 20 09:57:32 2016 +0200

    Merge tag 'upstream/3.6.1'
    
    Upstream version 3.6.1
    
    # gpg: Signature made Sa 20 Aug 2016 09:57:30 CEST
    # gpg:                using RSA key 0xFE22C6FD83135D45
    # gpg: Good signature from "Felix Geyer <felix at fobos.de>" [ultimate]
    # gpg:                 aka "Felix Geyer <debfx-pkg at fobos.de>" [ultimate]
    # gpg:                 aka "Felix Geyer <debfx at kubuntu.org>" [ultimate]
    # gpg:                 aka "Felix Geyer <debfx at fobos.de>" [ultimate]
    # gpg:                 aka "Felix Geyer <debfx at ubuntu.com>" [ultimate]
    # gpg:                 aka "Felix Geyer <felix.geyer at fobos.de>" [ultimate]
    # gpg:                 aka "Felix Geyer <fgeyer at debian.org>" [ultimate]
    # Primary key fingerprint: 164C 7051 2F79 2947 6764  AB56 FE22 C6FD 8313 5D45

 Help/release/3.6.rst                       |   6 ++
 Modules/CPackRPM.cmake                     |   1 +
 Modules/FindHDF5.cmake                     | 136 +++++++++++++++++++++--------
 Modules/NSIS.template.in                   |   2 +-
 Source/CMakeVersion.cmake                  |   2 +-
 Source/CPack/cmCPackGenerator.cxx          |   3 +-
 Source/cmFindBase.cxx                      |   6 +-
 Source/cmNinjaNormalTargetGenerator.cxx    |   2 +-
 Source/cmQtAutoGeneratorInitializer.cxx    | 120 ++++++-------------------
 Source/cmQtAutoGenerators.cxx              |  79 ++++-------------
 Source/cmQtAutoGenerators.h                |   5 +-
 Source/cmVisualStudio10TargetGenerator.cxx |   3 +-
 Tests/QtAutogen/CMakeLists.txt             |   4 -
 Tests/QtAutogen/same_name/CMakeLists.txt   |  20 -----
 Tests/QtAutogen/same_name/aaa/bbb/data.qrc |   6 --
 Tests/QtAutogen/same_name/aaa/bbb/item.cpp |  10 ---
 Tests/QtAutogen/same_name/aaa/bbb/item.hpp |  18 ----
 Tests/QtAutogen/same_name/aaa/data.qrc     |   6 --
 Tests/QtAutogen/same_name/aaa/item.cpp     |   8 --
 Tests/QtAutogen/same_name/aaa/item.hpp     |  16 ----
 Tests/QtAutogen/same_name/bbb/aaa/data.qrc |   6 --
 Tests/QtAutogen/same_name/bbb/aaa/item.cpp |  10 ---
 Tests/QtAutogen/same_name/bbb/aaa/item.hpp |  18 ----
 Tests/QtAutogen/same_name/bbb/data.qrc     |   6 --
 Tests/QtAutogen/same_name/bbb/item.cpp     |   8 --
 Tests/QtAutogen/same_name/bbb/item.hpp     |  16 ----
 Tests/QtAutogen/same_name/ccc/data.qrc     |   6 --
 Tests/QtAutogen/same_name/ccc/item.cpp     |  23 -----
 Tests/QtAutogen/same_name/ccc/item.hpp     |  16 ----
 Tests/QtAutogen/same_name/data.qrc         |   5 --
 Tests/QtAutogen/same_name/main.cpp         |  16 ----
 31 files changed, 160 insertions(+), 423 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cmake/cmake.git