dgit(7): Updated `trouble' section to suggest deletion

Suggest having dpkg-source delete the autotools output (with a patch
if necessary).

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/debian/changelog b/debian/changelog
index 708c68af6a0f1ceb20b3deb6b2a922ae3cd100c7..9b2dff979f1243d7dafb3f9e2aee6d0e63f1ea03 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,9 +32,11 @@ dgit (3.0~) unstable; urgency=medium
   * When generating orig+debian/patches view, copy debian/ from
     HEAD.  This makes less noise in diffs.  Closes:#850095.
 
-  Docuentation [Sean Whitton]:
+  Docuentation [Sean Whitton and Ian Jackson]:
   * dgit-sponsorship(7): Use --no-dep14tag.  Closes:#849105.
   * dgit-maint-merge(7): Use debian/source/patch-header.  Closes:849120.
+  * dgit(7): Updated `trouble' section to suggest having dpkg-source
+    delete the autotools output (with a patch if necessary).
 
   Test suite:
   * Internal improvements.

diff --git a/dgit.7 b/dgit.7
index 1931b9ca259e29b91ae06d3e80b6a8cdacb7690f..6ad6ecb8e0ff1ba944aa68ba0c8d69f8db529ca7 100644 (file)
--- a/dgit.7
+++ b/dgit.7
@@ -264,7 +264,7 @@ is a patches-applied or patches-unapplied tree.
 Split view conversions are cached in the ref
 dgit-intern/quilt-cache.
 This should not be manipulated directly.
-.SH FILES IN THE SOURCE PACKAGE BUT NOT IN GIT - AUTOTOOLS ETC.
+.SH FILES IN THE ORIG TARBALL BUT NOT IN GIT - AUTOTOOLS ETC.
 This section is mainly of interest to maintainers who want to use dgit
 with their existing git history for the Debian package.
 
@@ -294,14 +294,13 @@ the git repository finds the program just as easy to build as someone
 who uses the tarball.
 .TP
 \(bu
-Have separate git branches which do contain the extra files, and after
-regenerating the extra files (whenever you would have to anyway),
-commit the result onto those branches.
-.TP
-\(bu
-Provide source packages which lack the files you don't want
-in git, and arrange for your package build to create them as needed.
-This may mean not using upstream source tarballs and makes the Debian
+Delete the files from your git branches,
+and your Debian source packages,
+and carry the deletion as a delta from upstream.
+(With `3.0 (quilt)' this means represeting the deletions as patches.
+You may need to pass --include-removal to dpkg-source --commit,
+or pass corresponding options to other tools.)
+This can make the Debian
 source package less useful for people without Debian build
 infrastructure.
 .LP
@@ -327,7 +326,7 @@ to delete these files.
 .LP
 dpkg-source does not
 (with any of the commonly used source formats)
-represent deletion of files (outside debian/) present in upstream.
+represent deletion of binaries (outside debian/) present in upstream.
 Thus deleting such files in a dpkg-source working tree does not
 actually result in them being deleted from the source package.
 Thus