summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-11-09 10:22:20 -0200
committerSilvio Rhatto <rhatto@riseup.net>2016-11-09 10:22:20 -0200
commitdc4c62e5bffc41a3a128440341078de9075bd856 (patch)
tree12339fea83da2d359131a53a657ccc8ecbd9ff99 /Makefile
parent880a35bbb1ad613255a38a228ba53a7820e11846 (diff)
downloadkeyringer-dc4c62e5bffc41a3a128440341078de9075bd856.tar.gz
keyringer-dc4c62e5bffc41a3a128440341078de9075bd856.tar.bz2
Keyringer 0.4.00.4.0
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 73be8f5..b503b68 100644
--- a/Makefile
+++ b/Makefile
@@ -64,8 +64,9 @@ release:
# 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 flow release finish -s $(VERSION)
git checkout master
+ git merge develop
@make tarball
gpg --use-agent --armor --detach-sign --output $(ARCHIVE)/keyringer-$(VERSION).tar.bz2.asc $(ARCHIVE)/keyringer-$(VERSION).tar.bz2
scp $(ARCHIVE)/keyringer-$(VERSION).tar.bz2* keyringer:/var/sites/keyringer/releases/