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 b195005741d7ec9f766fd2bd0c3d0287fed7ef78 (commit) via f7301e6e5f64cb42573ea7128eef3e7ba91a7779 (commit) from ebb7ff5b9ba490a8645de7092c729f211b8cd464 (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=b195005741d7ec9f766fd2bd0c3d0287fed7ef78 commit b195005741d7ec9f766fd2bd0c3d0287fed7ef78 Merge: ebb7ff5 f7301e6 Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Tue Dec 20 15:13:54 2016 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Tue Dec 20 15:13:54 2016 -0500 Merge topic 'cpack-deb-package-version-override-fix' into next f7301e6e CPackDeb: use CPACK_DEBIAN_PACKAGE_VERSION https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f7301e6e5f64cb42573ea7128eef3e7ba91a7779 commit f7301e6e5f64cb42573ea7128eef3e7ba91a7779 Author: Daniel Pfeifer <dan...@pfeifer-mail.de> AuthorDate: Tue Dec 20 14:09:20 2016 +0100 Commit: Domen Vrankar <domen.vran...@gmail.com> CommitDate: Tue Dec 20 21:07:25 2016 +0100 CPackDeb: use CPACK_DEBIAN_PACKAGE_VERSION diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake index bee69d9..ddf8b23 100644 --- a/Modules/CPackDeb.cmake +++ b/Modules/CPackDeb.cmake @@ -914,7 +914,7 @@ function(cpack_deb_prepare_package_vars) extract_so_info("${_FILE}" libname soversion) if(libname AND soversion) list(APPEND CPACK_DEBIAN_PACKAGE_SHLIBS_LIST - "${libname} ${soversion} ${CPACK_DEBIAN_PACKAGE_NAME} (${CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS_POLICY} ${CPACK_PACKAGE_VERSION})") + "${libname} ${soversion} ${CPACK_DEBIAN_PACKAGE_NAME} (${CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS_POLICY} ${CPACK_DEBIAN_PACKAGE_VERSION})") else() message(AUTHOR_WARNING "Shared library '${_FILE}' is missing soname or soversion. Library will not be added to DEBIAN/shlibs control file.") endif() @@ -967,7 +967,7 @@ function(cpack_deb_prepare_package_vars) # Patch package file name to be in corrent debian format: # <foo>_<VersionNumber>-<DebianRevisionNumber>_<DebianArchitecture>.deb set(CPACK_OUTPUT_FILE_NAME - "${CPACK_DEBIAN_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb") + "${CPACK_DEBIAN_PACKAGE_NAME}_${CPACK_DEBIAN_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb") else() cmake_policy(PUSH) cmake_policy(SET CMP0010 NEW) ----------------------------------------------------------------------- Summary of changes: Modules/CPackDeb.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits