diff options
Diffstat (limited to 'dgit-maint-debrebase.7.pod')
| -rw-r--r-- | dgit-maint-debrebase.7.pod | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod index d75a658..9c9598b 100644 --- a/dgit-maint-debrebase.7.pod +++ b/dgit-maint-debrebase.7.pod @@ -134,6 +134,32 @@ using git-diff(1) to compare the imported tarball to the release tag. =back +=head3 Using untagged upstream commits + +=over 4 + +Sometimes upstream does not tag their releases, or you want to package +an unreleased git snapshot. In such a case you can create your own +upstream release tag, of the form B<upstream/>I<ver>, where I<ver> is +the upstream version you plan to put in I<debian/changelog>. The +B<upstream/> prefix ensures that your tag will not clash with any tags +upstream later creates. + +For example, suppose that the latest upstream release is 1.2.2 and you +want to package git commit ab34c21 which was made on 2013-12-11. A +common convention is to use the upstream version number +1.2.2+git20131211.ab34c21 and so you could use + +=over 4 + + % git tag -s upstream/1.2.2+git20131211.ab34c21 ab34c21 + +=back + +to obtain a release tag, and then proceed as above. + +=back + =head2 When upstream releases only tarballs Because we want to work in git, we need a virtual upstream branch with @@ -331,6 +357,10 @@ release, and importing that release using git-debrebase(1). =back +If you want to package an untagged upstream commit (because upstream +does not tag releases or because you want to package an upstream +development snapshot), see "Using untagged upstream commits" above. + =head3 When upstream releases only tarballs You will need the I<debian/gbp.conf> from "When upstream releases only |