diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-01-09 03:02:41 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-01-09 13:08:32 +0000 |
commit | 55efcfb95f9453c6a83f824988a523a26f688ee8 (patch) | |
tree | a04d71b0cadd7d70438e474a4d3d5fdc7f69671d /dgit.7 | |
parent | a1fb6b5478b7189452d1cd2e9098a69fe2db6825 (diff) |
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>
Diffstat (limited to 'dgit.7')
-rw-r--r-- | dgit.7 | 19 |
1 files changed, 9 insertions, 10 deletions
@@ -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 |