diff --git a/helpers/config b/helpers/config index 27aa21d..249a39f 100755 --- a/helpers/config +++ b/helpers/config @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2008-2010 Rubén Rodríguez +# Copyright (C) 2008-2020 Ruben Rodriguez # Copyright (C) 2014 Santiago Rodriguez # Copyright (C) 2019 David Trudgian # @@ -39,15 +39,14 @@ fi export DEBIAN_FRONTEND=noninteractive export DEBEMAIL=trisquel-devel@listas.trisquel.info export DEBFULLNAME="Trisquel GNU/Linux developers" -export CODENAME=etiona -export REVISION=9.0 +export CODENAME=nabia +export REVISION=10.0 export RELEASE=trisquel export DOMAIN=trisquel.info -export UPSTREAM=bionic -export UPSTREAMRELEASE=18.04 +export UPSTREAM=focal +export UPSTREAMRELEASE=20.04 MIRROR=http://archive.ubuntu.com/ubuntu -DEVELMIRROR=http://devel.trisquel.info/trisquel/$CODENAME -LOCALMIRROR=http://archive.trisquel.info/trisquel +LOCALMIRROR=https://archive.trisquel.org/trisquel LOCAL_APT=`mktemp -d` export RPL="$PWD/DATA/rpl" diff --git a/helpers/make-alembic b/helpers/make-alembic index 288d6a3..72250d7 100644 --- a/helpers/make-alembic +++ b/helpers/make-alembic @@ -18,7 +18,7 @@ # VERSION=1 -EXTERNAL='deb-src http://ppa.launchpad.net/thomas-schiex/blender/ubuntu bionic main' +EXTERNAL='deb-src http://ppa.launchpad.net/thomas-schiex/blender/ubuntu $UPSTREAM main' REPOKEY=7281E3E842A98114 BACKPORTS=true diff --git a/helpers/make-ardour b/helpers/make-ardour deleted file mode 100644 index 5ac679c..0000000 --- a/helpers/make-ardour +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2019 Mason Hock -# -# 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://archive.ubuntu.com/ubuntu eoan main universe' -REPOKEY=7638D0442B90D010 -BACKPORTS=true - -. ./config - -changelog "Backported from eoan" - -compile diff --git a/helpers/make-audacity b/helpers/make-audacity deleted file mode 100644 index de0dd7f..0000000 --- a/helpers/make-audacity +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2019 Mason Hock -# -# 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://archive.ubuntu.com/ubuntu focal main universe' -REPOKEY="3B4FE6ACC0B21F32" -BACKPORTS=true - -. ./config - -changelog "Backported from ppa" - -compile diff --git a/helpers/make-blender b/helpers/make-blender index c632551..1b8042f 100644 --- a/helpers/make-blender +++ b/helpers/make-blender @@ -19,7 +19,7 @@ # VERSION=3 -EXTERNAL='deb-src http://ppa.launchpad.net/thomas-schiex/blender/ubuntu bionic main ' +EXTERNAL='deb-src http://ppa.launchpad.net/thomas-schiex/blender/ubuntu $UPSTREAM main ' REPOKEY=7281E3E842A98114 BACKPORTS=true DEPENDS=alembic,openimageio,openshadinglanguage,openjpeg,opencollada,opensubdiv diff --git a/helpers/make-calf b/helpers/make-calf index 6410f47..fd673f8 100644 --- a/helpers/make-calf +++ b/helpers/make-calf @@ -18,7 +18,7 @@ # VERSION=1 -EXTERNAL='deb-src http://ppa.launchpad.net/ubuntustudio-ppa/backports/ubuntu bionic main ' +EXTERNAL='deb-src http://ppa.launchpad.net/ubuntustudio-ppa/backports/ubuntu $UPSTREAM main ' REPOKEY=F596CF7036BBAA6D BACKPORTS=true diff --git a/helpers/make-carla b/helpers/make-carla index 6410f47..fd673f8 100644 --- a/helpers/make-carla +++ b/helpers/make-carla @@ -18,7 +18,7 @@ # VERSION=1 -EXTERNAL='deb-src http://ppa.launchpad.net/ubuntustudio-ppa/backports/ubuntu bionic main ' +EXTERNAL='deb-src http://ppa.launchpad.net/ubuntustudio-ppa/backports/ubuntu $UPSTREAM main ' REPOKEY=F596CF7036BBAA6D BACKPORTS=true diff --git a/helpers/make-cmake3 b/helpers/make-cmake3 index 288d6a3..72250d7 100644 --- a/helpers/make-cmake3 +++ b/helpers/make-cmake3 @@ -18,7 +18,7 @@ # VERSION=1 -EXTERNAL='deb-src http://ppa.launchpad.net/thomas-schiex/blender/ubuntu bionic main' +EXTERNAL='deb-src http://ppa.launchpad.net/thomas-schiex/blender/ubuntu $UPSTREAM main' REPOKEY=7281E3E842A98114 BACKPORTS=true diff --git a/helpers/make-csound b/helpers/make-csound deleted file mode 100644 index 8a3e027..0000000 --- a/helpers/make-csound +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2020 Ruben Rodriguez -# -# 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=2 -EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu focal main universe' -REPOKEY="3B4FE6ACC0B21F32" - -. ./config - -changelog "Backported from Focal" - -compile diff --git a/helpers/make-deluge b/helpers/make-deluge index 913d792..23bc546 100644 --- a/helpers/make-deluge +++ b/helpers/make-deluge @@ -18,7 +18,7 @@ # VERSION=1 -EXTERNAL='deb-src http://ppa.launchpad.net/deluge-team/stable/ubuntu bionic main' +EXTERNAL='deb-src http://ppa.launchpad.net/deluge-team/stable/ubuntu $UPSTREAM main' REPOKEY="C5E6A5ED249AD24C" BACKPORT=true diff --git a/helpers/make-dh-python b/helpers/make-dh-python deleted file mode 100644 index b990bbc..0000000 --- a/helpers/make-dh-python +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2020 Ruben Rodriguez -# -# 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://archive.ubuntu.com/ubuntu focal main universe' -REPOKEY="3B4FE6ACC0B21F32" - -. ./config - -changelog "Backported from Focal" - -compile diff --git a/helpers/make-dovecot b/helpers/make-dovecot deleted file mode 100644 index 048b111..0000000 --- a/helpers/make-dovecot +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2020 Ruben Rodriguez -# -# 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://archive.ubuntu.com/ubuntu focal main universe' -REPOKEY="3B4FE6ACC0B21F32" -BACKPORT=true - -. ./config - -changelog "Backported from focal" - -compile - diff --git a/helpers/make-dvdstyler b/helpers/make-dvdstyler index 73bc4b7..6ed5f1a 100644 --- a/helpers/make-dvdstyler +++ b/helpers/make-dvdstyler @@ -19,7 +19,7 @@ # VERSION=1 -EXTERNAL='deb-src http://ppa.launchpad.net/ubuntuhandbook1/dvdstyler/ubuntu focal main' +EXTERNAL='deb-src http://ppa.launchpad.net/ubuntuhandbook1/dvdstyler/ubuntu $UPSTREAM main' REPOKEY=A0062203196CA4482DDB859E4C1CBE14852541CB BACKPORTS=true DEPENDS=wxsvg diff --git a/helpers/make-gnome-icon-theme b/helpers/make-gnome-icon-theme deleted file mode 100644 index 02ee6b4..0000000 --- a/helpers/make-gnome-icon-theme +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2008-2016 Ruben Rodriguez -# -# 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://archive.ubuntu.com/ubuntu focal universe' - -. ./config - -changelog "Backport from focal" - -compile \ No newline at end of file diff --git a/helpers/make-handbrake b/helpers/make-handbrake index 0a82d47..e2dc1c9 100644 --- a/helpers/make-handbrake +++ b/helpers/make-handbrake @@ -18,7 +18,7 @@ # VERSION=2 -EXTERNAL="deb-src http://ppa.launchpad.net/stebbins/handbrake-releases/ubuntu bionic main" +EXTERNAL="deb-src http://ppa.launchpad.net/stebbins/handbrake-releases/ubuntu $UPSTREAM main" REPOKEY="8771ADB0816950D8" BACKPORT=true diff --git a/helpers/make-ilmbase b/helpers/make-ilmbase index 288d6a3..72250d7 100644 --- a/helpers/make-ilmbase +++ b/helpers/make-ilmbase @@ -18,7 +18,7 @@ # VERSION=1 -EXTERNAL='deb-src http://ppa.launchpad.net/thomas-schiex/blender/ubuntu bionic main' +EXTERNAL='deb-src http://ppa.launchpad.net/thomas-schiex/blender/ubuntu $UPSTREAM main' REPOKEY=7281E3E842A98114 BACKPORTS=true diff --git a/helpers/make-inkscape b/helpers/make-inkscape index b0cd2f7..e9927ae 100644 --- a/helpers/make-inkscape +++ b/helpers/make-inkscape @@ -18,7 +18,7 @@ # VERSION=2 -EXTERNAL='deb-src http://ppa.launchpad.net/inkscape.dev/stable/ubuntu bionic main ' +EXTERNAL='deb-src http://ppa.launchpad.net/inkscape.dev/stable/ubuntu $UPSTREAM main ' REPOKEY=9DA4BD18B9A06DE3 BACKPORTS=true diff --git a/helpers/make-kmod b/helpers/make-kmod deleted file mode 100644 index 2e6f1e0..0000000 --- a/helpers/make-kmod +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2020 Ruben Rodriguez -# -# 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 - -. ./config - -sed 's/dh_makeshlibs.*/dh_makeshlibs --add-udeb=libkmod2-udeb -- -c4/' -i debian/rules - -# Note, only needed on bionic-updates -# After this, systemd needs to be built to fix udev-udeb dependencies -changelog "Fixed bug in debian-installer integration" - -compile diff --git a/helpers/make-libcmis b/helpers/make-libcmis deleted file mode 100644 index a60231a..0000000 --- a/helpers/make-libcmis +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2019 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://archive.ubuntu.com/ubuntu focal main universe' -REPOKEY="3B4FE6ACC0B21F32" -BACKPORT=true - -. ./config - -changelog "Backported from Disco" - -compile diff --git a/helpers/make-libixion b/helpers/make-libixion deleted file mode 100644 index 9c1066b..0000000 --- a/helpers/make-libixion +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2019 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=2 -EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu focal main universe' -REPOKEY="3B4FE6ACC0B21F32" -BACKPORT=true -DEPENDS=mdds - -. ./config - -changelog "Backported from Focal" - -compile - diff --git a/helpers/make-libnumbertext b/helpers/make-libnumbertext deleted file mode 100644 index 5373b0b..0000000 --- a/helpers/make-libnumbertext +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2019 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://archive.ubuntu.com/ubuntu focal main universe' -REPOKEY="3B4FE6ACC0B21F32" -BACKPORT=true - -. ./config - -changelog "Backported from Cosmic" - -compile - diff --git a/helpers/make-liborcus b/helpers/make-liborcus deleted file mode 100644 index 8a535ed..0000000 --- a/helpers/make-liborcus +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2019 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=2 -EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu focal main universe' -REPOKEY="3B4FE6ACC0B21F32" -BACKPORT=true -DEPENDS=mdds,libixion -#,libetonyek - -. ./config - -changelog "Backported from Focal" - -compile - diff --git a/helpers/make-libreoffice b/helpers/make-libreoffice index 16d2a12..ce074ed 100644 --- a/helpers/make-libreoffice +++ b/helpers/make-libreoffice @@ -18,7 +18,7 @@ # VERSION=2 -EXTERNAL='deb-src http://ppa.launchpad.net/libreoffice/ppa/ubuntu bionic main' +EXTERNAL='deb-src http://ppa.launchpad.net/libreoffice/ppa/ubuntu $UPSTREAM main' REPOKEY="83FBA1751378B444" BACKPORT=true DEPENDS=libcmis,mdds,libixion,liborcus,libnumbertext,xmlsec1,qr-code-generator,nss diff --git a/helpers/make-linux-hwe b/helpers/make-linux-hwe index 7e92693..8db59f0 100644 --- a/helpers/make-linux-hwe +++ b/helpers/make-linux-hwe @@ -23,15 +23,15 @@ VERSION=2 . ./config # Disable lz4 compression in etiona/bionic -sed '/CONFIG_KERNEL_LZ4/d; /CONFIG_KERNEL_GZIP/d' -i debian.*/config/annotations -for i in debian.master/config/annotations debian.hwe/config/annotations ; do -cat << EOF >> $i -CONFIG_KERNEL_LZ4 policy<{'amd64': 'n', 'armhf': 'n', 'i386': 'n', 's390x': 'n'}> -CONFIG_KERNEL_GZIP policy<{'amd64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> -EOF -done -/bin/sed 's/CONFIG_KERNEL_LZ4=y/CONFIG_KERNEL_GZIP=y/' -i debian.master/config/*/config.common.* -/bin/sed 's/CONFIG_KERNEL_GZIP is not set/CONFIG_KERNEL_LZ4 is not set/' -i debian.master/config/*/config.common.* +#sed '/CONFIG_KERNEL_LZ4/d; /CONFIG_KERNEL_GZIP/d' -i debian.*/config/annotations +#for i in debian.master/config/annotations debian.hwe/config/annotations ; do +#cat << EOF >> $i +#CONFIG_KERNEL_LZ4 policy<{'amd64': 'n', 'armhf': 'n', 'i386': 'n', 's390x': 'n'}> +#CONFIG_KERNEL_GZIP policy<{'amd64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> +#EOF +#done +#/bin/sed 's/CONFIG_KERNEL_LZ4=y/CONFIG_KERNEL_GZIP=y/' -i debian.master/config/*/config.common.* +#/bin/sed 's/CONFIG_KERNEL_GZIP is not set/CONFIG_KERNEL_LZ4 is not set/' -i debian.master/config/*/config.common.* for PATCH in $DATA/*.patch ; do echo $PATCH diff --git a/helpers/make-lmms b/helpers/make-lmms deleted file mode 100644 index 72f9cb3..0000000 --- a/helpers/make-lmms +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2019 Mason Hock -# -# 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://archive.ubuntu.com/ubuntu focal main universe' -REPOKEY="3B4FE6ACC0B21F32" -BACKPORTS=true -DEPENDS=wine - -. ./config - -changelog "Backported from ppa" - -compile diff --git a/helpers/make-mdds b/helpers/make-mdds deleted file mode 100644 index 2f2ce22..0000000 --- a/helpers/make-mdds +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2019 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=2 -EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu focal main universe' -REPOKEY="3B4FE6ACC0B21F32" -BACKPORT=true - -. ./config - -changelog "Backported from Focal" - -compile - diff --git a/helpers/make-midori b/helpers/make-midori deleted file mode 100644 index 40942bd..0000000 --- a/helpers/make-midori +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2019 Mason Hock -# -# 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=2 -EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu focal main universe' -REPOKEY=7638D0442B90D010 - -. ./config - -sed 's|"about:search"|"https://trisquel.info/en/welcome"|' -i core/settings.vala -sed 's|t=midori|t=trisquel|' -i core/settings.vala - -changelog "Compiled for Trisquel" - -compile - diff --git a/helpers/make-nspr b/helpers/make-nspr deleted file mode 100644 index d1f4de7..0000000 --- a/helpers/make-nspr +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2020 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=2 -EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu focal main universe' -REPOKEY="3B4FE6ACC0B21F32" -BACKPORT=true - -. ./config - -sed -i "/include debian\/make.mk/a DEB_BUILD_OPTIONS=nocheck" debian/rules -changelog "Backported from Focal" - -compile - diff --git a/helpers/make-nss b/helpers/make-nss deleted file mode 100644 index fc8b4dd..0000000 --- a/helpers/make-nss +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2020 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://archive.ubuntu.com/ubuntu focal main universe' -REPOKEY="3B4FE6ACC0B21F32" -BACKPORT=true -DEPENDS=nspr - -. ./config - -changelog "Backported from Focal" - -compile - diff --git a/helpers/make-opencollada b/helpers/make-opencollada index 288d6a3..72250d7 100644 --- a/helpers/make-opencollada +++ b/helpers/make-opencollada @@ -18,7 +18,7 @@ # VERSION=1 -EXTERNAL='deb-src http://ppa.launchpad.net/thomas-schiex/blender/ubuntu bionic main' +EXTERNAL='deb-src http://ppa.launchpad.net/thomas-schiex/blender/ubuntu $UPSTREAM main' REPOKEY=7281E3E842A98114 BACKPORTS=true diff --git a/helpers/make-opendht b/helpers/make-opendht deleted file mode 100644 index c571bd7..0000000 --- a/helpers/make-opendht +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2018 Ruben Rodriguez -# -# 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://archive.ubuntu.com/ubuntu focal main universe' -REPOKEY=7638D0442B90D010 - -. ./config - -changelog "Backported from focal" - -compile diff --git a/helpers/make-openexr b/helpers/make-openexr index 07c7533..d4ad6eb 100644 --- a/helpers/make-openexr +++ b/helpers/make-openexr @@ -18,7 +18,7 @@ # VERSION=1 -EXTERNAL='deb-src http://ppa.launchpad.net/thomas-schiex/blender/ubuntu bionic main' +EXTERNAL='deb-src http://ppa.launchpad.net/thomas-schiex/blender/ubuntu $UPSTREAM main' REPOKEY=7281E3E842A98114 BACKPORTS=true DEPENDS=ilmbase diff --git a/helpers/make-openimageio b/helpers/make-openimageio index 288d6a3..72250d7 100644 --- a/helpers/make-openimageio +++ b/helpers/make-openimageio @@ -18,7 +18,7 @@ # VERSION=1 -EXTERNAL='deb-src http://ppa.launchpad.net/thomas-schiex/blender/ubuntu bionic main' +EXTERNAL='deb-src http://ppa.launchpad.net/thomas-schiex/blender/ubuntu $UPSTREAM main' REPOKEY=7281E3E842A98114 BACKPORTS=true diff --git a/helpers/make-openjpeg b/helpers/make-openjpeg index bdae459..591b2c6 100644 --- a/helpers/make-openjpeg +++ b/helpers/make-openjpeg @@ -18,7 +18,7 @@ # VERSION=1 -EXTERNAL='deb-src http://ppa.launchpad.net/thomas-schiex/blender/ubuntu bionic main' +EXTERNAL='deb-src http://ppa.launchpad.net/thomas-schiex/blender/ubuntu $UPSTREAM main' REPOKEY=7281E3E842A98114 BACKPORTS=true diff --git a/helpers/make-openshadinglanguage b/helpers/make-openshadinglanguage index 62d91d8..68211e6 100644 --- a/helpers/make-openshadinglanguage +++ b/helpers/make-openshadinglanguage @@ -18,7 +18,7 @@ # VERSION=1 -EXTERNAL='deb-src http://ppa.launchpad.net/thomas-schiex/blender/ubuntu bionic main' +EXTERNAL='deb-src http://ppa.launchpad.net/thomas-schiex/blender/ubuntu $UPSTREAM main' REPOKEY=7281E3E842A98114 BACKPORTS=true DEPENDS=openimageio diff --git a/helpers/make-opensubdiv b/helpers/make-opensubdiv index 288d6a3..72250d7 100644 --- a/helpers/make-opensubdiv +++ b/helpers/make-opensubdiv @@ -18,7 +18,7 @@ # VERSION=1 -EXTERNAL='deb-src http://ppa.launchpad.net/thomas-schiex/blender/ubuntu bionic main' +EXTERNAL='deb-src http://ppa.launchpad.net/thomas-schiex/blender/ubuntu $UPSTREAM main' REPOKEY=7281E3E842A98114 BACKPORTS=true diff --git a/helpers/make-orca b/helpers/make-orca deleted file mode 100644 index 26f0f99..0000000 --- a/helpers/make-orca +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2020 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://archive.ubuntu.com/ubuntu focal main universe' -REPOKEY="3B4FE6ACC0B21F32" - -. ./config - -sed '/speech-dispatcher/s/$/ speech-dispatcher-espeak-ng,/' -i debian/control* - -changelog "Backported from Focal" - -compile diff --git a/helpers/make-pam-u2f b/helpers/make-pam-u2f deleted file mode 100644 index 0c40c25..0000000 --- a/helpers/make-pam-u2f +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2019 Ruben Rodriguez -# -# 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://archive.ubuntu.com/ubuntu focal universe' - -. ./config - -sed 's/debhelper.*/debhelper,/' -i debian/control -echo 9 > debian/compat - -changelog "Backported from focal" - -compile - diff --git a/helpers/make-patchage b/helpers/make-patchage deleted file mode 100644 index 5ac679c..0000000 --- a/helpers/make-patchage +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2019 Mason Hock -# -# 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://archive.ubuntu.com/ubuntu eoan main universe' -REPOKEY=7638D0442B90D010 -BACKPORTS=true - -. ./config - -changelog "Backported from eoan" - -compile diff --git a/helpers/make-pdfshuffler b/helpers/make-pdfshuffler index 71ead46..eccab6f 100644 --- a/helpers/make-pdfshuffler +++ b/helpers/make-pdfshuffler @@ -27,7 +27,7 @@ quilt push -a sed -i "s|Office;|Utility;|" data/pdfshuffler.desktop cp $DATA/images/* data/ -changelog "Small customization for etiona" +changelog "Small customization for Trisquel" compile diff --git a/helpers/make-pygame b/helpers/make-pygame deleted file mode 100644 index abb3b89..0000000 --- a/helpers/make-pygame +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2020 Ruben Rodriguez -# -# 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=2 -EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu focal main universe' -REPOKEY="871920D1991BC93C" - -. ./config - -changelog "Backported from focal" - -compile - diff --git a/helpers/make-python-acme b/helpers/make-python-acme index 516a18e..4c7b265 100644 --- a/helpers/make-python-acme +++ b/helpers/make-python-acme @@ -18,7 +18,7 @@ # VERSION=1 -EXTERNAL='deb-src http://ppa.launchpad.net/certbot/certbot/ubuntu bionic main ' +EXTERNAL='deb-src http://ppa.launchpad.net/certbot/certbot/ubuntu $UPSTREAM main ' REPOKEY=8C47BE8E75BCA694 . ./config diff --git a/helpers/make-python-internetarchive b/helpers/make-python-internetarchive deleted file mode 100644 index 37886fb..0000000 --- a/helpers/make-python-internetarchive +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2020 Ruben Rodriguez -# -# 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://archive.ubuntu.com/ubuntu focal main universe' -REPOKEY="3B4FE6ACC0B21F32" -BACKPORT=true - -. ./config - -changelog "Backported from Focal" - -compile - diff --git a/helpers/make-qr-code-generator b/helpers/make-qr-code-generator deleted file mode 100644 index 2f2ce22..0000000 --- a/helpers/make-qr-code-generator +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2019 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=2 -EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu focal main universe' -REPOKEY="3B4FE6ACC0B21F32" -BACKPORT=true - -. ./config - -changelog "Backported from Focal" - -compile - diff --git a/helpers/make-ring b/helpers/make-ring deleted file mode 100644 index 52ac360..0000000 --- a/helpers/make-ring +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2018 Ruben Rodriguez -# -# 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 -# - -# build-dep tree: -# -# ring -# restbed libsecp256k1 libupnp -# ffmpeg -# libmysofa libopenmpt -# opendht -# msgpack-c argon2 -# gnutls28 -# libtasn1-6 -# unbound -# libunistring -# softhsm2 - -VERSION=1 -EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu focal main universe' -REPOKEY=7638D0442B90D010 - -. ./config - -sed 's/--disable-downloads/--disable-downloads --disable-nettle/' -i debian/rules - -changelog "Backported from focal" - -compile diff --git a/helpers/make-scribus b/helpers/make-scribus index 400ede7..e87a64f 100644 --- a/helpers/make-scribus +++ b/helpers/make-scribus @@ -18,7 +18,7 @@ # VERSION=1 -EXTERNAL='deb-src http://ppa.launchpad.net/scribus/ppa/ubuntu bionic main ' +EXTERNAL='deb-src http://ppa.launchpad.net/scribus/ppa/ubuntu $UPSTREAM main ' REPOKEY=B70D6F7664B6EE15 BACKPORTS=true diff --git a/helpers/make-software-properties b/helpers/make-software-properties index e8e2613..6b1b092 100644 --- a/helpers/make-software-properties +++ b/helpers/make-software-properties @@ -26,11 +26,12 @@ VERSION=3 cat << EOF | patch -p1 --- source.orig/softwareproperties/SoftwareProperties.py 2014-04-14 17:10:58.000000000 +0200 +++ source/softwareproperties/SoftwareProperties.py 2014-05-18 03:02:05.309290804 +0200 -@@ -725,8 +725,17 @@ +@@ -725,8 +725,18 @@ site is in whitelist or the shortcut implementer adds it. """ + codenames = {} ++ codenames["nabia"] = "focal" + codenames["etiona"] = "bionic" + codenames["flidas"] = "xenial" + codenames["belenos"] = "trusty" diff --git a/helpers/make-sphinx b/helpers/make-sphinx deleted file mode 100644 index b990bbc..0000000 --- a/helpers/make-sphinx +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2020 Ruben Rodriguez -# -# 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://archive.ubuntu.com/ubuntu focal main universe' -REPOKEY="3B4FE6ACC0B21F32" - -. ./config - -changelog "Backported from Focal" - -compile diff --git a/helpers/make-systemd b/helpers/make-systemd deleted file mode 100644 index 14e159c..0000000 --- a/helpers/make-systemd +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2020 Ruben Rodriguez -# -# 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 - -. ./config - -# Note, only needed on bionic-updates -# Build after running make-kmod to fix udev-udeb dependencies -changelog "Fixed bug in debian-installer integration" - -compile diff --git a/helpers/make-tor b/helpers/make-tor index 5204872..7265473 100644 --- a/helpers/make-tor +++ b/helpers/make-tor @@ -18,7 +18,7 @@ # VERSION=2 -EXTERNAL='deb-src http://deb.torproject.org/torproject.org bionic main' +EXTERNAL='deb-src http://deb.torproject.org/torproject.org $UPSTREAM main' . ./config diff --git a/helpers/make-ubuntu-release-upgrader b/helpers/make-ubuntu-release-upgrader index 8ae7ada..8b81420 100644 --- a/helpers/make-ubuntu-release-upgrader +++ b/helpers/make-ubuntu-release-upgrader @@ -264,6 +264,7 @@ rpl precise toutatis . -R rpl trusty belenos . -R rpl xenial flidas . -R rpl bionic etiona . -R +rpl focal nabia . -R rm data/DistUpgrade.cfg* cp $DATA/DistUpgrade.cfg* data/ diff --git a/helpers/make-ubuntustudio-controls b/helpers/make-ubuntustudio-controls index f488ef7..9f3b326 100644 --- a/helpers/make-ubuntustudio-controls +++ b/helpers/make-ubuntustudio-controls @@ -18,7 +18,7 @@ # VERSION=1 -EXTERNAL='deb-src http://ppa.launchpad.net/ubuntustudio-ppa/backports/ubuntu bionic main ' +EXTERNAL='deb-src http://ppa.launchpad.net/ubuntustudio-ppa/backports/ubuntu $UPSTREAM main ' REPOKEY=F596CF7036BBAA6D BACKPORTS=true diff --git a/helpers/make-ubuntustudio-menu b/helpers/make-ubuntustudio-menu index e2adc20..0ae6a51 100644 --- a/helpers/make-ubuntustudio-menu +++ b/helpers/make-ubuntustudio-menu @@ -18,7 +18,7 @@ # VERSION=1 -EXTERNAL='deb-src http://ppa.launchpad.net/ubuntustudio-ppa/backports/ubuntu bionic main ' +EXTERNAL='deb-src http://ppa.launchpad.net/ubuntustudio-ppa/backports/ubuntu $UPSTREAM main ' REPOKEY=F596CF7036BBAA6D BACKPORTS=true diff --git a/helpers/make-vpb-driver b/helpers/make-vpb-driver deleted file mode 100644 index e581ff4..0000000 --- a/helpers/make-vpb-driver +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2014 Legimet -# -# 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=2 -EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu focal universe' - -. ./config - -# Remove references to nonfree firmware blob -rm debian/fetch-openline-firmware - -sed -i '/./{H;$!d;};x;/firmware/d;' debian/copyright -sed -i '1d' debian/copyright -echo >> debian/copyright - -sed -i '/./{H;$!d;};x;/firmware/d;' debian/README.Debian -sed -i '1d' debian/README.Debian -echo >> debian/README.Debian - -sed -i '/fetch-openline-firmware/d' debian/rules - -changelog "Move to a supported version for Linux kernel 4.15 trisquel2 || -Remove references to nonfree blob, fixes #10980 trisquel1" - -compile diff --git a/helpers/make-wxsvg b/helpers/make-wxsvg deleted file mode 100644 index 704637c..0000000 --- a/helpers/make-wxsvg +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2019 David Philipe GIl -# -# 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://archive.ubuntu.com/ubuntu focal main universe' -REPOKEY="3B4FE6ACC0B21F32" -BACKPORTS=true - -. ./config - -changelog "Backported from ppa" - -compile - diff --git a/helpers/make-x11-utils b/helpers/make-x11-utils deleted file mode 100644 index 7f17a62..0000000 --- a/helpers/make-x11-utils +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2020 Ruben Rodriguez -# -# 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://archive.ubuntu.com/ubuntu focal main universe' -REPOKEY="3B4FE6ACC0B21F32" - -. ./config - -changelog "Backported from focal, fixes broken xdriinfo in bionic" - -compile - diff --git a/helpers/make-xmlsec1 b/helpers/make-xmlsec1 deleted file mode 100644 index 1b3874c..0000000 --- a/helpers/make-xmlsec1 +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2020 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://archive.ubuntu.com/ubuntu focal main universe' -REPOKEY="3B4FE6ACC0B21F32" -BACKPORT=true - -. ./config - -changelog "Backported from Focal" - -compile - diff --git a/helpers/make-xul-ext-eds-calendar b/helpers/make-xul-ext-eds-calendar index 95a01d8..c4ad331 100644 --- a/helpers/make-xul-ext-eds-calendar +++ b/helpers/make-xul-ext-eds-calendar @@ -18,7 +18,7 @@ # VERSION=1 -EXTERNAL='deb-src http://ppa.launchpad.net/mate-ob/eds-calendar/ubuntu bionic main ' +EXTERNAL='deb-src http://ppa.launchpad.net/mate-ob/eds-calendar/ubuntu $UPSTREAM main ' REPOKEY=E99FABBCCA21C62C . ./config