diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2014-05-20 12:31:54 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2014-05-20 12:31:54 -0300 |
| commit | fac4ee39e41f607358b426b9ee292b5d0681e4d0 (patch) | |
| tree | b3a53361b4c66517a1103406e87a1c47d1784c0d /Makefile | |
| parent | e6531b61c3f238e8020675acc79bcbdd6ad8c455 (diff) | |
| parent | 78fd93300420b6894d266855a76f894606eade95 (diff) | |
| download | keyringer-fac4ee39e41f607358b426b9ee292b5d0681e4d0.tar.gz keyringer-fac4ee39e41f607358b426b9ee292b5d0681e4d0.tar.bz2 | |
Merge tag 'upstream_keyringer_0.3.6' into debian
Upstream version 0.3.6
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 18 |
1 files changed, 15 insertions, 3 deletions
@@ -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 |