[Cmake-commits] CMake branch, next, updated. v3.7.1-1836-ge2747bb

[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  e2747bb4fca04ea829223496b39036c2b4627e7b (commit)
       via  04f8752d1d46ecc1d55f50fb5dae195390e345b3 (commit)
      from  a1d713f219bab2475c540af474d80c4949234da0 (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=e2747bb4fca04ea829223496b39036c2b4627e7b
commit e2747bb4fca04ea829223496b39036c2b4627e7b
Merge: a1d713f 04f8752
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Wed Dec 21 12:19:23 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 21 12:19:23 2016 -0500

    Merge topic 'cpack-deb-md5sums-paths-fix' into next
    
    04f8752d fixup! CPack/Deb invalid md5sums file fix


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=04f8752d1d46ecc1d55f50fb5dae195390e345b3
commit 04f8752d1d46ecc1d55f50fb5dae195390e345b3
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Wed Dec 21 18:18:42 2016 +0100
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Wed Dec 21 18:18:42 2016 +0100

    fixup! CPack/Deb invalid md5sums file fix

diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx
index d45eb78..5c50da8 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -175,8 +175,9 @@ int cmCPackDebGenerator::PackageComponentsAllInOne(
   // all GROUP in one vs all COMPONENT in one
   // if must be here otherwise non component paths have a trailing / while
   // components don't
-  if (!compInstDirName.empty())
+  if (!compInstDirName.empty()) {
     localToplevel += "/" + compInstDirName;
+  }
 
   /* replace the TEMP DIRECTORY with the component one */
   this->SetOption("CPACK_TEMPORARY_DIRECTORY", localToplevel.c_str());

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

Summary of changes:
 Source/CPack/cmCPackDebGenerator.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake