diff --git a/helpers/DATA/pkg-kde-tools/000_add_trisquel_maintainer.patch b/helpers/DATA/pkg-kde-tools/000_add_trisquel_maintainer.patch new file mode 100644 index 0000000..df291f6 --- /dev/null +++ b/helpers/DATA/pkg-kde-tools/000_add_trisquel_maintainer.patch @@ -0,0 +1,36 @@ +diff --git a/qt-kde-team/1/policy.mk b/qt-kde-team/1/policy.mk +index 2086de0..5499c0a 100644 +--- a/qt-kde-team/1/policy.mk ++++ b/qt-kde-team/1/policy.mk +@@ -6,6 +6,7 @@ include /usr/share/cdbs/1/rules/buildvars.mk + DEB_KDE_DISTRIBUTION := $(shell dpkg-parsechangelog | grep '^Distribution: ' | sed 's/^Distribution: \(.*\)/\1/g') + DEB_KDE_MAJOR_VERSION := $(shell echo "$(DEB_UPSTREAM_VERSION)" | cut -d. -f1-2) + DEB_KDE_MAINTAINER_CHECK := $(shell grep -e '^Maintainer:.*[[:space:]]*$$' \ ++ -e '^Maintainer:.*[[:space:]]*$$' \ + -e '^XSBC-Original-Maintainer:.*[[:space:]]*$$' debian/control) + + # Distribution-specific policy file may not exist. It is fine +diff --git a/qt-kde-team/2/policy.mk b/qt-kde-team/2/policy.mk +index bef6af59..7b40cfa7 100644 +--- a/qt-kde-team/2/policy.mk ++++ b/qt-kde-team/2/policy.mk +@@ -5,6 +5,7 @@ dqk_disable_policy_check ?= + dqk_distribution := $(shell dpkg-parsechangelog | sed -n '/^Distribution:/{ s/^Distribution:[[:space:]]*//g; p; q }') + dqk_kde_major_version := $(shell echo "$(dqk_upstream_version)" | cut -d. -f1-2) + dqk_maintainer_check := $(shell grep -e '^Maintainer:.*[[:space:]]*$$' \ ++ -e '^Maintainer:.*[[:space:]]*$$' \ + -e '^XSBC-Original-Maintainer:.*[[:space:]]*$$' debian/control) + + # Distribution-specific policy file may not exist. It is fine +diff --git a/qt-kde-team/3/policy.mk b/qt-kde-team/3/policy.mk +index bef6af59..7b40cfa7 100644 +--- a/qt-kde-team/3/policy.mk ++++ b/qt-kde-team/3/policy.mk +@@ -5,6 +5,7 @@ dqk_disable_policy_check ?= + dqk_distribution := $(shell dpkg-parsechangelog | sed -n '/^Distribution:/{ s/^Distribution:[[:space:]]*//g; p; q }') + dqk_kde_major_version := $(shell echo "$(dqk_upstream_version)" | cut -d. -f1-2) + dqk_maintainer_check := $(shell grep -e '^Maintainer:.*[[:space:]]*$$' \ ++ -e '^Maintainer:.*[[:space:]]*$$' \ + -e '^XSBC-Original-Maintainer:.*[[:space:]]*$$' debian/control) + + # Distribution-specific policy file may not exist. It is fine 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 bd9b743..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=2 +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 new file mode 100644 index 0000000..68a08f7 --- /dev/null +++ b/helpers/make-pkg-kde-tools @@ -0,0 +1,32 @@ +#!/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=3 +EXTERNAL='deb-src http://ppa.launchpad.net/nextcloud-devs/client/ubuntu $UPSTREAM main' +REPOKEY="60EE47FBAD3DD469" +BACKPORT=true + +. ./config + +# Add trisquel as maintainer to pass checks on custom packages. +patch_p1 $DATA/000_add_trisquel_maintainer.patch + +changelog "Upgrade backport as a dependency for nextcloud-desktop" + +package