1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
This package is maintained from the upstream git repository located at
https://github.com/3dem/relion.git
using Dep14 (http://dep.debian.net/deps/dep14/) layout/workflow.
New versions should usually be built from the debian-contrib/master branch.
There is a d/gbp.conf, so building with 'gbp buildpackage' is supported.
The upstream branch is master (there are old upstream branches called upstream
and upstream-branch that were used for intermediate package versions but are now
obsolete).
Patches are managed within the patch-queue/debian-contrib/master branch (if
there are any). This branch should always be based on the (upstream) master
branch. The contents of the d/patches directory is then auto-generated using:
$ gbp pq export
To clone this repo use:
$ gbp clone --pristine-tar git@salsa.debian.org:med-team/relion.git
To build the package after cloning:
$ git co debian-contrib/master
$ gbp buildpackage
To be able to receive new upstream releases/commits, after cloning, you need to
add the upstream repo address as a 'git remote' as follows:
$ git remote add upstream https://github.com/3dem/relion.git
Then you can pull upstream changes as follows:
$ git branch master
$ git pull upstream
Handling new upstream releases (e.g. for new release 3.1.0):
- Set an upstream tag 'alias' (original upstream tag would be 3.1.0):
$ git tag upstream/3.1.0 3.1.0
- Rebase patch-queue branch (if it exists and contains needed patches)
$ git checkout patch-queue/debian-contrib/master
$ git rebase -i upstream/3.1.0
Review patches, possibly fix conflicts, when done:
$ gbp pq export
This puts you into the debian-contrib/master branch automatically. Review
the changes and commit.
- Merge new upstream release to the debian-contrib/master branch:
$ git checkout debian-contrib/master (probably you're already there)
$ git merge upstream/3.1.0
- Adjust debian files for new release ...
- Set debian release tag when done (assuming debian version 3.1.0-1)
$ git tag debian-contrib/3.1.0-1
- Build new package including new pristine-tar generation:
$ gbp buildpackage --git-pristine-tar --git-pristine-tar-commit \
--git-compression=xz
- When all is fine, push the new version
$ git push --all
$ git push --tags
-- Roland Fehrenbacher <rfehren@debian.org> Thu, 01 Oct 2020 10:37:37 +0200
|
