aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2014-06-11 17:59:59 -0300
committerSilvio Rhatto <rhatto@riseup.net>2014-06-11 17:59:59 -0300
commit7c35a05b8557beb825e682675e3bfd6c53175201 (patch)
treee964e68ece8c6f789ef7b3ae93adbedab4d1b520
parent8716a11be21613cb5751723fe6ea95542ed1c986 (diff)
downloadkeyringer-7c35a05b8557beb825e682675e3bfd6c53175201.tar.gz
keyringer-7c35a05b8557beb825e682675e3bfd6c53175201.tar.bz2
Use local tarballs folder by default
-rw-r--r--.gitignore1
-rw-r--r--Makefile18
2 files changed, 11 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore
index 814194e..55c4e77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@ debian/keyringer
debian/files
debian/files
debian/keyringer.substvars
+tarballs
.pc
diff --git a/Makefile b/Makefile
index cce55fd..c1e50e9 100644
--- a/Makefile
+++ b/Makefile
@@ -14,10 +14,11 @@
# Place - Suite 330, Boston, MA 02111-1307, USA
#
-PACKAGE = keyringer
-VERSION = $(shell ./keyringer | head -n 1 | cut -d ' ' -f 2)
-PREFIX ?= /usr/local
-INSTALL = /usr/bin/install
+PACKAGE = keyringer
+VERSION = $(shell ./keyringer | head -n 1 | cut -d ' ' -f 2)
+PREFIX ?= /usr/local
+ARCHIVE ?= tarballs
+INSTALL = /usr/bin/install
clean:
find . -name *~ | xargs rm -f # clean local backups
@@ -53,7 +54,8 @@ build_man:
sed -i -e 's/--/\\-\\-/g' share/man/keyringer.1
tarball:
- git archive --prefix=keyringer-$(VERSION)/ --format=tar HEAD | bzip2 >../tarballs/keyringer-$(VERSION).tar.bz2
+ mkdir -p $(ARCHIVE)
+ git archive --prefix=keyringer-$(VERSION)/ --format=tar HEAD | bzip2 > $(ARCHIVE)/keyringer-$(VERSION).tar.bz2
release:
@make build_man
@@ -65,8 +67,8 @@ release:
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
- scp ../tarballs/keyringer-$(VERSION).tar.bz2* keyringer:/var/sites/keyringer/releases/
+ 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/
# We're doing tagging afterwards:
# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=568375
#git tag -s $(VERSION) -m "Keyringer $(VERSION)"
@@ -74,7 +76,7 @@ release:
debian:
git checkout debian
- git-import-orig --upstream-vcs-tag=$(VERSION) ../tarballs/keyringer-$(VERSION).tar.bz2
+ git-import-orig --upstream-vcs-tag=$(VERSION) $(ARCHIVE)/keyringer-$(VERSION).tar.bz2
# Fine tune debian/changelog prepared by git-dch
dch -e
git commit -a -m "Updating debian/changelog"