Página inicial Explorar Ajuda
Entrar
RONCC
/
Big-Data-HPC-Platform
Observar 1
Favorito 0
Fork 0
Arquivos Issues 0 Pull Requests 0 Wiki
Ver código fonte

Merge branch 'candidate-5.0.6' into candidate-5.2.0

Conflicts:
	cmake_modules/dependencies/trusty.cmake
	cmake_modules/dependencies/utopic.cmake

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 10 anos atrás
pai
3647e93fb6 41a1e6900e
commit
e828f4d37b
2 arquivos alterados com 2 adições e 2 exclusões
Visão dividida Mostrar estatísticas do Diff
  1. 1 1
      cmake_modules/dependencies/trusty.cmake
  2. 1 1
      cmake_modules/dependencies/utopic.cmake

+ 1 - 1
cmake_modules/dependencies/trusty.cmake
Ver arquivo 

@@ -1 +1 @@
 
-set ( CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-regex1.54.0, libicu52, libxalan-c111, libxerces-c3.1, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive13, rsync, libapr1, libaprutil1, zip")
 
+set ( CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-regex1.54.0, libicu52, libxslt1, libxerces-c3.1, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive13, rsync, libapr1, libaprutil1, zip")

+ 1 - 1
cmake_modules/dependencies/utopic.cmake
Ver arquivo 

@@ -1 +1 @@
 
-set ( CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-regex1.55.0, libicu52, libxalan-c111, libxerces-c3.1, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive13, rsync, libapr1, libaprutil1")
 
+set ( CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-regex1.55.0, libicu52, libxslt1, libxerces-c3.1, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive13, rsync, libapr1, libaprutil1")