aboutsummaryrefslogtreecommitdiff
path: root/development.md
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2018-05-30 14:45:45 -0300
committerSilvio Rhatto <rhatto@riseup.net>2018-05-30 14:45:45 -0300
commitb2d96296ca410329527d9d2608d518f8b8e85901 (patch)
tree1ed9aeac4cc61ef7264fb254cc487d183573c818 /development.md
parent682186c57f968e676c9f03f9003604d4706eb66e (diff)
parenta5e39bf904e83989b763f001a29adb9053df60f2 (diff)
downloadkeyringer-b2d96296ca410329527d9d2608d518f8b8e85901.tar.gz
keyringer-b2d96296ca410329527d9d2608d518f8b8e85901.tar.bz2
Merge tag 'upstream_keyringer_0.5.3' into debian
Upstream version 0.5.3
Diffstat (limited to 'development.md')
-rw-r--r--development.md4
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