From fd4aad1ebe6d2186e1e734a294e1e39fe4de8db2 Mon Sep 17 00:00:00 2001 From: Ark74 Date: Sat, 14 Mar 2026 14:24:45 -0600 Subject: [PATCH] 0ad: update version to latest 0.28 --- helpers/make-0ad | 28 +++++++++++++++++++--------- helpers/make-0ad-data | 18 +++++++++--------- 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/helpers/make-0ad b/helpers/make-0ad index fb5375d5..f06a6fe3 100644 --- a/helpers/make-0ad +++ b/helpers/make-0ad @@ -1,10 +1,10 @@ #!/bin/sh # -# Copyright (C) 2025 Luis Guzman +# Copyright (C) 2026 Luis Guzman # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -13,17 +13,27 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# +# along with this program. If not, see . -VERSION=2 -EXTERNAL='deb-src https://ppa.launchpadcontent.net/oibaf/graphics-drivers/ubuntu $UPSTREAM main' -REPOKEY="957D2708A03A4626" + +VERSION=1 +EXTERNAL='deb-src http://deb.debian.org/debian trixie-backports main' +REPOKEY=6ED0E7B82643E131 BACKPORTS=true +BUILD_UNTIL=12.0 . ./config -changelog "Backported to get latest version into Trisquel" +# Set custom rustc/cargo versions +sed -i '/rustc/s/,/| rustc-1.84,/' debian/control +sed -i '/cargo/s/,/| cargo-1.84,/' debian/control + +sed -i '/export DEB_BUILD_MAINT_OPTIONS/i \\n' debian/rules +sed -i '/export DEB_BUILD_MAINT_OPTIONS/i # Trisquel custom rustc/cargo version variables' debian/rules +sed -i '/export DEB_BUILD_MAINT_OPTIONS/i export RUSTC=/usr/bin/rustc-1.84' debian/rules +sed -i '/export DEB_BUILD_MAINT_OPTIONS/i export CARGO=/usr/bin/cargo-1.84' debian/rules +sed -i '/export DEB_BUILD_MAINT_OPTIONS/i \\n' debian/rules + +changelog "Backport the latest stable and usable 0ad release from Trixie" package diff --git a/helpers/make-0ad-data b/helpers/make-0ad-data index 0179b031..985eaec2 100644 --- a/helpers/make-0ad-data +++ b/helpers/make-0ad-data @@ -1,10 +1,10 @@ #!/bin/sh # -# Copyright (C) 2025 Luis Guzman +# Copyright (C) 2026 Luis Guzman # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -13,18 +13,18 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# +# along with this program. If not, see . -VERSION=2 -EXTERNAL='deb-src https://ppa.launchpadcontent.net/oibaf/graphics-drivers/ubuntu $UPSTREAM main' -REPOKEY="957D2708A03A4626" + +VERSION=1 +EXTERNAL='deb-src http://deb.debian.org/debian trixie-backports main' +REPOKEY=6ED0E7B82643E131 BACKPORTS=true +BUILD_UNTIL=12.0 . ./config -changelog "Backported to get latest version into Trisquel" +changelog "Backport the latest stable 0ad-data release from Trixie" package