diff --git a/helpers/make-osinfo-db b/helpers/make-osinfo-db index ce6b72f086411df9e4383aa3e4d126fc0ca92441..2f7e4ab4c764fd808f08dcffeae9b6c5fd45469b 100644 --- a/helpers/make-osinfo-db +++ b/helpers/make-osinfo-db @@ -18,7 +18,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=6 +VERSION=7 EXTERNAL='deb-src http://ftp.us.debian.org/debian bookworm main' REPOKEY=6ED0E7B82643E131 @@ -41,15 +41,10 @@ do mv data/os/$i $TMPDIR || true done # Remove iso url for non-recommended distros, along with manjaro using custom url. -grep -rl "<url>.*.iso.*</url>" data/os/|xargs -r sed -i "/.iso/d" +grep -rl "<url>.*.iso.*</url>" data/os/|xargs -r sed -i "/\.iso/d" grep -rl '<url>' data/os/manjaro.org/|xargs -r sed -i "/<url>/d" mv $TMPDIR/* data/os/ -# Remove tests that will fail from previos iso url removal. -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 - -changelog "Remove links to non-free distros suggestion from osinfo-db." +changelog "Remove links to non-free distros from osinfo-db." compile