Update the release process for the tarball installation on ftp.gnome.org

Tarballs are uploaded to $GNOME_FTP_USER's home folder on
master.gnome.org. You have to manually ssh to the server and then run
"ftpadmin install ....tar.bz2" to make the tarball available on
ftp.gnome.org. Maybe this could be automated, but I'm not sure it's a
good idea.

In fact we only need to upload just one tarball, ftpadmin is supposed to
take care of the rest: generated tarballs with the other compression
type (.gz or .bz2), publish NEWS, generated checksums, etc.

So make-release can probably still be improved and streamlined.

2 files changed, 14 insertions, 22 deletions

diff --git a/extras/README.releasing b/extras/README.releasing
index 0943d9821..f45c0d617 100644
--- a/extras/README.releasing
+++ b/extras/README.releasing
@@ -11,9 +11,9 @@ Pre-release:
 
 Release:
 * Run the `extras/make-release` script (from extras/ directory)
-  + Add --unstable if appropriate
   + Note that this makes the tag, adds the version to bugzilla,
-    and uploads the tarballs.
+    and uploads the tarballs. You need to ssh to master.gnome.org to
+    install the tarballs on ftp.gnome.org.
 
 Post-release:
 * Update the website
diff --git a/extras/make-release b/extras/make-release
index 8c46f468a..2f66e01be 100755
--- a/extras/make-release
+++ b/extras/make-release
@@ -18,9 +18,6 @@ PACKAGE_NAME=$(echo "$PACKAGE_INFO" | cut -f1 -d' ')
 PACKAGE_VERSION=$(echo "$PACKAGE_INFO" | cut -f3 -d' ')
 TAG_NAME="${PACKAGE_VERSION}"
 
-RELEASE_TYPE="stable"
-[[ "x$1" = "x--unstable" ]] && RELEASE_TYPE="unstable"
-
 RELEASE_RC_FILE="release-rc"
 . "$RELEASE_RC_FILE" 2>/dev/null \
 	|| bail "Could not load release RC file: '$RELEASE_RC_FILE'"
@@ -48,13 +45,10 @@ Release Summary
 
   Package: ${PACKAGE_NAME}
   Version: ${PACKAGE_VERSION}
-  Release: ${RELEASE_TYPE}
 
   Release Upload:
     User:  ${WEB_USER}
     Host:  ${WEB_HOST}
-    Path:  ${WEB_PATH}
-    DOAP:  ${WEB_DOAP_PATH}
 
   git tag: ${TAG_NAME}
 
@@ -96,7 +90,6 @@ function prepare_upload () {
 	mkdir release-data || bail "Could not create release directory"
 
 	find . -maxdepth 1 \( \
-		-name \*.zip -o \
 		-name \*.bz2 -o \
 		-name \*.gz -o \
 		-name \*.dmg \
@@ -114,25 +107,23 @@ function prepare_upload () {
 function upload_release () {
 	preparing_to "upload release files"
 
-	scp -r release-data ${WEB_USER}@${WEB_HOST}:${WEB_PATH}/${PACKAGE_VERSION} \
+	scp -r release-data ${WEB_USER}@${WEB_HOST}: \
 		|| bail "Uploading release failed"
 
-	( ssh ${WEB_USER}@${WEB_HOST} rm -f ${WEB_PATH}/LATEST-IS\* &&
-	  ssh ${WEB_USER}@${WEB_HOST} ln -s ${PACKAGE_VERSION} \
-		${WEB_PATH}/LATEST-IS-${PACKAGE_VERSION} ) \
-		|| bail "Could not create the LATEST-IS-${PACKAGE_VERSION} link"
-	
-	rm -rf release-data
+#	( ssh ${WEB_USER}@${WEB_HOST} ftpadmin install \
+#		release-data/${PACKAGE_NAME}-${PACKAGE_VERSION}.tar.bz2) \
+#		|| bail "Could not install the tarball"
+	echo "Connect by ssh to master.gnome.org and then run this command to install the tarballs to ftp.gnome.org :"
+	echo "  ftpadmin install release-data/${PACKAGE_NAME}-${PACKAGE_VERSION}.tar.bz2"
 
-	[[ -z "${WEB_DOAP_PATH}" ]] || {
-		scp *.doap ${WEB_USER}@${WEB_HOST}:${WEB_DOAP_PATH} \
-			|| bail "Could not upload DOAP file"
-	}
+	read -p "Press enter when the tarballs are installed..."
+
+	rm -rf release-data
 }
 
 function tag_release () {
 	preparing_to "tag release as '${TAG_NAME}'"
-	git tag -a -m "${PACKAGE_VERSION} ${RELEASE_TYPE} release" \
+	git tag -a -m "${PACKAGE_VERSION} release" \
 		${TAG_NAME} || bail "Could not create tag"
 	git push origin ${TAG_NAME} || bail "Failed to push tag to remote"
 }
@@ -170,7 +161,8 @@ fi
 prepare_upload
 upload_release
 tag_release
-post_release
+# Done by ftpadmin on master.gnome.org
+#post_release
 
 echo
 echo "Congratulations, you have released ${PACKAGE_VERSION}!"