From 18bdf528f207d255e4343b68d373ff37540476ad Mon Sep 17 00:00:00 2001
From: Lucas Nussbaum <lucas@debian.org>
Date: Wed, 30 Jul 2014 17:47:01 +0200
Subject: [PATCH] =?utf8?q?Recommend=20git-bp=20instead=20of=20cvs-bp,=20an?=
 =?utf8?q?d=20cowbuilder=20instead=20of=20pbuilder-uml.=20Thanks=20to=20Os?=
 =?utf8?q?amu=20Aoki=20and=20Andreas=20R=C3=B6nnquist=20for=20the=20patch!?=
 =?utf8?q?=20Closes:=20#741269?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 tools.dbk | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

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>
 
-- 
2.30.2