Commit 639a1585 authored by Roland Fehrenbacher's avatar Roland Fehrenbacher

Improve d/README.source

parent d3295697
This package is maintained from the upstream git repository located at
https://github.com/intel/psm.git
https://github.com/intel/opa-ff.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. 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.
upstream+dfsg for the debian source that removes this binary. The upstream d/dir
is also removed in this branch.
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:
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:
......@@ -26,26 +28,26 @@ Then you can pull upstream changes as follows:
$ git branch master
$ git pull upstream
Handling new upstream releases (e.g. for new release 10.6.0.0.131):
Handling new upstream releases (e.g. for new release 10.7.0.0.133):
- Merge the upstream+dfsg with the master branch and set upstream tag:
$ git br upstream+dfsg
$ git merge v10.6.0.0.131
$ git tag upstream/10.6.0.0.131+dfsg.1
$ git merge v10.7.0.0.133
$ git tag upstream/10.7.0.0.133+dfsg.1
- Merge new upstream release to the debian/master branch:
$ git checkout debian/master (probably you're already there)
$ git merge upstream/10.7.0.0.133+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.6.0.0.131+dfsg.1
$ git merge upstream/10.7.0.0.133+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.
- Merge new upstream release to the debian/master branch:
$ git checkout debian/master (probably you're already there)
$ git merge upstream/10.6.0.0.131+dfsg.1
- Adjust debian files for new release ...
- Adjust other debian files for new release ...
- Set debian release tag when done (assuming debian version
10.6.0.0.131+dfsg.1-1):
$ git tag debian/10.6.0.0.131+dfsg.1-1
10.7.0.0.133+dfsg.1-1):
$ git tag debian/10.7.0.0.133+dfsg.1-1
- Build new package including new pristine-tar generation:
$ gbp buildpackage --git-pristine-tar --git-pristine-tar-commit \
--git-compression=xz
......@@ -55,4 +57,4 @@ Handling new upstream releases (e.g. for new release 10.6.0.0.131):
Roland Fehrenbacher
-- Roland Fehrenbacher <rfehren@debian.org>, Tue, 30 Jan 2018 14:33:12 +0000
-- Roland Fehrenbacher <rfehren@debian.org> Thu, 14 Jun 2018 10:48:55 +0000
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment