From c68c11dce1d59ac54b1fe60d45077e0aa24c5006 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Wed, 4 Sep 2013 22:58:52 +0200
Subject: [PATCH] cleanup the release process

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 Makefile         | 10 ++++++----
 bin/build-helper | 19 +++++++++++++------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 419f8023..816240a0 100644
--- a/Makefile
+++ b/Makefile
@@ -99,7 +99,7 @@ man-dist: man check-date
 	cp ${MAN7DSTDIR}/*.html ${MAN7DSTDIR}/*.css ${MANWEBDIR}/man7
 	cd ${MANWEBDIR} && git add . && git commit -m "cdist manpages update: $(CHANGELOG_VERSION)" || true
 
-man-release: web-release
+man-fix-link: web-pub
 	# Fix ikiwiki, which does not like symlinks for pseudo security
 	ssh tee.schottelius.org \
     	"cd /home/services/www/nico/www.nico.schottelius.org/www/software/cdist/man && rm -f latest && ln -sf "$(CHANGELOG_VERSION)" latest"
@@ -143,9 +143,11 @@ web-doc:
 
 web-dist: web-blog web-doc
 
-web-release: web-dist man-dist speeches-dist
+web-pub: web-dist man-dist speeches-dist
 	cd "${WEBDIR}" && make pub
 
+web-release-all: man-fix-link
+
 ################################################################################
 # Release: Mailinglist
 #
@@ -175,7 +177,7 @@ freecode-release: $(FREECODE_FILE)
 #
 PYPI_FILE=.lock-pypi
 
-pypi-release: $(PYPI_FILE) git-branch-merge
+pypi-release: $(PYPI_FILE)
 
 $(PYPI_FILE): man $(VERSION_FILE)
 	python3 setup.py sdist upload
@@ -187,7 +189,7 @@ $(PYPI_FILE): man $(VERSION_FILE)
 ARCHLINUX_FILE=.lock-archlinux
 ARCHLINUXTAR=cdist-$(CHANGELOG_VERSION)-1.src.tar.gz
 
-$(ARCHLINUXTAR): PKGBUILD pypi-release
+$(ARCHLINUXTAR): PKGBUILD
 	makepkg -c --source
 
 PKGBUILD: PKGBUILD.in $(VERSION_FILE)
diff --git a/bin/build-helper b/bin/build-helper
index 1b6921b7..6de5b1e8 100755
--- a/bin/build-helper
+++ b/bin/build-helper
@@ -239,16 +239,23 @@ eof
         git checkout master
         git merge "$target_branch"
 
+        # Publish git changes
+        make pub
 
-        exit 0
+        # publish man, speeches, website
+        make web-release-all
 
-        make speeches-dist
+        # Create and publish package for pypi
+        make pypi-release
 
-    RELEASE=speeches-dist web-release
-    RELEASE+=ml-release freecode-release
-    RELEASE+=man-dist pypi-release git-release
-    RELEASE+=archlinux-release
+        # Archlinux release is based on pypi
+        make archlinux-release
 
+        # Announce change on Freecode
+        make freecode-release
+
+        # Announce change on ML
+        make ml-release
     ;;
 
     test)