diff options
Diffstat (limited to 'dgit-maint-merge.7.pod')
| -rw-r--r-- | dgit-maint-merge.7.pod | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod index a02e1fd..c20a252 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 @@ -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 @@ -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 |