2 files changed, 12 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog
index 708c68a..9b2dff9 100644
@@ -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).
* Internal improvements.
@@ -264,7 +264,7 @@ is a patches-applied or patches-unapplied tree.
Split view conversions are cached in the ref
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.
-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.
-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
@@ -327,7 +326,7 @@ to delete these files.
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.