added 2 changesets to branch 'refs/remotes/weinhold-github/pm-flat' old head: 90692f47f7132ef806aef9e210684520d91f2a4f new head: a8026c5f5771f8b1e51a4ec38fdde3366bf0f6dc overview: https://github.com/weinhold/Haiku/compare/90692f4...a8026c5 ---------------------------------------------------------------------------- dd60d4e: OptionalPackages: Fix CVS URL Due to a copy'n'paste error the curl package was used. While at it, use the rebuilt package. a8026c5: haiku package info: List zlib in provides [ Ingo Weinhold <ingo_weinhold@xxxxxx> ] ---------------------------------------------------------------------------- 2 files changed, 3 insertions(+), 2 deletions(-) build/jam/OptionalPackages | 4 ++-- src/data/package_infos/haiku | 1 + ############################################################################ Commit: dd60d4eef66f09888d14f599592956143c02a2a3 Author: Ingo Weinhold <ingo_weinhold@xxxxxx> Date: Thu Mar 28 12:16:41 2013 UTC OptionalPackages: Fix CVS URL Due to a copy'n'paste error the curl package was used. While at it, use the rebuilt package. ---------------------------------------------------------------------------- diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index 0707506..c783890 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -466,8 +466,8 @@ if [ IsOptionalHaikuImagePackageAdded CVS ] { : : true ; } else { InstallOptionalHaikuImagePackage - cvs-1.12.13.1-1-x86_gcc2.hpkg - : $(hpkgBaseURL)/curl-7.21.6-1-x86_gcc2.hpkg + cvs-1.12.13.1-2-x86_gcc2.hpkg + : $(hpkgBaseURL)/cvs-1.12.13.1-2-x86_gcc2.hpkg : common packages ; } } ############################################################################ Commit: a8026c5f5771f8b1e51a4ec38fdde3366bf0f6dc Author: Ingo Weinhold <ingo_weinhold@xxxxxx> Date: Thu Mar 28 12:18:21 2013 UTC haiku package info: List zlib in provides ---------------------------------------------------------------------------- diff --git a/src/data/package_infos/haiku b/src/data/package_infos/haiku index 8dbcb88..5501392 100644 --- a/src/data/package_infos/haiku +++ b/src/data/package_infos/haiku @@ -30,6 +30,7 @@ provides { cmd:unzip=5.50 compat>=0.0 cmd:wget=0.0.0 cmd:zip=2.32 compat>=0.0 + lib:zlib=1.2.5 compat>=1 } requires {