[Cmake-commits] CMake branch, next, updated. v3.0.0-rc6-3393-gf7877d4

[Nils Gladitz]

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  f7877d40b9668b374a3c90da8b09351555cc31c6 (commit)
       via  21ec5f8451884435aec7291bd3cc049389f5fb82 (commit)
       via  960f140d19c9432f5e901cc2a1f24725f6fbc83e (commit)
      from  4021498fbed20940dd1b0f66bae82291ad25f8a5 (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=f7877d40b9668b374a3c90da8b09351555cc31c6
commit f7877d40b9668b374a3c90da8b09351555cc31c6
Merge: 4021498 21ec5f8
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Wed May 28 07:18:55 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 28 07:18:55 2014 -0400

    Merge topic 'dpkg-shlibdeps-locale' into next
    
    21ec5f84 CPackDeb: Invoke "dpkg-shlibdeps --version" with C locale
    960f140d CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=21ec5f8451884435aec7291bd3cc049389f5fb82
commit 21ec5f8451884435aec7291bd3cc049389f5fb82
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Wed May 28 13:17:57 2014 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Wed May 28 13:17:57 2014 +0200

    CPackDeb: Invoke "dpkg-shlibdeps --version" with C locale
    
    The version message is localized and may not match when a non-english locale is in use.

diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index 458bbed..8a4fa49 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -240,7 +240,7 @@ if(CPACK_DEBIAN_PACKAGE_SHLIBDEPS)
 
   # Check version of the dpkg-shlibdeps tool using CPackRPM method
   if(SHLIBDEPS_EXECUTABLE)
-    execute_process(COMMAND ${SHLIBDEPS_EXECUTABLE} --version
+    execute_process(COMMAND env LC_ALL=C ${SHLIBDEPS_EXECUTABLE} --version
       OUTPUT_VARIABLE _TMP_VERSION
       ERROR_QUIET
       OUTPUT_STRIP_TRAILING_WHITESPACE)

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

Summary of changes:
 Modules/CPackDeb.cmake    |    2 +-
 Source/CMakeVersion.cmake |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake