From: Lucas Nussbaum <lucas@debian.org>
Date: Wed, 30 Jul 2014 15:47:01 +0000 (+0200)
Subject: Recommend git-bp instead of cvs-bp, and cowbuilder instead of pbuilder-uml. Thanks... 
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=18bdf528f207d255e4343b68d373ff37540476ad;p=developers-reference.git

Recommend git-bp instead of cvs-bp, and cowbuilder instead of pbuilder-uml. Thanks to Osamu Aoki and Andreas Rönnquist for the patch! Closes: #741269
---

diff --git a/tools.dbk b/tools.dbk
index 70514dc..7eeb567 100644
--- a/tools.dbk
+++ b/tools.dbk
@@ -212,17 +212,17 @@ packages.
 The following packages help with the package building process, general driving
 <command>dpkg-buildpackage</command> as well as handling supporting tasks.
 </para>
-<section id="cvs-buildpackage">
-<title><systemitem role="package">cvs-buildpackage</systemitem></title>
+<section id="git-buildpackage">
+<title><systemitem role="package">git-buildpackage</systemitem></title>
 <para>
-<systemitem role="package">cvs-buildpackage</systemitem> provides the
-capability to inject or import Debian source packages into a CVS repository,
-build a Debian package from the CVS repository, and helps in integrating
+<systemitem role="package">git-buildpackage</systemitem> provides the
+capability to inject or import Debian source packages into a Git repository,
+build a Debian package from the Git repository, and helps in integrating
 upstream changes into the repository.
 </para>
 <para>
-These utilities provide an infrastructure to facilitate the use of CVS by
-Debian maintainers.  This allows one to keep separate CVS branches of a package
+These utilities provide an infrastructure to facilitate the use of Git by
+Debian maintainers.  This allows one to keep separate Git branches of a package
 for <literal>stable</literal>, <literal>unstable</literal> and possibly
 <literal>experimental</literal> distributions, along with the other benefits
 of a version control system.
@@ -254,9 +254,8 @@ package's build-dependencies are correct, and to be sure that unnecessary and
 wrong build dependencies will not exist in the resulting package.
 </para>
 <para>
-A related package is <systemitem role="package">pbuilder-uml</systemitem>,
-which goes even further by doing the build within a User Mode Linux
-environment.
+A related package is <systemitem role="package">cowbuilder</systemitem>,
+which speeds up the build process using COW filesystem on any standard Linux filesystem.
 </para>
 </section>