This package is maintained from the upstream git repository located at
https://github.com/intel/opa-fm
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. Since the upstream branch
contains an unused binary exeutable MakeTools/ltsign, there is a branch
upstream+dfsg for the debian source that removes this binary.

Patches are managed within the patch-queue/debian/master branch. This branch
should be based on the upstream+dfsg as long as the latter is needed, otherwise 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/opa-fm.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 https://github.com/intel/opa-fm.git
Then you can pull upstream changes as follows:
$ git checkout master
$ git pull upstream

Handling new upstream releases (e.g. for new release 10.7.0.0.141):
- Update upstream+dfsg branch
  So far, the upstream repo contains an unused binary MakeTools/ltsign. We do
  not want to ship this in the source package, whence the upstream+dfsg branch
  contains a commit that removed this binary. When upgrading, after
  pulling the upstream master branch, merge the upstream+dfsg branch with the
  new upstream release tag (original upstream tag would be v10.7.0.0.141) and
  set an upstream+dfsg tag 'alias':
  $ git checkout upstream+dfsg
  $ git merge v10.7.0.0.141
  $ git tag upstream/10.7.0.0.141+dfsg.1
- Merge new upstream release to the debian/master branch:
  $ git checkout debian/master
  $ git merge upstream/10.7.0.0.141+dfsg.1
- Merge the patch-queue with the upstream+dfsg branch (if patches currently
  exist):
  $ git checkout patch-queue/debian/master
  $ git merge upstream/10.7.0.0.141+dfsg.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 ...
  In particular, check whether Esm/ib/src/linux/startup/opafm.sh was modified
  and if so, make corresponding changes in debian/opa-fm.init
- Set debian release tag when done (assuming debian version
  10.7.0.0.141+dfsg.1-1)
  $ git tag debian/10.7.0.0.141+dfsg.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 <rfehren@debian.org>, Wed, 05 Dec 2018 17:56:21 +0100

