# # patch "ChangeLog" # from [70c98ce4850f58f54ada25e88a0da7a029af3ef2] # to [1f76a596291d3d7bd8ffef81b4a8cf55722398e2] # # patch "INSTALL" # from [17a96a9ac85d9256eebb29e0b9ebf6c7a9c1ee4d] # to [e3d2ea39e13d90de37d2ebfc96da0a45541b5df3] # # patch "debian/control" # from [ebf99dead1ad25f5504309250bcf5f2125687ef2] # to [9476e79f8358ecb87a8e1c88bcd527973be62cd3] # ======================================================================== --- ChangeLog 70c98ce4850f58f54ada25e88a0da7a029af3ef2 +++ ChangeLog 1f76a596291d3d7bd8ffef81b4a8cf55722398e2 @@ -1,3 +1,8 @@ +2005-10-26 Matt Johnston + + * INSTALL: mention that zlib is required + * debian/control: monotone doesn't work over plain network protocols + 2005-10-24 Benoît Dejean * commands.cc: Merged 2 i18n strings. ======================================================================== --- INSTALL 17a96a9ac85d9256eebb29e0b9ebf6c7a9c1ee4d +++ INSTALL e3d2ea39e13d90de37d2ebfc96da0a45541b5df3 @@ -14,6 +14,7 @@ - a supported C++ compiler: g++ 3.2 or later. - an installed copy of boost 1.32.0 or later. + - zlib 1.1.4 or later. on debian: ======================================================================== --- debian/control ebf99dead1ad25f5504309250bcf5f2125687ef2 +++ debian/control 9476e79f8358ecb87a8e1c88bcd527973be62cd3 @@ -15,6 +15,6 @@ Monotone is a free, distributed version control system. It provides fully disconnected operation, manages complete tree versions, keeps its state in a local transactional database, supports overlapping + branches and extensible metadata, uses an efficient peer-to-peer + network protocol, performs history-sensitive merging, and delegates + trust functions to client-side RSA certificates. - branches and extensible metadata, exchanges work over plain network - protocols, performs history-sensitive merging, and delegates trust - functions to client-side RSA certificates.