summaryrefslogtreecommitdiff
path: root/development.mdwn
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-11-09 10:27:57 -0200
committerSilvio Rhatto <rhatto@riseup.net>2016-11-09 10:27:57 -0200
commite19c2219a9a4b1962151cd886ef025826e2838c7 (patch)
tree53c4eaba89b3b564a778f4ec299b6fb19e48bf3d /development.mdwn
parent84319a2c2806f623adbff33a804a3338905ebd3e (diff)
parent321be0df19d4443a4f13ca9870782f7c4ece049f (diff)
downloadkeyringer-e19c2219a9a4b1962151cd886ef025826e2838c7.tar.gz
keyringer-e19c2219a9a4b1962151cd886ef025826e2838c7.tar.bz2
Merge tag 'upstream_keyringer_0.4.0' into debian
Upstream version 0.4.0
Diffstat (limited to 'development.mdwn')
-rw-r--r--development.mdwn15
1 files changed, 8 insertions, 7 deletions
diff --git a/development.mdwn b/development.mdwn
index db67119..49a224c 100644
--- a/development.mdwn
+++ b/development.mdwn
@@ -8,20 +8,16 @@ Index
Coding standards
----------------
+* Uses Semantic Versioning.
* Respect the existing coding style.
* Be clear: easy audability must be one of keyringer's requirements.
-Development workflow
---------------------
-
-We use [git-flow](https://github.com/nvie/gitflow) for the development workflow.
-
Release workflow
----------------
Go to develop branch and start a new release
- git flow release start VERSION
+ git checkout develop
Prepare the source code:
@@ -33,6 +29,10 @@ Create and upload a new release:
make release
+Tag the release:
+
+ git tag -s $(VERSION) -m "Keyringer $(VERSION)"
+
Update the debian branch:
make debian
@@ -74,7 +74,7 @@ Test environment
Setup:
- keyringer test init ~/code/tests/keyringer
+ keyringer test init ~/temp/tests/keyringer
Teardown:
@@ -99,3 +99,4 @@ References
* [Generating pristine tarballs from git repositories](http://joeyh.name/blog/entry/generating_pristine_tarballs_from_git_repositories/).
* [Debian Packaging](https://wiki.debian.org/Packaging).
* [Debian Upstream Guide](https://wiki.debian.org/UpstreamGuide).
+* [DanielKahnGillmor/preferred_packaging - Debian Wiki](https://wiki.debian.org/DanielKahnGillmor/preferred_packaging).