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 413a13f7fd48ab67d479e2f127293c8ad7781a3c (commit)
via 2b0af9c4e074f5c8171b4bae46c4212356c29c9b (commit)
from c505d2d9e51d05c4f0437b4b3d9704a8f884e9c2 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=413a13f7fd48ab67d479e2f127293c8ad7781a3c
commit 413a13f7fd48ab67d479e2f127293c8ad7781a3c
Merge: c505d2d 2b0af9c
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Mon Jul 13 18:14:14 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Jul 13 18:14:14 2015 -0400
Merge topic 'cpack-per-component-extra-controll-file' into next
2b0af9c4 Revert "CPackDeb: mark variables with COMPONENT version in docs"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2b0af9c4e074f5c8171b4bae46c4212356c29c9b
commit 2b0af9c4e074f5c8171b4bae46c4212356c29c9b
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Tue Jul 14 00:13:30 2015 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Tue Jul 14 00:13:30 2015 +0200
Revert "CPackDeb: mark variables with COMPONENT version in docs"
diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index 825d5b7..75e9966 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -18,11 +18,9 @@
# :code:`CPACK_DEBIAN_XXX` variables.
#
# :code:`CPACK_DEBIAN_<COMPONENT>_XXXX` variables may be used in order to have
-# **component** specific values. Note however that <COMPONENT> refers to the
+# **component** specific values. Note however that <COMPONENT> refers to the
# **grouping name** written in upper case. It may be either a component name or
-# a component GROUP name. Variables that have <COMPONENT> version are marked
-# with :code:`Component : YES` and by default non component version value is
-# used as fallback if component version of the variable is not set.
+# a component GROUP name.
#
# You'll find a detailed usage on the wiki:
# http://www.cmake.org/Wiki/CMake:CPackPackageGenerators#DEB_.28UNIX_only.29 .
@@ -33,7 +31,6 @@
# The Debian package summary
#
# * Mandatory : YES
-# * Component : NO
# * Default : :variable:`CPACK_PACKAGE_NAME` (lower case)
#
#
@@ -42,7 +39,6 @@
# The Debian package version
#
# * Mandatory : YES
-# * Component : NO
# * Default : :variable:`CPACK_PACKAGE_VERSION`
#
#
@@ -51,17 +47,16 @@
# The Debian package architecture
#
# * Mandatory : YES
-# * Component : NO
# * Default : Output of :code:`dpkg --print-architecture` (or :code:`i386`
# if :code:`dpkg` is not found)
#
#
# .. variable:: CPACK_DEBIAN_PACKAGE_DEPENDS
+# CPACK_DEBIAN_<COMPONENT>_PACKAGE_DEPENDS
#
# Sets the Debian dependencies of this package.
#
# * Mandatory : NO
-# * Component : YES
# * Default :
#
# - An empty string for non-component based installations
@@ -88,16 +83,15 @@
# The Debian package maintainer
#
# * Mandatory : YES
-# * Component : NO
# * Default : :code:`CPACK_PACKAGE_CONTACT`
#
#
# .. variable:: CPACK_DEBIAN_PACKAGE_DESCRIPTION
+# CPACK_COMPONENT_<COMPONENT>_DESCRIPTION
#
# The Debian package description
#
# * Mandatory : YES
-# * Component : YES
# * Default :
#
# - :variable:`CPACK_DEBIAN_PACKAGE_DESCRIPTION` if set or
@@ -107,7 +101,6 @@
# .. variable:: CPACK_DEBIAN_PACKAGE_SECTION
#
# * Mandatory : YES
-# * Component : NO
# * Default : 'devel'
#
# .. variable:: CPACK_DEBIAN_COMPRESSION_TYPE
@@ -116,7 +109,6 @@
# Possible values are: lzma, xz, bzip2 and gzip.
#
# * Mandatory : YES
-# * Component : NO
# * Default : 'gzip'
#
#
@@ -125,7 +117,6 @@
# The Debian package priority
#
# * Mandatory : YES
-# * Component : NO
# * Default : 'optional'
#
#
@@ -136,7 +127,6 @@
# upstream documentation or information may be found.
#
# * Mandatory : NO
-# * Component : NO
# * Default : -
#
# .. note::
@@ -146,12 +136,12 @@
#
#
# .. variable:: CPACK_DEBIAN_PACKAGE_SHLIBDEPS
+# CPACK_DEBIAN_<COMPONENT>_PACKAGE_SHLIBDEPS
#
# May be set to ON in order to use :code:`dpkg-shlibdeps` to generate
# better package dependency list.
#
# * Mandatory : NO
-# * Component : YES
# * Default :
#
# - :variable:`CPACK_DEBIAN_PACKAGE_SHLIBDEPS` if set or
@@ -171,7 +161,6 @@
# during CPackDeb run.
#
# * Mandatory : NO
-# * Component : NO
# * Default : -
#
# .. variable:: CPACK_DEBIAN_PACKAGE_PREDEPENDS
@@ -183,7 +172,6 @@
# pre-dependency.
#
# * Mandatory : NO
-# * Component : NO
# * Default : -
#
# See
http://www.debian.org/doc/debian-policy/ch-relationships.html#s-binarydeps
@@ -196,7 +184,6 @@
# functionality of another package.
#
# * Mandatory : NO
-# * Component : NO
# * Default : -
#
# See
http://www.debian.org/doc/debian-policy/ch-relationships.html#s-binarydeps
@@ -212,7 +199,6 @@
# packages (B) cannot be reconfigured again.
#
# * Mandatory : NO
-# * Component : NO
# * Default : -
#
# See https://www.debian.org/doc/debian-policy/ch-relationships.html#s-breaks
@@ -226,7 +212,6 @@
# the same time.
#
# * Mandatory : NO
-# * Component : NO
# * Default : -
#
# See
https://www.debian.org/doc/debian-policy/ch-relationships.html#s-conflicts
@@ -246,7 +231,6 @@
# another package.
#
# * Mandatory : NO
-# * Component : NO
# * Default : -
#
# See https://www.debian.org/doc/debian-policy/ch-relationships.html#s-virtual
@@ -259,7 +243,6 @@
# files in certain other packages, or completely replace other packages.
#
# * Mandatory : NO
-# * Component : NO
# * Default : -
#
# See
http://www.debian.org/doc/debian-policy/ch-relationships.html#s-binarydeps
@@ -272,7 +255,6 @@
# packages.
#
# * Mandatory : NO
-# * Component : NO
# * Default : -
#
# See
http://www.debian.org/doc/debian-policy/ch-relationships.html#s-binarydeps
@@ -284,20 +266,19 @@
# Allows packages to declare a suggested package install grouping.
#
# * Mandatory : NO
-# * Component : NO
# * Default : -
#
# See
http://www.debian.org/doc/debian-policy/ch-relationships.html#s-binarydeps
#
#
# .. variable:: CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA
+# CPACK_DEBIAN_<COMPONENT>_PACKAGE_CONTROL_EXTRA
#
# This variable allow advanced user to add custom script to the
# control.tar.gz.
# Typical usage is for conffiles, postinst, postrm, prerm.
#
# * Mandatory : NO
-# * Component : YES
# * Default : -
#
# Usage::
-----------------------------------------------------------------------
Summary of changes:
Modules/CPackDeb.cmake | 31 ++++++-------------------------
1 file changed, 6 insertions(+), 25 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
