From 5a2fba1d98ec7697c422b719539991812b2f3566 Mon Sep 17 00:00:00 2001
From: sethg <sethg@geographika.co.uk>
Date: Tue, 26 Mar 2024 16:46:22 +0100
Subject: [PATCH] Update image sizes and fix download links

---
 CMakeLists.txt   | 7 +++----
 doc/conf.py      | 6 ++----
 doc/download.rst | 4 ++--
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f8eaa925a1..8fe16d85bf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,10 +12,9 @@ endif()
 project(OSGeoLiveDoc LANGUAGES NONE)
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
-set(iso_size "4.0" CACHE STRING "for osgeolive-X.X.iso")
-set(iso_mini_size "4.0" CACHE STRING "for osgeolive-mini-X.X.iso")
-set(vm_7z_size "3.1" CACHE STRING "for osgeo-vm-X.X.7z")
-set(req_hd_size "20" CACHE STRING "required hard disk space")
+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 "22" CACHE STRING "required hard disk space")
 
 
 #---------------------------------------------
diff --git a/doc/conf.py b/doc/conf.py
index 0eea112277..d7d4823dee 100644
--- a/doc/conf.py
+++ b/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
 }
diff --git a/doc/download.rst b/doc/download.rst
index bcef187830..bba85750cc 100644
--- a/doc/download.rst
+++ b/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: