[Cmake-commits] CMake branch, next, updated. v3.6.1-1844-g10ca709

[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, next has been updated
       via  10ca7096fadc19f2f005a7f5efc3c71ecc7448ec (commit)
       via  9343a6d101cfdf5489bcc09435a16d36ea858539 (commit)
      from  0aeffa8d1ffc19161fb49220441e39121872da5b (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=10ca7096fadc19f2f005a7f5efc3c71ecc7448ec
commit 10ca7096fadc19f2f005a7f5efc3c71ecc7448ec
Merge: 0aeffa8 9343a6d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 7 09:32:12 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 7 09:32:12 2016 -0400

    Merge topic 'cpack-deb-package-description-fallback' into next
    
    9343a6d1 fixup! cpack-deb-package-description-fallback


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9343a6d101cfdf5489bcc09435a16d36ea858539
commit 9343a6d101cfdf5489bcc09435a16d36ea858539
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 7 09:25:25 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 7 09:31:53 2016 -0400

    fixup! cpack-deb-package-description-fallback

diff --git a/Help/release/dev/cpack-deb-package-description-fallback b/Help/release/dev/cpack-deb-package-description-fallback
deleted file mode 100644
index 6300dfc..0000000
--- a/Help/release/dev/cpack-deb-package-description-fallback
+++ /dev/null
@@ -1,11 +0,0 @@
-cpack-deb-package-description-fallback
---------------------------------------
-
-* The :module:`CPackDeb` module learned new package description
-  override rules to match :module:`CPackRPM` module behavior.
-  **Breaking change**: If :variable:`CPACK_PACKAGE_DESCRIPTION_FILE`
-  variable is set to non default location then it is prefered to
-  :variable:`CPACK_PACKAGE_DESCRIPTION_SUMMARY` variable.
-  Also a new :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_DESCRIPTION`
-  was introduced for component based packaging.
-  See :variable:`CPACK_DEBIAN_PACKAGE_DESCRIPTION`.
diff --git a/Help/release/dev/cpack-deb-package-description-fallback.rst b/Help/release/dev/cpack-deb-package-description-fallback.rst
new file mode 100644
index 0000000..71ca821
--- /dev/null
+++ b/Help/release/dev/cpack-deb-package-description-fallback.rst
@@ -0,0 +1,15 @@
+cpack-deb-package-description-fallback
+--------------------------------------
+
+* The :module:`CPackDeb` module gained a new
+  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_DESCRIPTION`
+  variable for component-specific package descriptions.
+
+* The :module:`CPackDeb` module changed its package description
+  override rules to match :module:`CPackRPM` module behavior.
+  If the :variable:`CPACK_PACKAGE_DESCRIPTION_FILE` variable is set to
+  a non-default location then it is preferred to the
+  :variable:`CPACK_PACKAGE_DESCRIPTION_SUMMARY` variable.
+  This is a behavior change from previous versions but produces
+  more consistent and expected behavior.
+  See :variable:`CPACK_DEBIAN_PACKAGE_DESCRIPTION`.

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

Summary of changes:
 Help/release/dev/cpack-deb-package-description-fallback |   11 -----------
 .../dev/cpack-deb-package-description-fallback.rst      |   15 +++++++++++++++
 2 files changed, 15 insertions(+), 11 deletions(-)
 delete mode 100644 Help/release/dev/cpack-deb-package-description-fallback
 create mode 100644 Help/release/dev/cpack-deb-package-description-fallback.rst


hooks/post-receive
-- 
CMake