From f24da921d25f5feec70800bd1ad003be24d0d6e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= Date: Mon, 16 Sep 2024 15:11:46 +0000 Subject: [PATCH] nextcloud-desktop: backport packages required for v3.14 --- helpers/make-extra-cmake-modules | 30 ++++++++++++++++++++++++++++++ helpers/make-kf6-karchive | 30 ++++++++++++++++++++++++++++++ helpers/make-nextcloud-desktop | 10 +++++++--- helpers/make-pkg-kde-tools | 14 +++++--------- 4 files changed, 72 insertions(+), 12 deletions(-) create mode 100644 helpers/make-extra-cmake-modules create mode 100644 helpers/make-kf6-karchive diff --git a/helpers/make-extra-cmake-modules b/helpers/make-extra-cmake-modules new file mode 100644 index 0000000..d770f93 --- /dev/null +++ b/helpers/make-extra-cmake-modules @@ -0,0 +1,30 @@ +#!/bin/sh +# +# Copyright (C) 2024 Luis Guzmán +# +# 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 +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 +# + +VERSION=1 +EXTERNAL='deb-src http://ppa.launchpad.net/nextcloud-devs/client/ubuntu $UPSTREAM main' +REPOKEY="60EE47FBAD3DD469" +BACKPORT=true + +. ./config + + +changelog "Added as a dependency for nextcloud-desktop backport" + +package diff --git a/helpers/make-kf6-karchive b/helpers/make-kf6-karchive new file mode 100644 index 0000000..d770f93 --- /dev/null +++ b/helpers/make-kf6-karchive @@ -0,0 +1,30 @@ +#!/bin/sh +# +# Copyright (C) 2024 Luis Guzmán +# +# 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 +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 +# + +VERSION=1 +EXTERNAL='deb-src http://ppa.launchpad.net/nextcloud-devs/client/ubuntu $UPSTREAM main' +REPOKEY="60EE47FBAD3DD469" +BACKPORT=true + +. ./config + + +changelog "Added as a dependency for nextcloud-desktop backport" + +package diff --git a/helpers/make-nextcloud-desktop b/helpers/make-nextcloud-desktop index ad2e72d..e3e5e65 100644 --- a/helpers/make-nextcloud-desktop +++ b/helpers/make-nextcloud-desktop @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2021 Luis Guzmán +# Copyright (C) 2024 Luis Guzmán # # 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 @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=3 +VERSION=4 EXTERNAL='deb-src http://ppa.launchpad.net/nextcloud-devs/client/ubuntu $UPSTREAM main' REPOKEY="60EE47FBAD3DD469" BACKPORT=true @@ -29,6 +29,10 @@ sed -i "s|Utility|Network|" mirall.desktop.in #Prevent ppc64el arch since qtwebengine is not build for ppc64el. sed -i 's|Architecture: any|Architecture: amd64 arm64 armhf i386 mips64el mipsel|g' debian/control -changelog "Imported into Trisquel" +# l10n fixes +## es +grep -rl 'antes de sincronizar' |grep _es_| xargs -r sed -i "s|Perdir confirmaci´pón|Pedir confirmación|" + +changelog "Backported into Trisquel" package diff --git a/helpers/make-pkg-kde-tools b/helpers/make-pkg-kde-tools index 7581840..bad169b 100644 --- a/helpers/make-pkg-kde-tools +++ b/helpers/make-pkg-kde-tools @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2024 Luis Guzman +# Copyright (C) 2024 Luis Guzmán # # 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 @@ -17,18 +17,14 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=3 -EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu noble universe' +VERSION=1 +EXTERNAL='deb-src http://ppa.launchpad.net/nextcloud-devs/client/ubuntu $UPSTREAM main' +REPOKEY="60EE47FBAD3DD469" BACKPORT=true -BUILD_UNTIL=11.0 . ./config -# Fix version number due to early release. -export FULLVERSION="$(sed 's|ubuntu4||' <<< $FULLVERSION)" - -changelog "Backported from noble as dependency of libsrtp2 for openssl 3.0 support. || Route backport to upstream ubuntu." -head -n1 debian/changelog | grep -q ubuntu && echo "error: update FULLVERSION value" && exit +changelog "Upgrade backport as a dependency for nextcloud-desktop" package