Merge pull request #826 from geographika/download-fixes

Update image sizes and fix download links

CMakeLists.txt

@@ -12,10 +12,10 @@ endif()
 project(OSGeoLiveDoc LANGUAGES NONE)
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
-set(iso_size "4.1" CACHE STRING "for osgeolive-X.X.iso")
-set(iso_mini_size "4.0" CACHE STRING "for osgeolive-mini-X.X.iso")
+
+set(iso_size "4.4" CACHE STRING "for osgeolive-X.X.iso")
 set(vm_7z_size "7.0" CACHE STRING "for osgeo-vm-X.X.7z")
-set(req_hd_size "20" CACHE STRING "required hard disk space")
+set(req_hd_size "22" CACHE STRING "required hard disk space")
 
 
 #---------------------------------------------

doc/conf.py

@@ -22,7 +22,6 @@
 import sys, os
 
 iso_size = @iso_size@
-iso_mini_size = @iso_mini_size@
 vm_7z_size = @vm_7z_size@
 req_hd_size = @req_hd_size@
 
@@ -242,10 +241,10 @@
 rst_epilog="""
 .. |osgeolive-project| replace:: %(projectname)s
 .. |osgeolive-version| replace:: %(projectname)s %(projectversion)s
-.. |osgeolive-version-only| replace:: %(projectversion)s
+.. |sourceforge-download| replace:: https://sourceforge.net/projects/osgeo-live/files/%(projectversion)s/
+.. |osgeo-download| replace:: https://download.osgeo.org/livedvd/releases/%(projectversion)s/
 .. |osgeolive-hdspace| replace:: %(required_hd_space)02d GB
 .. |osgeolive-iso-size| replace:: %(iso_size).1f GB
-.. |osgeolive-iso-mini-size| replace:: %(iso_mini_size).1f GB
 .. |osgeolive-vm-7z-size| replace:: %(vm_7z_size).1f GB
 .. |osgeolive-appmenupath-geoserver| replace:: :menuselection:`Geospatial --> Web Services --> GeoServer --> Start GeoServer`
 .. |osgeolive-appmenupath-udig| replace:: :menuselection:`Geospatial --> Desktop GIS --> uDig`
@@ -306,6 +305,5 @@
   'projectversion': version,
   'required_hd_space': req_hd_size,
   'iso_size': iso_size,
-  'iso_mini_size': iso_mini_size,
   'vm_7z_size': vm_7z_size
 }

doc/download.rst

@@ -8,9 +8,9 @@ Download
 
 The latest stable release is |osgeolive-version| and can be downloaded from:
 
-https://sourceforge.net/projects/osgeo-live/files/|osgeolive-version-only|/
+|sourceforge-download|
 
-https://download.osgeo.org/livedvd/releases/|osgeolive-version-only|/ (.vmdk)
+|osgeo-download| (.vmdk)
 
 
 Picking the right image for you: