[Cmake-commits] CMake branch, next, updated. v3.4.0-rc3-1270-g9aa7aab

[Domen Vrankar]

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, next has been updated
       via  9aa7aabe2c969b46359c9e756b5483e213f1d06b (commit)
       via  3101b714421578987d8dc28e097baaa3c1c29aae (commit)
       via  3fd6cb7a7894811679d8423ad301b55b520d6ae2 (commit)
      from  7621f4f4012d900cd6fb588fed076857de5521e0 (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=9aa7aabe2c969b46359c9e756b5483e213f1d06b
commit 9aa7aabe2c969b46359c9e756b5483e213f1d06b
Merge: 7621f4f 3101b71
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Sun Nov 8 17:46:35 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Nov 8 17:46:35 2015 -0500

    Merge topic 'cpack-deb-new-component-vars' into next
    
    3101b714 CPackDeb: CPACK_DEBIAN_PACKAGE_NAME documentation improvement
    3fd6cb7a CPackDeb: set package control field per component


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3101b714421578987d8dc28e097baaa3c1c29aae
commit 3101b714421578987d8dc28e097baaa3c1c29aae
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Sun Nov 8 23:46:13 2015 +0100
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Sun Nov 8 23:46:13 2015 +0100

    CPackDeb: CPACK_DEBIAN_PACKAGE_NAME documentation improvement

diff --git a/Help/release/dev/cpack-deb-new-component-vars.rst b/Help/release/dev/cpack-deb-new-component-vars.rst
index ab7022b..b51fd0f 100644
--- a/Help/release/dev/cpack-deb-new-component-vars.rst
+++ b/Help/release/dev/cpack-deb-new-component-vars.rst
@@ -1,7 +1,7 @@
 cpack-deb-new-component-vars
 ----------------------------------
 
-* The :module:`CPackDeb` module learned to set package section
-  and priority per-component.
+* The :module:`CPackDeb` module learned to set Package, Section
+  and Priority control fields per-component.
   See :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_SECTION`
   and :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_PRIORITY`.
diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index 7e9eb86..2aaef61 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -29,10 +29,18 @@
 # .. variable:: CPACK_DEBIAN_PACKAGE_NAME
 #               CPACK_DEBIAN_<COMPONENT>_PACKAGE_NAME
 #
-#  The Debian package summary
+#  Set Package control field (variable is automatically transformed to lower
+#  case).
 #
 #  * Mandatory : YES
-#  * Default   : :variable:`CPACK_PACKAGE_NAME` (lower case)
+#  * Default   :
+#
+#    - :variable:`CPACK_PACKAGE_NAME` for non-component based
+#      installations
+#    - :variable:`CPACK_DEBIAN_PACKAGE_NAME` suffixed with -<COMPONENT>
+#      for component-based installations.
+#
+#  See https://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-Source
 #
 #
 # .. variable:: CPACK_DEBIAN_PACKAGE_VERSION

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3fd6cb7a7894811679d8423ad301b55b520d6ae2
commit 3fd6cb7a7894811679d8423ad301b55b520d6ae2
Author:     Markus Rickert <rickert at fortiss.org>
AuthorDate: Sun Nov 8 23:44:00 2015 +0100
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Sun Nov 8 23:44:00 2015 +0100

    CPackDeb: set package control field per component

diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index 722dca4..7e9eb86 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -27,6 +27,7 @@
 # However as a handy reminder here comes the list of specific variables:
 #
 # .. variable:: CPACK_DEBIAN_PACKAGE_NAME
+#               CPACK_DEBIAN_<COMPONENT>_PACKAGE_NAME
 #
 #  The Debian package summary
 #
@@ -603,7 +604,7 @@ function(cpack_deb_prepare_package_vars)
   # if per-component variable, overrides the global CPACK_DEBIAN_PACKAGE_${variable_type_}
   # automatic dependency discovery will be performed afterwards.
   if(CPACK_DEB_PACKAGE_COMPONENT)
-    foreach(value_type_ DEPENDS RECOMMENDS SUGGESTS PREDEPENDS ENHANCES BREAKS CONFLICTS PROVIDES REPLACES SOURCE SECTION PRIORITY)
+    foreach(value_type_ DEPENDS RECOMMENDS SUGGESTS PREDEPENDS ENHANCES BREAKS CONFLICTS PROVIDES REPLACES SOURCE SECTION PRIORITY NAME)
       set(_component_var "CPACK_DEBIAN_${_local_component_name}_PACKAGE_${value_type_}")
 
       # if set, overrides the global variable
@@ -704,10 +705,11 @@ function(cpack_deb_prepare_package_vars)
       endif()
     endforeach()
 
-    set(CPACK_DEB_PACKAGE_COMPONENT_PART_NAME "-${CPACK_DEB_PACKAGE_COMPONENT}")
-    string(TOLOWER "${CPACK_PACKAGE_NAME}${CPACK_DEB_PACKAGE_COMPONENT_PART_NAME}" CPACK_DEBIAN_PACKAGE_NAME)
-  else()
-    set(CPACK_DEB_PACKAGE_COMPONENT_PART_NAME "")
+    if(CPACK_DEBIAN_${_local_component_name}_PACKAGE_NAME)
+      string(TOLOWER "${CPACK_DEBIAN_${_local_component_name}_PACKAGE_NAME}" CPACK_DEBIAN_PACKAGE_NAME)
+    else()
+      string(TOLOWER "${CPACK_DEBIAN_PACKAGE_NAME}-${CPACK_DEB_PACKAGE_COMPONENT}" CPACK_DEBIAN_PACKAGE_NAME)
+    endif()
   endif()
 
   # Print out some debug information if we were asked for that

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

Summary of changes:
 Help/release/dev/cpack-deb-new-component-vars.rst |    4 ++--
 Modules/CPackDeb.cmake                            |   24 +++++++++++++++------
 2 files changed, 19 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake