Merge branch '7.x-3.x' of git.drupal.org:project/provision into 2754069-decouple-install-alternate

aegir-release.make

 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"

debian/changelog

+aegir3-provision (3.9~beta1) unstable; urgency=medium
+
+  * Preparations for the 3.9 release
+  * Makefile tweaks to allow for minor releases to update Drupal core
+  * Many bugfixes and UI improvements, see http://aegir.readthedocs.org/en/3.x/release-notes/3.9
+
+
+ -- Herman van Rink <helmo@initfour.nl>  Thu, 15 Dec 2016 21:15:10 +0100
+
 aegir3-provision (3.8) unstable; urgency=medium
 
   * Another stable release of the 3.x series.

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 --work-tree=build-area/hostmaster --git-dir=build-area/hostmaster/.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