releasing 1.4.1

1 files changed, 18 insertions, 24 deletions

diff --git a/Releasing b/Releasing
index 8c1787ee..c04a1de8 100644
--- a/Releasing
+++ b/Releasing
@@ -3,40 +3,34 @@ These are Bdale's notes on how to do a release.
 	git checkout master
 
 	- make sure the Google Maps API key is in the build chroot and root
-		mkdir -p /var/cache/pbuilder/base.cow/opt/google /opt/google
-		cp ~/altusmetrumllc/google-maps-api-key \
-			/var/cache/pbuilder/base.cow/opt/google/maps-api-key
-		ln -sf /home/bdale/altusmetrumllc/google-maps-api-key \
-			/opt/google/maps-api-key
+	    sudo mkdir -p /var/cache/pbuilder/base.cow/opt/google /opt/google
+	    sudo cp ~/altusmetrumllc/google-maps-api-key \
+		/var/cache/pbuilder/base.cow/opt/google/maps-api-key
+	    sudo ln -sf /home/bdale/altusmetrumllc/google-maps-api-key \
+		/opt/google/maps-api-key
+
+	- if this is an x.y release, then:
+		git checkout -b branch-<version>
+
+	- if this is an x.y.z release, then:
+		git checkout branch-<version>		# the x.y parts only
+		- cherry-pick or merge appropriate content from master
+	
+	- update the version in configure.ac
 
 	- make sure there is a doc/release-notes-<version>.xsl
 	- make sure that doc/altusmetrum.xsl has the right copyright year,
 	  and add release to the revision history at the front (release notes
 	  will be pulled in automatically)
-
-	- get a Google Maps API key and install it in
-          ~/altusmetrumllc/google-maps-api-key. If you don't have a
-          key, the app will still work, but downloading map tiles will
-          be slow, and you will only be able to download a limited
-          number per day.
-
-	- update the version in configure.ac
-        git log > ChangeLog
-	git commit -a
-
 	- make absolutely sure checked-out tree is "clean" 
 	- make absolutely sure the pdclib/ submodule is on the master branch,
 	  up to date, and "clean"
 
-	- if this is an x.y release, then:
-		git checkout -b branch-<version>
-		git tag -a <version>
-		- edit .git/gbp.conf to use branch-<version> as upstream
+        git log > ChangeLog
+	git commit -a
+	git tag -a <version>			# full x.y.z version
 
-	- if this is an x.y.z release, then:
-		git checkout branch-<version>		# the x.y parts only
-		git merge master
-		git tag -a <version>			# full x.y.z version
+	- make sure .git/gbp.conf set to use branch-<version> as upstream
 
 	git checkout debian
 	git merge branch-<version>