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 8f876dfdc3d7f3b609f1b4aa9084bc60b86139a8 (commit)
via 3be9d3d9790ae5cbbe419dd474b6984a0631a6fd (commit)
via 57672e7275fc12534b5b13f9c922fe569936c81a (commit)
via a45a4b2d86bf7d03d690433c3b1299ace1e6dbe0 (commit)
via a60574f1bfbb5a153b7e55cf5183be93ac50bea0 (commit)
from b4751893d6596db6dba0b1d44ea19390308ef549 (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=8f876dfdc3d7f3b609f1b4aa9084bc60b86139a8
commit 8f876dfdc3d7f3b609f1b4aa9084bc60b86139a8
Merge: b475189 3be9d3d
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Nov 9 10:00:12 2015 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Nov 9 10:00:12 2015 -0500
Merge topic 'cpack-deb-new-component-vars' into next
3be9d3d9 Help: Add notes for topic 'cpack-deb-new-component-vars'
57672e72 CPackDeb: CPACK_DEBIAN_PACKAGE_NAME documentation improvement
a45a4b2d CPackDeb: set package control field per component
a60574f1 CPackDeb: set priority control field per component
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3be9d3d9790ae5cbbe419dd474b6984a0631a6fd
commit 3be9d3d9790ae5cbbe419dd474b6984a0631a6fd
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Sun Nov 8 23:46:13 2015 +0100
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Nov 9 09:58:45 2015 -0500
Help: Add notes for topic 'cpack-deb-new-component-vars'
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..b51fd0f
--- /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 control fields per-component.
+ See :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_SECTION`
+ and :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_PRIORITY`.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=57672e7275fc12534b5b13f9c922fe569936c81a
commit 57672e7275fc12534b5b13f9c922fe569936c81a
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Sun Nov 8 23:46:13 2015 +0100
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Nov 9 09:58:30 2015 -0500
CPackDeb: CPACK_DEBIAN_PACKAGE_NAME documentation improvement
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=a45a4b2d86bf7d03d690433c3b1299ace1e6dbe0
commit a45a4b2d86bf7d03d690433c3b1299ace1e6dbe0
Author: Markus Rickert <rick...@fortiss.org>
AuthorDate: Sun Nov 8 23:44:00 2015 +0100
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Nov 9 09:57:48 2015 -0500
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
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a60574f1bfbb5a153b7e55cf5183be93ac50bea0
commit a60574f1bfbb5a153b7e55cf5183be93ac50bea0
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Sun Nov 8 22:35:30 2015 +0100
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Nov 9 09:57:43 2015 -0500
CPackDeb: set priority control field per component
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
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
