diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile | 18 | ||||
| -rw-r--r-- | development.mdwn | 6 | ||||
| -rwxr-xr-x | keyringer | 2 |
4 files changed, 23 insertions, 9 deletions
@@ -1,3 +1,9 @@ +2014-05-20 - 0.3.6 - Silvio Rhatto <rhatto@riseup.net> + + Makefile fix + + Updated workflow + 2014-05-20 - 0.3.5 - Silvio Rhatto <rhatto@riseup.net> Use a custom .vimrc so VIM command line is not messed with quotes (#50) @@ -26,8 +26,8 @@ install_lib: $(INSTALL) -D --mode=0755 lib/keyringer/functions $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/functions $(INSTALL) -D --mode=0755 -d lib/keyringer/actions $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/actions $(INSTALL) -D --mode=0755 lib/keyringer/actions/* $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/actions - $(INSTALL) -D --mode=0755 -d lib/keyringer/editors $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/actions - $(INSTALL) -D --mode=0755 lib/keyringer/editors/* $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/actions + $(INSTALL) -D --mode=0755 -d lib/keyringer/editors $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/editors + $(INSTALL) -D --mode=0755 lib/keyringer/editors/* $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/editors install_bin: $(INSTALL) -D --mode=0755 keyringer $(DESTDIR)/$(PREFIX)/bin/keyringer @@ -58,7 +58,11 @@ tarball: release: @make build_man git commit -a -m "Keyringer $(VERSION)" - git flow release finish -s -m "Keyringer $(VERSION)" $(VERSION) + # See https://github.com/nvie/gitflow/issues/87 + # https://github.com/nvie/gitflow/pull/160 + # https://github.com/nvie/gitflow/issues/50 + #git flow release finish -s -m "Keyringer $(VERSION)" $(VERSION) + git flow release finish -s $(VERSION) git checkout master @make tarball gpg --use-agent --armor --detach-sign --output ../tarballs/keyringer-$(VERSION).tar.bz2.asc ../tarballs/keyringer-$(VERSION).tar.bz2 @@ -67,3 +71,11 @@ release: # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=568375 #git tag -s $(VERSION) -m "Keyringer $(VERSION)" git checkout develop + +debian: + git checkout debian + git-import-orig --upstream-vcs-tag=$(VERSION) ../tarballs/keyringer-$(VERSION).tar.bz2 + # Fine tune debian/changelog prepared by git-dch + dch -e + git commit -a -m "Updating debian/changelog" + git-buildpackage --git-tag-only --git-sign-tags diff --git a/development.mdwn b/development.mdwn index 3857b3a..bbc688d 100644 --- a/development.mdwn +++ b/development.mdwn @@ -68,11 +68,7 @@ Create and upload a new release: Update the debian branch: - git checkout debian - 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 + make debian Push everything: @@ -138,7 +138,7 @@ function keyringer_dispatch { # Config NAME="keyringer" -KEYRINGER_VERSION="0.3.5" +KEYRINGER_VERSION="0.3.6" CONFIG_VERSION="0.1" CONFIG_BASE="$HOME/.$NAME" CONFIG="$CONFIG_BASE/config" |