summaryrefslogtreecommitdiff
path: root/dgit.7
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2017-01-09 03:04:13 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2017-01-09 13:08:32 +0000
commit192d476b8cc487acacd80ec3794f82732f93f346 (patch)
tree168bf0e79865e156d8f9d9c8387731c7c2483a17 /dgit.7
parent55efcfb95f9453c6a83f824988a523a26f688ee8 (diff)
dgit(7): Move autotools deletion para up
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit.7')
-rw-r--r--dgit.722
1 files changed, 11 insertions, 11 deletions
diff --git a/dgit.7 b/dgit.7
index 6ad6ecb..635dc13 100644
--- a/dgit.7
+++ b/dgit.7
@@ -282,6 +282,17 @@ branches, it will fail.
As the maintainer you therefore have the following options:
.TP
\(bu
+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.
+.TP
+\(bu
Persuade upstream that the source code in their git history and the
source they ship as tarballs should be identical. Of course simply
removing the files from the tarball may make the tarball hard for
@@ -292,17 +303,6 @@ files, perhaps with some simple automation to deal with conflicts and
spurious changes. This has the advantage that someone who clones
the git repository finds the program just as easy to build as someone
who uses the tarball.
-.TP
-\(bu
-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
Of course it may also be that the differences are due to build system
bugs, which cause unintended files to end up in the source package.