From 99520a298e4c913c889c0ef60e5311a692578825 Mon Sep 17 00:00:00 2001 From: Jonny Lamb Date: Tue, 30 Oct 2012 10:00:49 +0100 Subject: tools: expect a tar.bz2 not a tar.gz This is an ugly patch but it'll do for now. Signed-off-by: Jonny Lamb --- tools/make-release-mail.py | 4 ++-- tools/telepathy.am | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/make-release-mail.py b/tools/make-release-mail.py index b03ebd2..786b6dc 100644 --- a/tools/make-release-mail.py +++ b/tools/make-release-mail.py @@ -62,8 +62,8 @@ def main(package, version, news_path): print """ %(release_name)s -tarball: %(base_url)s/%(package)s/%(package)s-%(version)s.tar.gz -signature: %(base_url)s/%(package)s/%(package)s-%(version)s.tar.gz.asc +tarball: %(base_url)s/%(package)s/%(package)s-%(version)s.tar.bz2 +signature: %(base_url)s/%(package)s/%(package)s-%(version)s.tar.bz2.asc git: %(git_url)s/%(package)s %(details)s""".strip().rstrip() % { diff --git a/tools/telepathy.am b/tools/telepathy.am index f696ef3..5e78dfd 100644 --- a/tools/telepathy.am +++ b/tools/telepathy.am @@ -42,14 +42,14 @@ else @exit 2; endif -%.tar.gz.asc: %.tar.gz +%.tar.bz2.asc: %.tar.bz2 $(AM_V_GEN)gpg --detach-sign --armor $@ -@PACKAGE@-@VERSION@.tar.gz: _is-release-check check distcheck +@PACKAGE@-@VERSION@.tar.bz2: _is-release-check check distcheck maintainer-prepare-release: _is-release-check all distcheck release-mail git tag -s @PACKAGE@-@VERSION@ -m @PACKAGE@' '@VERSION@ - gpg --detach-sign --armor @PACKAGE@-@VERSION@.tar.gz + gpg --detach-sign --armor @PACKAGE@-@VERSION@.tar.bz2 release-mail: NEWS $(AM_V_GEN)(python $(top_srcdir)/tools/make-release-mail.py \ @@ -59,13 +59,13 @@ release-mail: NEWS maintainer-upload-release: _maintainer-upload-release _maintainer-upload-release-check: _is-release-check - test -f @PACKAGE@-@VERSION@.tar.gz - test -f @PACKAGE@-@VERSION@.tar.gz.asc - gpg --verify @PACKAGE@-@VERSION@.tar.gz.asc + test -f @PACKAGE@-@VERSION@.tar.bz2 + test -f @PACKAGE@-@VERSION@.tar.bz2.asc + gpg --verify @PACKAGE@-@VERSION@.tar.bz2.asc _maintainer-upload-release: _maintainer-upload-release-check - 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 + 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 maintainer-make-release: maintainer-prepare-release maintainer-upload-release @echo "Now:" -- cgit v1.2.1