From cd2a75c35a15dbff85ddae657d7681a0a5ffe79d Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Thu, 15 Dec 2016 20:22:35 +0100
Subject: [PATCH] Issue #2698027 by helmo: Minor release to update core?

---
 aegir-release.make |  9 ++++++---
 release.sh         | 13 ++++++++++++-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/aegir-release.make b/aegir-release.make
index e004c4b77..b6999da54 100644
--- a/aegir-release.make
+++ b/aegir-release.make
@@ -1,7 +1,10 @@
 core = 7.x
 api = 2
 
-; this makefile fetches the latest release from Drupal.org
-; it is maintained through the release.sh script
-projects[hostmaster][type] = "core"
+; This makefile fetches the latest release of Drupal from Drupal.org.
+projects[drupal][type] = "core"
+
+; The release.sh script updates the version of hostmaster.
 projects[hostmaster][version] = "7.x-3.0-dev"
+projects[hostmaster][type] = "profile"
+projects[hostmaster][variant] = "projects"
diff --git a/release.sh b/release.sh
index efa1d7fc1..b803e1a3b 100755
--- a/release.sh
+++ b/release.sh
@@ -80,7 +80,7 @@ dch -v $debversion -D unstable
 git add debian/changelog
 
 echo changing hostmaster version in aegir-release.make
-sed -i'.tmp' -e '/^projects\[hostmaster\]\[version\]/s/=.*$/= "'"$major-$version"'"/' aegir-release.make && git add aegir-release.make && rm aegir-release.make.tmp
+sed -i'.tmp' -e '/^projects\[hostmaster\]\[version\]/s/=.*$/= "'"$version"'"/' aegir-release.make && git add aegir-release.make && rm aegir-release.make.tmp
 
 echo enabling release makefilexs
 ln -sf aegir-release.make aegir.make && git add aegir.make
@@ -125,9 +125,20 @@ mkdir -p build-area;
 rm -rf build-area/hostmaster
 git clone --branch $CURRENT_BRANCH `git config remote.origin.url | sed 's/provision/hostmaster/'` build-area/hostmaster
 
+cd build-area/hostmaster
+echo changing hostmaster.make versions
+ln -sf drupal-org.make hostmaster.make && git add hostmaster.make
+cd -
+
+git --work-tree=build-area/hostmaster --git-dir=build-area/hostmaster/.git commit -m"change version information for release $version"
+
 echo "Setting the tag $NEW_TAG in a clean hostmaster clone."
 git --work-tree=build-area/hostmaster --git-dir=build-area/hostmaster/.git tag -a $NEW_TAG -m 'Add a new release tag.'
 
+echo reverting tree to HEAD versions
+git revert HEAD^
+
+
 # Hosting
 rm -rf build-area/hosting
 git clone --branch $CURRENT_BRANCH `git config remote.origin.url | sed 's/provision/hosting/'` build-area/hosting