[Cmake-commits] CMake branch, next, updated. v2.8.2-297-gc1cf112

[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  c1cf11275df47a8eff96e13322b5df065c027b39 (commit)
       via  5495a6d9756099d5eddfc99c938ab6ba9bd95113 (commit)
      from  5514d8031137580ac77d0f5a22a6597d9195f3e6 (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=c1cf11275df47a8eff96e13322b5df065c027b39
commit c1cf11275df47a8eff96e13322b5df065c027b39
Merge: 5514d80 5495a6d
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Wed Jul 28 17:04:45 2010 +0200
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Wed Jul 28 17:04:45 2010 +0200

    Merge branch 'CPackDEB-wrong-install-size' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5495a6d9756099d5eddfc99c938ab6ba9bd95113
commit 5495a6d9756099d5eddfc99c938ab6ba9bd95113
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Wed Jul 28 17:03:14 2010 +0200
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Wed Jul 28 17:03:14 2010 +0200

    CPackDEB:  merge wrong installed size patch. see bugs 10296 (and 10292)

diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx
index cee24ef..5c09d31 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -121,7 +121,7 @@ int cmCPackDebGenerator::CompressFiles(const char* outFileName,
         totalSize += cmSystemTools::FileLength(fileIt->c_str());
         }
     }
-    out << "Installed-Size: " << totalSize << "\n";
+    out << "Installed-Size: " << (totalSize + 1023) / 1024 << "\n";
     out << "Maintainer: " << maintainer << "\n";
     out << "Description: " << desc << "\n";
     out << std::endl;

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

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


hooks/post-receive
-- 
CMake