Initial changes for Nabia

helpers/make-libnumbertext

-#!/bin/sh
-#
-#    Copyright (C) 2019  Luis Guzmán <ark@switnet.org>
-#
-#    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
-

helpers/make-liborcus

-#!/bin/sh
-#
-#    Copyright (C) 2019  Luis Guzmán <ark@switnet.org>
-#
-#    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
-

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

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

helpers/make-lmms

-#!/bin/sh
-#
-#    Copyright (C) 2019 Mason Hock <mason@masonhock.com>
-#
-#    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

helpers/make-mdds

-#!/bin/sh
-#
-#    Copyright (C) 2019  Luis Guzmán <ark@switnet.org>
-#
-#    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
-

helpers/make-midori

-#!/bin/sh
-#
-#    Copyright (C) 2019 Mason Hock <mason@masonhock.com>
-#
-#    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
-

helpers/make-nspr

-#!/bin/sh
-#
-#    Copyright (C) 2020  Luis Guzmán <ark@switnet.org>
-#
-#    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
-

helpers/make-nss

-#!/bin/sh
-#
-#    Copyright (C) 2020  Luis Guzmán <ark@switnet.org>
-#
-#    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
-

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
 

helpers/make-opendht

-#!/bin/sh
-#
-#    Copyright (C) 2018 Ruben Rodriguez <ruben@trisquel.info>
-#
-#    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

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

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
 

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
 

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

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
 

helpers/make-orca

-#!/bin/sh
-#
-#    Copyright (C) 2020  Luis Guzmán <ark@switnet.org>
-#
-#    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

helpers/make-pam-u2f

-#!/bin/sh
-#
-#    Copyright (C) 2019  Ruben Rodriguez <ruben@trisquel.info>
-#
-#    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
-

helpers/make-patchage

-#!/bin/sh
-#
-#    Copyright (C) 2019 Mason Hock <ruben@trisquel.info>
-#
-#    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

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