From 700a9be836b6870e90ba0e07bbf484d41c71f39e Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Fri, 29 Jun 2012 11:21:06 +0100
Subject: [PATCH] build: Clean output of the release rules

---
 build/autotools/Makefile.am.release | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/build/autotools/Makefile.am.release b/build/autotools/Makefile.am.release
index 96f86d82d..6b1fcbc16 100644
--- a/build/autotools/Makefile.am.release
+++ b/build/autotools/Makefile.am.release
@@ -29,7 +29,7 @@ release-tag:
 	  echo "*** Cannot tag a Git version; please, update the Clutter version" >&2; \
 	else \
 	  if test -d "$(top_srcdir)/.git"; then \
-	    echo " GIT   Tagging release $(CLUTTER_VERSION)..." ; \
+	    echo "  TAG    Tagging release $(CLUTTER_VERSION)..." ; \
 	    $(top_srcdir)/build/missing --run git tag \
 	 	-s \
 	      	-m "Clutter $(CLUTTER_VERSION) ($(CLUTTER_RELEASE_STATUS))" \
@@ -43,7 +43,7 @@ release-check: release-verify-even-micro release-verify-sane-changelogs release-
 	TAR_OPTIONS="$(TAR_OPTIONS)" $(MAKE) $(AM_MAKEFLAGS) distcheck
 
 release-verify-news:
-	@echo -n " CHK   Checking that the NEWS file has been updated..."
+	@echo -n "  CHK    Checking that the NEWS file has been updated..."
 	@if ! grep -q "$(CLUTTER_VERSION)" $(top_srcdir)/NEWS; then \
 	  (echo "Ouch." && \
 	   echo "*** The version in the NEWS file does not match $(CLUTTER_VERSION)." && \
@@ -52,7 +52,7 @@ release-verify-news:
 	@echo "Good."
 
 release-verify-sane-changelogs: changelogs
-	@echo -n " CHK   Checking that the ChangeLog files are sane..."
+	@echo -n "  CHK    Checking that the ChangeLog files are sane..."
 	@if grep -q "is required to generate" $(CHANGELOGS); then \
 	  (echo "Ouch." && \
 	   echo "*** Some of the ChangeLogs are not generated correctly." && \
@@ -60,7 +60,7 @@ release-verify-sane-changelogs: changelogs
 	@echo "Good."
 
 release-verify-even-micro:
-	@echo -n " CHK   Checking that $(VERSION) has an even micro component..."
+	@echo -n "  CHK    Checking that $(VERSION) has an even micro component..."
 	@test "$(CLUTTER_MICRO_VERSION)" = "`echo $(CLUTTER_MICRO_VERSION)/2*2 | bc`" || \
 	  (echo "Ouch." && \
 	   echo "*** The version micro component '$(CLUTTER_MICRO_VERSION)' is not an even number." && \
@@ -69,9 +69,10 @@ release-verify-even-micro:
 	@echo "Good."
 
 release-upload: $(sha256_file)
-	@echo " SCP   Uploading to master.gnome.org..."
+	@echo -n "  SCP    Uploading to master.gnome.org... "
 	@scp $(tar_file) master.gnome.org:
-	@echo " EXEC  Running ftpadmin install..."
+	@echo "Done."
+	@echo -n "  EXEC   Running ftpadmin install... "
 	@ssh master.gnome.org ftpadmin install $(tar_file)
 	@mv -f $(sha256_file) $(top_builddir)/build/$(sha256_file)
 	@echo "Done."
@@ -122,8 +123,11 @@ release-message:
 	@echo "the README file included in the release."
 	@echo ""
 	@echo "Documentation:"
-	@echo "   Clutter: $(RELEASE_DOC_URL)/clutter/$(CLUTTER_MAJOR_VERSION).$(CLUTTER_MINOR_VERSION)/"
-	@echo "     Cally: $(RELEASE_DOC_URL)/cally/$(CLUTTER_MAJOR_VERSION).$(CLUTTER_MINOR_VERSION)/"
+	@if test "x$(CLUTTER_RELEASE_STATUS)" = "xsnapshot"; then \
+	   echo "   Clutter: http://developer.gnome.org/clutter/unstable/"; \
+	 else \
+	   echo "   Clutter: http://developer.gnome.org/clutter/stable/"; \
+	 fi
 	@echo "  Cookbook: $(RELEASE_DOC_URL)/clutter-cookbook/$(CLUTTER_API_VERSION)/"
 	@echo ""
 	@echo "Release Notes:"