summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2014-05-20 12:01:26 -0300
committerSilvio Rhatto <rhatto@riseup.net>2014-05-20 12:01:26 -0300
commitc7fda324471c4af84cc0e928dec550d0c21a86ff (patch)
tree0af9383d012e15f5f3677c01112e857fc65671f9 /Makefile
parent30328dcdebd1bdca9385b8f4e17ace0c0500efdc (diff)
parentda1f1b41f2392aa9ba262f4734e1f5ece5584e5a (diff)
downloadkeyringer-c7fda324471c4af84cc0e928dec550d0c21a86ff.tar.gz
keyringer-c7fda324471c4af84cc0e928dec550d0c21a86ff.tar.bz2
Merge branch 'release/0.3.5'0.3.5
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 6 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 42f6d9b..7ef6001 100644
--- a/Makefile
+++ b/Makefile
@@ -26,6 +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_bin:
$(INSTALL) -D --mode=0755 keyringer $(DESTDIR)/$(PREFIX)/bin/keyringer
@@ -56,9 +58,12 @@ tarball:
release:
@make build_man
git commit -a -m "Keyringer $(VERSION)"
+ git flow release finish -s -m "Keyringer $(VERSION)" $(VERSION)
+ git checkout master
@make tarball
gpg --use-agent --armor --detach-sign --output ../tarballs/keyringer-$(VERSION).tar.bz2.asc ../tarballs/keyringer-$(VERSION).tar.bz2
scp ../tarballs/keyringer-$(VERSION).tar.bz2* keyringer:/var/sites/keyringer/releases/
# We're doing tagging afterwards:
# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=568375
- git tag -s $(VERSION) -m "Keyringer $(VERSION)"
+ #git tag -s $(VERSION) -m "Keyringer $(VERSION)"
+ git checkout develop