control: tag -1 +patch Hello,
Attached. -- Sean Whitton
From 749fb15166edef05216d628623669dbdf5df5ef6 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhit...@spwhitton.name>
Date: Sun, 29 Jul 2018 14:58:47 +0800
Subject: [PATCH 1/5] manpages: alioth->salsa
Signed-off-by: Sean Whitton <spwhit...@spwhitton.name>
---
dgit-maint-gbp.7.pod | 2 +-
dgit-maint-merge.7.pod | 10 +++++-----
dgit-sponsorship.7.pod | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dgit-maint-gbp.7.pod b/dgit-maint-gbp.7.pod
index 3c438ab..b761296 100644
--- a/dgit-maint-gbp.7.pod
+++ b/dgit-maint-gbp.7.pod
@@ -106,7 +106,7 @@ Don't use I<--git-tag>: B<dgit push> will do this for you. To upload:
=back
This will push your git history to the dgit-repos, but you probably
-want to follow it up with a push to alioth.
+want to follow it up with a push to salsa.
You will need to pass I<--overwrite> if the previous upload was not
performed with dgit.
diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod
index a02e1fd..79d2a60 100644
--- a/dgit-maint-merge.7.pod
+++ b/dgit-maint-merge.7.pod
@@ -68,12 +68,12 @@ been tagged '1.2.2' by upstream.
The final command detaches your master branch from the upstream remote,
so that git doesn't try to push anything there, or merge unreleased
upstream commits. If you want to maintain a copy of your packaging
-branch on B<alioth.debian.org> in addition to B<dgit-repos>, you can
+branch on B<salsa.debian.org> in addition to B<dgit-repos>, you can
do something like this:
=over 4
- % git remote add -f origin git.debian.org:/git/collab-maint/foo.git
+ % git remote add -f origin salsa.debian.org:Debian/foo.git
% git push --follow-tags -u origin master
=back
@@ -173,11 +173,11 @@ Then we can import the upstream version:
Our upstream branch cannot be pushed to B<dgit-repos>, but since we
will need it whenever we import a new upstream version, we must push
-it somewhere. The usual choice is B<alioth.debian.org>:
+it somewhere. The usual choice is B<salsa.debian.org>:
=over 4
- % git remote add -f origin git.debian.org:/git/collab-maint/foo.git
+ % git remote add -f origin salsa.debian.org:Debian/foo.git
% git push --follow-tags -u origin master upstream
=back
@@ -344,7 +344,7 @@ to git), you can just run dpkg-buildpackage(1) or debuild(1) instead.
You will need the I<debian/gbp.conf> from "When upstream releases only
tarballs", above. You will also need your upstream branch. Above, we
-pushed this to B<alioth.debian.org>. You will need to clone or fetch
+pushed this to B<salsa.debian.org>. You will need to clone or fetch
from there, instead of relying on B<dgit clone>/B<dgit fetch> alone.
Then, either
diff --git a/dgit-sponsorship.7.pod b/dgit-sponsorship.7.pod
index 0808329..9eecec0 100644
--- a/dgit-sponsorship.7.pod
+++ b/dgit-sponsorship.7.pod
@@ -102,7 +102,7 @@ against the sponsorship-requests pseudo-package.
The sponsee should push their HEAD as a git branch
to any suitable git server.
They can use their own git server;
-alioth is another possibility.
+salsa is another possibility.
The branch names used by the sponsee on their local machine,
and on the server, do not matter.
--
2.11.0
From 66f439b19ad1d3dc3a82645b1a847ce6ea148bb0 Mon Sep 17 00:00:00 2001 From: Sean Whitton <spwhit...@spwhitton.name> Date: Sun, 29 Jul 2018 15:00:13 +0800 Subject: [PATCH 2/5] manpages: add references to pbuilder and cowbuilder Signed-off-by: Sean Whitton <spwhit...@spwhitton.name> --- dgit-maint-debrebase.7.pod | 3 ++- dgit-maint-gbp.7.pod | 46 +++++++++++++++++++++++----------------------- dgit-maint-merge.7.pod | 10 +++++----- dgit-maint-native.7.pod | 4 ++++ 4 files changed, 34 insertions(+), 29 deletions(-) diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod index e492768..6223e87 100644 --- a/dgit-maint-debrebase.7.pod +++ b/dgit-maint-debrebase.7.pod @@ -406,7 +406,8 @@ is a single debrebase stitch. =head1 BUILDING AND UPLOADING You can use dpkg-buildpackage(1) for test builds. When you are ready -to build for an upload, use B<dgit sbuild>. +to build for an upload, use B<dgit sbuild>, B<dgit pbuilder> or B<dgit +cowbuilder>. Upload with B<dgit push> or B<dgit push-source>. Remember to pass I<--new> if the package is new in the target suite. diff --git a/dgit-maint-gbp.7.pod b/dgit-maint-gbp.7.pod index b761296..29a712f 100644 --- a/dgit-maint-gbp.7.pod +++ b/dgit-maint-gbp.7.pod @@ -58,8 +58,12 @@ where I<--allow-dirty> is needed for testing uncommitted changes, and I<OPTIONS> are any further options to be passed on to gbp-buildpackage(1). -When you are ready to build for upload, you will probably want to use -sbuild(1) or pbuilder(1), or do a source-only upload. Either +If you are doing a source-only upload, you do not need to prepare a +I<_source.changes>, as B<dgit push-source> will take of that on your +behalf. + +If you need to include binaries with your upload, you will probably +want to use sbuild(1), pbuilder(1) or cowbuilder(1): =over 4 @@ -67,37 +71,33 @@ sbuild(1) or pbuilder(1), or do a source-only upload. Either =back -or +replacing 'sbuild' with 'pbuilder' or 'cowbuilder' if appropriate. -=over 4 +We use I<--rm-old-changes> to ensure that there is exactly one changes +file corresponding to this package, so we can be confident we're +uploading what we intend (though B<dgit push> will do some safety +checks). - % dgit --rm-old-changes gbp-build --git-pbuilder +Note that none of the commands in this section are required to upload +with dgit. You can invoke gbp-buildpackage(1), pbuilder(1), +cowbuilder(1) and sbuild(1) directly. However, the defaults for these +tools may leave you with something that dgit will refuse to upload +because it doesn't match your git HEAD. -=back +As a general rule, leave all signing and tagging to dgit. + +=head1 UPLOADING -or +Don't use I<--git-tag>: B<dgit push> will do this for you. To do a +source-only upload: =over 4 - % dgit --rm-old-changes --gbp build-source + % dgit --gbp push-source =back -We use I<--rm-old-changes> to ensure that there is exactly one changes -file corresponding to this package, so we can be confident we're -uploading what we intend (though B<dgit push> will do some safety -checks). - -Note that all of the commands in this section are not required to -upload with dgit. You can invoke gbp-buildpackage(1), pbuilder(1) and -sbuild(1) directly. However, the defaults for these tools may leave -you with something that dgit will refuse to upload because it doesn't -match your git HEAD. As a general rule, leave all signing and tagging -to dgit. - -=head1 UPLOADING - -Don't use I<--git-tag>: B<dgit push> will do this for you. To upload: +or if you need to include binaries, =over 4 diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod index 79d2a60..c20a252 100644 --- a/dgit-maint-merge.7.pod +++ b/dgit-maint-merge.7.pod @@ -311,11 +311,11 @@ important information present in README.source. =head1 BUILDING AND UPLOADING -Use B<dgit build>, B<dgit sbuild>, B<dgit build-source>, and B<dgit -push> as detailed in dgit(1). If any command fails, dgit will provide -a carefully-worded error message explaining what you should do. If -it's not clear, file a bug against dgit. Remember to pass I<--new> -for the first upload. +Use B<dgit build>, B<dgit sbuild>, B<dgit pbuilder>, B<dgit +cowbuilder>, B<dgit push-source>, and B<dgit push> as detailed in +dgit(1). If any command fails, dgit will provide a carefully-worded +error message explaining what you should do. If it's not clear, file +a bug against dgit. Remember to pass I<--new> for the first upload. As an alternative to B<dgit build> and friends, you can use a tool like gitpkg(1). This works because like dgit, gitpkg(1) enforces that diff --git a/dgit-maint-native.7.pod b/dgit-maint-native.7.pod index 34aaaff..ac57728 100644 --- a/dgit-maint-native.7.pod +++ b/dgit-maint-native.7.pod @@ -65,6 +65,10 @@ Simply prepare your git tree in the usual way, and then: (Do not make any tags yourself: dgit push will do that.) +You may use B<dgit pbuilder> or B<dgit cowbuilder> +instead of B<dgit sbuild>; +see dgit(1) for the syntax of those subcommands. + The --overwrite option tells dgit that you are expecting that your git history is not a descendant of the history which dgit synthesised from the previous -- 2.11.0
From 4b8e7fb87369291fab0d96c5202088af214b9a8c Mon Sep 17 00:00:00 2001 From: Sean Whitton <spwhit...@spwhitton.name> Date: Sun, 29 Jul 2018 15:00:25 +0800 Subject: [PATCH 3/5] dgit-maint-gbp(7): discuss dgit.default.build-products-dir Signed-off-by: Sean Whitton <spwhit...@spwhitton.name> --- dgit-maint-gbp.7.pod | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dgit-maint-gbp.7.pod b/dgit-maint-gbp.7.pod index 29a712f..e6f6863 100644 --- a/dgit-maint-gbp.7.pod +++ b/dgit-maint-gbp.7.pod @@ -31,6 +31,15 @@ normally used with patches-unapplied. =head1 GIT CONFIGURATION +If you have configured an I<export-dir> in your gbp.conf, you should +tell dgit about it: + +=over 4 + + % git config --global dgit.default.build-products-dir /home/spwhitton/build-area + +=back + If you run =over 4 -- 2.11.0
From 213b7472e597f110e8bf8e5e774a54a63be630bf Mon Sep 17 00:00:00 2001 From: Sean Whitton <spwhit...@spwhitton.name> Date: Sun, 29 Jul 2018 15:00:43 +0800 Subject: [PATCH 4/5] dgit-maint-gbp(7): update references to --*-dirty Signed-off-by: Sean Whitton <spwhit...@spwhitton.name> --- dgit-maint-gbp.7.pod | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dgit-maint-gbp.7.pod b/dgit-maint-gbp.7.pod index e6f6863..b8abd66 100644 --- a/dgit-maint-gbp.7.pod +++ b/dgit-maint-gbp.7.pod @@ -55,15 +55,15 @@ branch, never the dgit patches-applied branch. =head1 BUILDING -You can perform builds like this: +You can perform test builds like this: =over 4 - % dgit [--allow-dirty] gbp-build [OPTIONS] + % dgit [--include-dirty] gbp-build [OPTIONS] =back -where I<--allow-dirty> is needed for testing uncommitted changes, and +where I<--include-dirty> is needed for testing uncommitted changes, and I<OPTIONS> are any further options to be passed on to gbp-buildpackage(1). -- 2.11.0
From 51652e5e281a7429a99b615079c58138bf71ed4c Mon Sep 17 00:00:00 2001 From: Sean Whitton <spwhit...@spwhitton.name> Date: Sun, 29 Jul 2018 15:00:59 +0800 Subject: [PATCH 5/5] dgit-sponsorship(7): add references to push-source Signed-off-by: Sean Whitton <spwhit...@spwhitton.name> --- dgit-sponsorship.7.pod | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dgit-sponsorship.7.pod b/dgit-sponsorship.7.pod index 9eecec0..3fbdac8 100644 --- a/dgit-sponsorship.7.pod +++ b/dgit-sponsorship.7.pod @@ -30,7 +30,7 @@ This section is addressed to the sponsee: =head2 General You should prepare the package as if you were going -to upload it with C<dgit push> yourself. +to upload it with C<dgit push-source> or C<dgit push> yourself. For a straightforward NMU, consult L<dgit-nmu-simple(7)>. @@ -220,7 +220,7 @@ C<dgit fetch sid> will get you an up-to-date C<refs/remotes/dgit/dgit/sid> showing what's in the archive already. -C<dgit -wgf --damp-run push> +C<dgit -wgf --damp-run push-source> will check that dgit can build an appropriate source package. There is no need to run debdiff. @@ -234,6 +234,8 @@ When you have completed your source review, and use C<dgit -wgf [--quilt=...] sbuild -A -C> or similar, to to the build, and then +C<dgit -wgf [--quilt=...] push-source> +or C<dgit -wgf [--quilt=...] push> to do the upload. -- 2.11.0
signature.asc
Description: PGP signature
