diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2014-02-20 11:10:23 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2014-02-20 11:10:23 -0300 |
| commit | efaacc68a2539cf57fdba395598f708d366cabc9 (patch) | |
| tree | 3235b55b52df00c14ab99be9eb2255e3110b860b /development.mdwn | |
| parent | 10ec7a4f87812576f6bf3543282b49030ba77e64 (diff) | |
| parent | 4b4aff2edac956224849d36fe83f826303d25efd (diff) | |
| download | keyringer-efaacc68a2539cf57fdba395598f708d366cabc9.tar.gz keyringer-efaacc68a2539cf57fdba395598f708d366cabc9.tar.bz2 | |
Merge tag 'upstream_keyringer_0.3' into debian
Upstream version 0.3
Diffstat (limited to 'development.mdwn')
| -rw-r--r-- | development.mdwn | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/development.mdwn b/development.mdwn index 3400643..cf969fe 100644 --- a/development.mdwn +++ b/development.mdwn @@ -60,6 +60,7 @@ Update the debian branch: git-import-orig --upstream-vcs-tag=$VERSION ../tarballs/keyringer-$VERSION.tar.bz2 dch -e # fine tune the changelog prepared by git-dch git commit -a -m "Updating debian/changelog" + git-buildpackage --git-tag-only --git-sign-tags Push everything: @@ -74,10 +75,6 @@ Run lintian (or [add it to your pbuilder hooks](http://askubuntu.com/questions/1 lintian --info --display-info --pedantic --color auto \ ../build-area/keyringer_$VERSION*.changes -Create a signed tag in the debian branch: - - git-buildpackage --git-tag-only --git-sign-tags - 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`. @@ -101,9 +98,7 @@ Setup: Teardown: - rm -rf ~/code/tests/keyringer - rm ~/.keyringer/test - sed -i -e '/^test=/d' ~/.keyringer/config + keyringer test teardown -y Translation ----------- |