diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2018-05-30 14:45:12 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2018-05-30 14:45:12 -0300 |
| commit | e5659e2ba6be675f2f8383e0264bde8968a869d0 (patch) | |
| tree | cbc92bdb8e2f46aa6e79b74f621bddafebf7f990 /development.md | |
| parent | b6dec4f1efe948f01df02b364cbb7f7aeedaa2b1 (diff) | |
| parent | 126eb39671e9c65c0c60a78b25189e4d4b1fae72 (diff) | |
| download | keyringer-e5659e2ba6be675f2f8383e0264bde8968a869d0.tar.gz keyringer-e5659e2ba6be675f2f8383e0264bde8968a869d0.tar.bz2 | |
Merge branch 'develop'
Diffstat (limited to 'development.md')
| -rw-r--r-- | development.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/development.md b/development.md index 2349c84..4fb1841 100644 --- a/development.md +++ b/development.md @@ -43,7 +43,7 @@ Push everything: Build the package from the debian Git branch: - git-buildpackage + gbp buildpackage Run lintian (or [add it to your pbuilder hooks](http://askubuntu.com/questions/140697/how-do-i-run-lintian-from-pbuilder-dist)): @@ -60,7 +60,7 @@ Cleanup symlink: Notes: -* `git-import-orig` takes care of running `pristine-tar commit`, of merging of the tag and orig tarball into the upstream branch, and then it merges the result into the debian branch. With the above configuration, it also runs git-dch to do the bulk of the work in `debian/changelog`. +* `gbp import-orig` takes care of running `pristine-tar commit`, of merging of the tag and orig tarball into the upstream branch, and then it merges the result into the debian branch. With the above configuration, it also runs git-dch to do the bulk of the work in `debian/changelog`. * To build a development package, checkout the debian branch, merge master, run `git-dch --auto --snapshot` and build. Packaging workflow |