osinfo: apply fixes and recomendations from upstream osinfo-db.

helpers/make-osinfo-db

@@ -18,7 +18,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=5
+VERSION=6
 
 EXTERNAL='deb-src http://ftp.us.debian.org/debian bookworm main'
 REPOKEY=04EE7237B7D453EC
@@ -27,17 +27,13 @@ REPOKEY=04EE7237B7D453EC
 
 rd_domain=($(cat $DATA/recommended-distros|grep -v \#|awk '{print$3}'))
 
-# Apply latest patchs
+# Apply latest patches
 for patch in $(ls -v ${DATA}/*.patch)
 do
     echo "Applying $patch"
     patch --no-backup-if-mismatch -Np1 < $patch
 done
 
-# Manually add trisquel current data
-cp $DATA/trisquel-1*.xml.in data/os/trisquel.info/
-cp -R $DATA/testdata/* tests/isodata/trisquel/
-
 # Remove non-free distros references.
 TMPDIR=$(mktemp -d os-XXXX)
 for i in "${rd_domain[@]}"
@@ -53,7 +49,6 @@ rm tests/test_isoinfo.py tests/test_schema.py
 
 # Remove ubuntu's artwork to prevent any trademark issue.
 sed -i '/derives-from/d' data/os/trisquel.info/trisquel-*.xml.in
-sed -i '/release-date/a \ \ \ \ <codename>Etiona</codename>' data/os/trisquel.info/trisquel-9.xml.in
 
 changelog "Remove links to non-free distros suggestion from osinfo-db."