[Cmake-commits] CMake branch, next, updated. v2.8.7-3468-gaaeb30a

Eric Noulard eric.noulard at gmail.com
Tue Apr 17 03:25:26 EDT 2012


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  aaeb30afe2776aa44fd2930f8b3cdd2afaaadc69 (commit)
       via  abc9b32375952ab0a6a67f513a7f8dc594b06049 (commit)
       via  233b5cbaf70b9791df06e7e96737214e40780595 (commit)
      from  5d8d135a1d8b3d04cda57f14bc6145efc9d3a1be (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=aaeb30afe2776aa44fd2930f8b3cdd2afaaadc69
commit aaeb30afe2776aa44fd2930f8b3cdd2afaaadc69
Merge: 5d8d135 abc9b32
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Tue Apr 17 03:25:22 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Apr 17 03:25:22 2012 -0400

    Merge topic 'CPackDeb-fixFakerootOnControl' into next
    
    abc9b32 Use fakeroot for control.tar.gz as well
    233b5cb KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=abc9b32375952ab0a6a67f513a7f8dc594b06049
commit abc9b32375952ab0a6a67f513a7f8dc594b06049
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Tue Apr 17 09:22:07 2012 +0200
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Tue Apr 17 09:22:07 2012 +0200

    Use fakeroot for control.tar.gz as well

diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx
index 178a18d..fa456de 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -480,11 +480,16 @@ int cmCPackDebGenerator::createDeb()
     // Do not end the md5sum file with yet another (invalid)
     }
 
-  cmd = "\"";
-  cmd += cmakeExecutable;
-  cmd += "\" -E tar cfz control.tar.gz ./control ./md5sums";
-  const char* controlExtra =
-    this->GetOption("CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA");
+    cmd = "";
+    if (NULL != this->GetOption("CPACK_DEBIAN_FAKEROOT_EXECUTABLE"))
+      {
+      cmd = this->GetOption("CPACK_DEBIAN_FAKEROOT_EXECUTABLE");
+      }
+    cmd += " \"";
+    cmd += cmakeExecutable;
+    cmd += "\" -E tar cfz control.tar.gz ./control ./md5sums";
+    const char* controlExtra =
+      this->GetOption("CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA");
   if( controlExtra )
     {
     std::vector<std::string> controlExtraList;

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

Summary of changes:
 Source/CPack/cmCPackDebGenerator.cxx |   15 ++++++++++-----
 Source/kwsys/kwsysDateStamp.cmake    |    2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list