[Cmake-commits] CMake branch, master, updated. v3.5.2-747-ga98a699

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  a98a699987dde6576399474a24bff42c4d1317ad (commit)
       via  adbd3985f89f19d9de867a75321465d6e181908d (commit)
      from  384de98709ee6b8bf49c2d52b89d04d09a7c4b58 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a98a699987dde6576399474a24bff42c4d1317ad
commit a98a699987dde6576399474a24bff42c4d1317ad
Merge: 384de98 adbd398
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 24 13:54:03 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 24 13:54:03 2016 -0400

    Merge topic 'cpack-deb-different-package-names'
    
    adbd3985 CPack/Deb possibility to change package name

diff --cc Help/release/dev/cpack-deb-imporvements.rst
index 9e45aa5,d3cb52c..63312b5
--- a/Help/release/dev/cpack-deb-imporvements.rst
+++ b/Help/release/dev/cpack-deb-imporvements.rst
@@@ -11,14 -11,10 +11,11 @@@ cpack-deb-imporvement
  * The :module:`CPackDeb` module learned how to generate dependencies between
    Debian packages if multi-component setup is used and
    :variable:`CPACK_COMPONENT_<compName>_DEPENDS` variables are set.
 -  This breaks compatibility with previous versions.
 +  For backward compatibility this feature is disabled by default. See
 +  :variable:`CPACK_DEBIAN_ENABLE_COMPONENT_DEPENDS`.
  
- * The :module:`CPackDeb` module learned how to set the package release number
-   (``DebianRevisionNumber`` in package file name).  See
-   :variable:`CPACK_DEBIAN_PACKAGE_RELEASE`.
- 
- * The :module:`CPackDeb` module now generates properly-named Debian packages::
+ * The :module:`CPackDeb` module learned how to set custom package file names
+   including how to generate properly-named Debian packages::
  
      <PackageName>_<VersionNumber>-<DebianRevisionNumber>_<DebianArchitecture>.deb
  

-----------------------------------------------------------------------

Summary of changes:
 Help/release/dev/cpack-deb-imporvements.rst        |   16 +++--
 Modules/CPackDeb.cmake                             |   70 ++++++++++++++++++--
 Source/CPack/cmCPackDebGenerator.cxx               |    8 +--
 Tests/CPackComponentsDEB/CMakeLists.txt            |    2 +
 Tests/CPackComponentsForAll/CMakeLists.txt         |    3 +
 .../{RPM_CUSTOM_NAMES.cmake => CUSTOM_NAMES.cmake} |    4 --
 .../CPack/DEB/COMPONENTS_EMPTY_DIR-specifics.cmake |    1 +
 ...iles.cmake => CUSTOM_NAMES-ExpectedFiles.cmake} |    6 +-
 ...pecifics.cmake => CUSTOM_NAMES-specifics.cmake} |    4 +-
 .../CPack/DEB/DEPENDENCIES-ExpectedFiles.cmake     |   10 +--
 .../CPack/DEB/DEPENDENCIES-specifics.cmake         |    2 +
 Tests/RunCMake/CPack/DEB/EMPTY_DIR-specifics.cmake |    1 +
 Tests/RunCMake/CPack/DEB/MINIMAL-specifics.cmake   |    1 +
 .../CPack/DEB/PER_COMPONENT_FIELDS-specifics.cmake |    1 +
 Tests/RunCMake/CPack/DEB_EXTRA.cmake               |    1 +
 Tests/RunCMake/CPack/DEB_GENERATE_SHLIBS.cmake     |    1 +
 .../CPack/DEB_GENERATE_SHLIBS_LDCONFIG.cmake       |    1 +
 ...iles.cmake => CUSTOM_NAMES-ExpectedFiles.cmake} |    0
 .../CPack/RPM/CUSTOM_NAMES-specifics.cmake         |    5 ++
 Tests/RunCMake/CPack/RPM/CUSTOM_NAMES-stderr.txt   |    3 +
 .../RunCMake/CPack/RPM/RPM_CUSTOM_NAMES-stderr.txt |    3 -
 Tests/RunCMake/CPack/RunCMakeTest.cmake            |    2 +-
 22 files changed, 110 insertions(+), 35 deletions(-)
 rename Tests/RunCMake/CPack/{RPM_CUSTOM_NAMES.cmake => CUSTOM_NAMES.cmake} (67%)
 copy Tests/RunCMake/CPack/DEB/{PER_COMPONENT_FIELDS-ExpectedFiles.cmake => CUSTOM_NAMES-ExpectedFiles.cmake} (66%)
 copy Tests/RunCMake/CPack/DEB/{PER_COMPONENT_FIELDS-specifics.cmake => CUSTOM_NAMES-specifics.cmake} (55%)
 rename Tests/RunCMake/CPack/RPM/{RPM_CUSTOM_NAMES-ExpectedFiles.cmake => CUSTOM_NAMES-ExpectedFiles.cmake} (100%)
 create mode 100644 Tests/RunCMake/CPack/RPM/CUSTOM_NAMES-specifics.cmake
 create mode 100644 Tests/RunCMake/CPack/RPM/CUSTOM_NAMES-stderr.txt
 delete mode 100644 Tests/RunCMake/CPack/RPM/RPM_CUSTOM_NAMES-stderr.txt


hooks/post-receive
-- 
CMake