[Cmake-commits] CMake branch, next, updated. v2.8.4-1402-g8983cb1

[Eric Noulard]

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  8983cb1d0b9a083ef08b0e338e18d048a741668c (commit)
       via  b22fcfb0c55ec145a4cf7405120c708fa136d928 (commit)
       via  4e9506ac31705f5099f226128b98ae12a4ba9772 (commit)
      from  c97d814e780fd79a600934092d185cc73ffa9b24 (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=8983cb1d0b9a083ef08b0e338e18d048a741668c
commit 8983cb1d0b9a083ef08b0e338e18d048a741668c
Merge: c97d814 b22fcfb
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Sat Apr 9 03:32:06 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Apr 9 03:32:06 2011 -0400

    Merge topic 'CPackDeb-fix12061' into next
    
    b22fcfb CPackDeb: Handle dirs for CONTROL_EXTRA correctly when packaging components
    4e9506a KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b22fcfb0c55ec145a4cf7405120c708fa136d928
commit b22fcfb0c55ec145a4cf7405120c708fa136d928
Author:     Martin Konrad <konrad at ikp.tu-darmstadt.de>
AuthorDate: Sat Apr 9 09:30:19 2011 +0200
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Sat Apr 9 09:30:19 2011 +0200

    CPackDeb: Handle dirs for CONTROL_EXTRA correctly when packaging components
    
    Copy the files specified in CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA to the right
    directory when packaging components. This fixes #12061.
    Signed-off-by: Eric NOULARD <eric.noulard at gmail.com>

diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx
index 5665404..8c19bbd 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -491,7 +491,7 @@ int cmCPackDebGenerator::createDeb()
       {
       std::string filenamename =
         cmsys::SystemTools::GetFilenameName(i->c_str());
-      std::string localcopy = toplevel;
+      std::string localcopy = this->GetOption("WDIR");
       localcopy += "/";
       localcopy += filenamename;
       // if we can copy the file, it means it does exist, let's add it:

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

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


hooks/post-receive
-- 
CMake