diff --git a/helpers/DATA/osinfo-db/001-update_url_to_trisquel_11.0.1_iso.patch b/helpers/DATA/osinfo-db/001-update_url_to_trisquel_11.0.1_iso.patch deleted file mode 100644 index f831296..0000000 --- a/helpers/DATA/osinfo-db/001-update_url_to_trisquel_11.0.1_iso.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/data/os/trisquel.info/trisquel-11.xml.in b/data/os/trisquel.info/trisquel-11.xml.in -index 3b208115..0c986732 100644 ---- a/data/os/trisquel.info/trisquel-11.xml.in -+++ b/data/os/trisquel.info/trisquel-11.xml.in -@@ -31,7 +31,7 @@ - - - -- https://cdimage.trisquel.info/trisquel-images/trisquel_11.0_amd64.iso -+ https://cdimage.trisquel.info/trisquel-images/trisquel_11.0.1_amd64.iso - - trisquel 11.\d(.\d+)? amd64.* - -@@ -40,7 +40,7 @@ - - - -- https://cdimage.trisquel.info/trisquel-images/trisquel-mini_11.0_amd64.iso -+ https://cdimage.trisquel.info/trisquel-images/trisquel-mini_11.0.1_amd64.iso - - trisquel-mini 11.\d(.\d+)? amd64.* - -@@ -49,7 +49,7 @@ - - - -- https://cdimage.trisquel.info/trisquel-images/trisquel-sugar_11.0_amd64.iso -+ https://cdimage.trisquel.info/trisquel-images/trisquel-sugar_11.0.1_amd64.iso - - trisquel-sugar 11.\d(.\d+)? amd64.* - -@@ -58,7 +58,7 @@ - - - -- https://cdimage.trisquel.info/trisquel-images/triskel_11.0_amd64.iso -+ https://cdimage.trisquel.info/trisquel-images/triskel_11.0.1_amd64.iso - - triskel 11.\d(.\d+)? amd64.* - diff --git a/helpers/DATA/osinfo-db/002-add_upgrades_id_trisquel.patch b/helpers/DATA/osinfo-db/002-add_upgrades_id_trisquel.patch deleted file mode 100644 index 3b7b1f6..0000000 --- a/helpers/DATA/osinfo-db/002-add_upgrades_id_trisquel.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/data/os/trisquel.info/trisquel-10.xml.in b/data/os/trisquel.info/trisquel-10.xml.in -index f012ba00..78fd5bdd 100644 ---- a/data/os/trisquel.info/trisquel-10.xml.in -+++ b/data/os/trisquel.info/trisquel-10.xml.in -@@ -11,6 +11,7 @@ - linux - trisquel - Nabia -+ - - - 2022-02-01 -diff --git a/data/os/trisquel.info/trisquel-11.xml.in b/data/os/trisquel.info/trisquel-11.xml.in -index 0c986732..8619adb1 100644 ---- a/data/os/trisquel.info/trisquel-11.xml.in -+++ b/data/os/trisquel.info/trisquel-11.xml.in -@@ -11,6 +11,7 @@ - linux - trisquel - Aramo -+ - - - 2023-03-19 diff --git a/helpers/DATA/osinfo-db/003-modify_derivation_use_trisquel_logo.patch b/helpers/DATA/osinfo-db/patch_changes/003-modify_derivation_use_trisquel_logo.patch similarity index 100% rename from helpers/DATA/osinfo-db/003-modify_derivation_use_trisquel_logo.patch rename to helpers/DATA/osinfo-db/patch_changes/003-modify_derivation_use_trisquel_logo.patch diff --git a/helpers/make-osinfo-db b/helpers/make-osinfo-db index f949b63..6f9019a 100644 --- a/helpers/make-osinfo-db +++ b/helpers/make-osinfo-db @@ -24,11 +24,8 @@ VERSION=8 rd_domain=($(cat $DATA/recommended-distros|grep -v \#|awk '{print$3}')) -# Apply latest patches -for patch in $(ls -v ${DATA}/*.patch) -do - patch_p1 $patch -done +# Apply patches +apply_patch_changes # Remove non-free distros references. TMPDIR=$(mktemp -d os-XXXX)