[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-907-g22bded4

[Brad King]

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  22bded47beb0417d004d152ab35e2b57b9e3c338 (commit)
       via  66178ae5a0a154c11934574347b75e71772b77b9 (commit)
      from  9a24d6a269df453ce684bfe856b7a3570f5b141f (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=22bded47beb0417d004d152ab35e2b57b9e3c338
commit 22bded47beb0417d004d152ab35e2b57b9e3c338
Merge: 9a24d6a 66178ae
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 23 11:03:46 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 23 11:03:46 2015 -0400

    Merge topic 'cpack-deb-fakeroot-removal' into next
    
    66178ae5 CPackDEB: Use proper compression scheme for control.tar.gz


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=66178ae5a0a154c11934574347b75e71772b77b9
commit 66178ae5a0a154c11934574347b75e71772b77b9
Author:     Raffi Enficiaud <raffi.enficiaud at mines-paris.org>
AuthorDate: Fri Oct 23 12:01:35 2015 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 23 10:58:43 2015 -0400

    CPackDEB: Use proper compression scheme for control.tar.gz
    
    Changes in commit v3.4.0-rc1~79^2~1 (CPackDeb: use of libarchive and
    removal of fakeroot, 2015-09-11) accidentally set the wrong compression
    scheme for the `control.tar.gz` file.  Set it explicitly to GZip.

diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx
index 9402689..f9dfdf6 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -565,7 +565,7 @@ int cmCPackDebGenerator::createDeb()
       return 0;
       }
     cmArchiveWrite control_tar(fileStream_control_tar,
-                               tar_compression_type,
+                               cmArchiveWrite::CompressGZip,
                                "paxr");
 
     // sets permissions and uid/gid for the files

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

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


hooks/post-receive
-- 
CMake