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 7621f4f4012d900cd6fb588fed076857de5521e0 (commit) via a4c0917e1eebd45e5ba409c7fcb28b7a2eb9225b (commit) via 24012e3c15c127fe570a222fc8cde37cf2a27023 (commit) via 47182ab876260c20554d8c5e3e8f453264a47b53 (commit) via f071d8ebd4a7bd34f52c92cec539a6afb8f277e6 (commit) via da65c5191c7692d2f733561eef336eea675f42a5 (commit) from 382dcfc4eea6ed4ff12fe1a1dfd5fe243fd3774d (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=7621f4f4012d900cd6fb588fed076857de5521e0 commit 7621f4f4012d900cd6fb588fed076857de5521e0 Merge: 382dcfc a4c0917 Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Sun Nov 8 16:36:14 2015 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Sun Nov 8 16:36:14 2015 -0500 Merge topic 'cpack-deb-new-component-vars' into next a4c0917e CPackDeb: set priority control field per component 24012e3c CPackDeb: additional CPACK_DEBIAN_PACKAGE_SECTION documentation 47182ab8 CPackDeb: set section control field per component f071d8eb CMake Nightly Date Stamp da65c519 CMake Nightly Date Stamp https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a4c0917e1eebd45e5ba409c7fcb28b7a2eb9225b commit a4c0917e1eebd45e5ba409c7fcb28b7a2eb9225b Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Sun Nov 8 22:35:30 2015 +0100 Commit: Domen Vrankar <domen.vran...@gmail.com> CommitDate: Sun Nov 8 22:35:30 2015 +0100 CPackDeb: set priority control field per component diff --git a/Help/release/dev/cpack-deb-new-component-vars.rst b/Help/release/dev/cpack-deb-new-component-vars.rst new file mode 100644 index 0000000..ab7022b --- /dev/null +++ b/Help/release/dev/cpack-deb-new-component-vars.rst @@ -0,0 +1,7 @@ +cpack-deb-new-component-vars +---------------------------------- + +* The :module:`CPackDeb` module learned to set package section + and priority 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 e2c2312..722dca4 100644 --- a/Modules/CPackDeb.cmake +++ b/Modules/CPackDeb.cmake @@ -120,12 +120,16 @@ # # # .. variable:: CPACK_DEBIAN_PACKAGE_PRIORITY +# CPACK_DEBIAN_<COMPONENT>_PACKAGE_PRIORITY # -# The Debian package priority +# Set Priority control field e.g. required, important, standard, optional, +# extra # # * Mandatory : YES # * Default : 'optional' # +# See https://www.debian.org/doc/debian-policy/ch-archive.html#s-priorities +# # # .. variable:: CPACK_DEBIAN_PACKAGE_HOMEPAGE # @@ -599,7 +603,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) + foreach(value_type_ DEPENDS RECOMMENDS SUGGESTS PREDEPENDS ENHANCES BREAKS CONFLICTS PROVIDES REPLACES SOURCE SECTION PRIORITY) set(_component_var "CPACK_DEBIAN_${_local_component_name}_PACKAGE_${value_type_}") # if set, overrides the global variable https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=24012e3c15c127fe570a222fc8cde37cf2a27023 commit 24012e3c15c127fe570a222fc8cde37cf2a27023 Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Sun Nov 8 22:17:27 2015 +0100 Commit: Domen Vrankar <domen.vran...@gmail.com> CommitDate: Sun Nov 8 22:21:09 2015 +0100 CPackDeb: additional CPACK_DEBIAN_PACKAGE_SECTION documentation diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake index 2c1f236..e2c2312 100644 --- a/Modules/CPackDeb.cmake +++ b/Modules/CPackDeb.cmake @@ -102,9 +102,14 @@ # .. variable:: CPACK_DEBIAN_PACKAGE_SECTION # CPACK_DEBIAN_<COMPONENT>_PACKAGE_SECTION # +# Set Section control field e.g. admin, devel, doc, ... +# # * Mandatory : YES # * Default : 'devel' # +# See https://www.debian.org/doc/debian-policy/ch-archive.html#s-subsections +# +# # .. variable:: CPACK_DEBIAN_COMPRESSION_TYPE # # The compression used for creating the Debian package. https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=47182ab876260c20554d8c5e3e8f453264a47b53 commit 47182ab876260c20554d8c5e3e8f453264a47b53 Author: Markus Rickert <rick...@fortiss.org> AuthorDate: Sun Nov 8 22:10:12 2015 +0100 Commit: Domen Vrankar <domen.vran...@gmail.com> CommitDate: Sun Nov 8 22:19:37 2015 +0100 CPackDeb: set section control field per component diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake index 875a534..2c1f236 100644 --- a/Modules/CPackDeb.cmake +++ b/Modules/CPackDeb.cmake @@ -100,6 +100,7 @@ # # # .. variable:: CPACK_DEBIAN_PACKAGE_SECTION +# CPACK_DEBIAN_<COMPONENT>_PACKAGE_SECTION # # * Mandatory : YES # * Default : 'devel' @@ -590,18 +591,18 @@ function(cpack_deb_prepare_package_vars) # You should set: DEBIAN_PACKAGE_DEPENDS # TODO: automate 'objdump -p | grep NEEDED' - # if per-component dependency, overrides the global CPACK_DEBIAN_PACKAGE_${dependency_type_} + # 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(dependency_type_ DEPENDS RECOMMENDS SUGGESTS PREDEPENDS ENHANCES BREAKS CONFLICTS PROVIDES REPLACES SOURCE) - set(_component_var "CPACK_DEBIAN_${_local_component_name}_PACKAGE_${dependency_type_}") + foreach(value_type_ DEPENDS RECOMMENDS SUGGESTS PREDEPENDS ENHANCES BREAKS CONFLICTS PROVIDES REPLACES SOURCE SECTION) + set(_component_var "CPACK_DEBIAN_${_local_component_name}_PACKAGE_${value_type_}") - # if set, overrides the global dependency + # if set, overrides the global variable if(DEFINED ${_component_var}) - set(CPACK_DEBIAN_PACKAGE_${dependency_type_} "${${_component_var}}") + set(CPACK_DEBIAN_PACKAGE_${value_type_} "${${_component_var}}") if(CPACK_DEBIAN_PACKAGE_DEBUG) - message("CPackDeb Debug: component '${_local_component_name}' ${dependency_type_} " - "dependencies set to '${CPACK_DEBIAN_PACKAGE_${dependency_type_}}'") + message("CPackDeb Debug: component '${_local_component_name}' ${value_type_} " + "value set to '${CPACK_DEBIAN_PACKAGE_${value_type_}}'") endif() endif() endforeach() ----------------------------------------------------------------------- Summary of changes: Help/release/dev/cpack-deb-new-component-vars.rst | 7 ++++++ Modules/CPackDeb.cmake | 26 ++++++++++++++------- Source/CMakeVersion.cmake | 2 +- 3 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 Help/release/dev/cpack-deb-new-component-vars.rst hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits