hal: Branch 'master'

[David Zeuthen]

 Makefile.am |   53 +++++++++++++++++++++++++----------------------------
 VERSION     |    2 +-
 2 files changed, 26 insertions(+), 29 deletions(-)

New commits:
diff-tree 6cf9709202f9428bbf3c547c505ab0a9cd8402b3 (from cb12cd0dee336221f3fcf538e6ba23900ac68080)
Author: David Zeuthen <davidz at redhat.com>
Date:   Wed Jul 25 15:48:55 2007 -0400

    update release script

diff --git a/Makefile.am b/Makefile.am
index aba7b17..299d207 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,37 +32,34 @@ clean-local :
 	rm -f *~
 
 release:
+	@echo "-----------------------------------------------------------------"
+	@echo "First check that all your changes are committed and pushed to"
+	@echo "the remote master repository."
 	@echo ""
-	@echo "Check that all your changes are committed and pushed to"
-	@echo "the remote master repository. Then run 'make release-real'."
-	@echo ""
-
-MAIL=/usr/sbin/sendmail
+	@echo "Then run 'make release-real' for instructions on how to make a release."
+	@echo "-----------------------------------------------------------------"
 
 release-real:
-	@make check
-	@date +%Y%m%d > VERSION
-	@rm -rf autom4te.cache
-	@autoreconf
-	@make dist
-	@scp hal-info-`cat VERSION`.tar.gz david at people.freedesktop.org:public_html/dist
-	@git-commit -m "version `cat VERSION`" VERSION
-	@git-push
-	@git-tag -m "version `cat VERSION`" -s HAL_INFO_`cat VERSION`
-	@git-push --tags
-
-#	@echo "From: $(GIT_AUTHOR_NAME) <$(GIT_AUTHOR_EMAIL)>" > .release-mail
-#	@echo "To: hal at lists.freedesktop.org" >> .release-mail
-#	@echo "Subject: hal-info `cat VERSION` release" >> .release-mail
-#	@echo "X-Mailer: hal-info release script" >> .release-mail
-#	@echo "" >> .release-mail
-#	@echo "There's a new hal-info `cat VERSION` release available. Download from" >> .release-mail
-#	@echo "" >> .release-mail
-#	@echo " http://people.freedesktop.org/~david/dist/hal-info-`cat VERSION`.tar.gz" >> .release-mail
-#	@echo "" >> .release-mail
-#	@echo "." >> .release-mail
-#	@echo "" >> .release-mail
-#	@cat .release-mail | $(MAIL) davidz at redhat.com hal at lists.freedesktop.org
+	@echo "-----------------------------------------------------------------"
+	@echo "Run the commands below, one by one"
+	@echo "-----------------------------------------------------------------"
+	@echo "-----------------------------------------------------------------"
+	@echo "export HAL_INFO_VERSION=`date +%Y%m%d`"
+	@echo "make check"
+	@echo "echo \$$HAL_INFO_VERSION > VERSION"
+	@echo "rm -rf autom4te.cache"
+	@echo "autoreconf"
+	@echo "make dist"
+	@echo "scp hal-info-\$$HAL_INFO_VERSION.tar.gz hal.freedesktop.org:/srv/hal.freedesktop.org/www/releases"
+	@echo "git-commit -m \"Released hal-info \$$HAL_INFO_VERSION\" VERSION"
+	@echo "git-push"
+	@echo "git-tag -m \"Released hal-info \$$HAL_INFO_VERSION\" -s HAL_INFO_\$$HAL_INFO_VERSION"
+	@echo "git-push --tags"
+	@echo "-----------------------------------------------------------------"
+	@echo "-----------------------------------------------------------------"
+	@echo ""
+	@echo "Please send a note to hal at lists.freedesktop.org about this release."
+	@echo "-----------------------------------------------------------------"
 
 
 
diff --git a/VERSION b/VERSION
index 3e2957c..c8a28da 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-20070618
+echo AL_INFO_VERSION