diff options
author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-09-23 16:05:45 +0200 |
---|---|---|
committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-09-25 11:00:48 +0200 |
commit | 4a9fdeb64bc87f09e44ecc0f9c6acaea8bf11f20 (patch) | |
tree | 41bb3585a34125aaa26408de78da312226a0bc7c /tools/telepathy.am | |
parent | 15f9b0e7259c46747326758d62c5a9ecb6ce3af2 (diff) | |
download | telepathy-logger-4a9fdeb64bc87f09e44ecc0f9c6acaea8bf11f20.tar.gz |
sync tools/ with tp-glib master
Needed to stop using deprecated API in generated code.
https://bugs.freedesktop.org/show_bug.cgi?id=69797
Diffstat (limited to 'tools/telepathy.am')
-rw-r--r-- | tools/telepathy.am | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/tools/telepathy.am b/tools/telepathy.am index 5e78dfd..20ff0be 100644 --- a/tools/telepathy.am +++ b/tools/telepathy.am @@ -42,14 +42,21 @@ else @exit 2; endif -%.tar.bz2.asc: %.tar.bz2 +%.tar.gz.asc: %.tar.gz $(AM_V_GEN)gpg --detach-sign --armor $@ -@PACKAGE@-@VERSION@.tar.bz2: _is-release-check check distcheck +@PACKAGE@-@VERSION@.tar.gz: + $(MAKE) _is-release-check + $(MAKE) check + $(MAKE) distcheck -maintainer-prepare-release: _is-release-check all distcheck release-mail +maintainer-prepare-release: + $(MAKE) _is-release-check + $(MAKE) all + $(MAKE) distcheck + $(MAKE) release-mail git tag -s @PACKAGE@-@VERSION@ -m @PACKAGE@' '@VERSION@ - gpg --detach-sign --armor @PACKAGE@-@VERSION@.tar.bz2 + gpg --detach-sign --armor @PACKAGE@-@VERSION@.tar.gz release-mail: NEWS $(AM_V_GEN)(python $(top_srcdir)/tools/make-release-mail.py \ @@ -59,15 +66,17 @@ release-mail: NEWS maintainer-upload-release: _maintainer-upload-release _maintainer-upload-release-check: _is-release-check - test -f @PACKAGE@-@VERSION@.tar.bz2 - test -f @PACKAGE@-@VERSION@.tar.bz2.asc - gpg --verify @PACKAGE@-@VERSION@.tar.bz2.asc + test -f @PACKAGE@-@VERSION@.tar.gz + test -f @PACKAGE@-@VERSION@.tar.gz.asc + gpg --verify @PACKAGE@-@VERSION@.tar.gz.asc _maintainer-upload-release: _maintainer-upload-release-check - rsync -vzP @PACKAGE@-@VERSION@.tar.bz2 telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/releases/@PACKAGE@/@PACKAGE@-@VERSION@.tar.bz2 - rsync -vzP @PACKAGE@-@VERSION@.tar.bz2.asc telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/releases/@PACKAGE@/@PACKAGE@-@VERSION@.tar.bz2.asc + rsync -vzP @PACKAGE@-@VERSION@.tar.gz telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/releases/@PACKAGE@/@PACKAGE@-@VERSION@.tar.gz + rsync -vzP @PACKAGE@-@VERSION@.tar.gz.asc telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/releases/@PACKAGE@/@PACKAGE@-@VERSION@.tar.gz.asc -maintainer-make-release: maintainer-prepare-release maintainer-upload-release +maintainer-make-release: + $(MAKE) maintainer-prepare-release + $(MAKE) maintainer-upload-release @echo "Now:" @echo " • bump the nano-version;" @echo " • push the branch and tags upstream; and" |