This package is maintained from the upstream git repository located at
git://flatbed.openfabrics.org/~ardavis/dapl.git
using Dep14 (http://dep.debian.net/deps/dep14/) layout/workflow.

New versions should usually be built from the debian/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/master branch. 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:hpc-team/dapl.git

To build the package after cloning:
$ 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 git://flatbed.openfabrics.org/~ardavis/dapl.git
Then you can pull upstream changes as follows:
$ git branch master
$ git pull upstream

Handling new upstream releases (e.g. for new release 2.10.1-1):
- Set an upstream tag 'alias' (original upstream tag would be dapl-2.1.0-1):
  $ git tag upstream/2.10.1.1 dapl-2.1.0-1
  Note, that we susbtitute the hyphen in the upstream version number/tag with a
  . (to remain compatible with the debian versioning scheme)
- Merge new upstream release to the debian/master branch:
  $ git checkout debian/master
  $ git merge upstream/2.10.1.1
- Rebase patch-queue branch
  $ git checkout patch-queue/debian/master
  $ git rebase -i upstream/2.10.1.1
    Review patches, possibly fix conflicts, when done:
  $ gbp pq export
  This puts you into the debian/master branch automatically. Review the changes
  and commit.
- Adjust debian files for new release ...
- Set debian release tag when done (assuming debian version 2.10.1.1-1)
  $ git tag debian/2.10.1.1-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

 -- Roland Fehrenbacher <rf@q-leap.de>, Tue, 02 Jan 2018 16:32:44 +0000
