diff --git a/helpers/config b/helpers/config index 9bf3fc6..ac1df0c 100755 --- a/helpers/config +++ b/helpers/config @@ -36,12 +36,12 @@ fi export DEBIAN_FRONTEND=noninteractive export DEBEMAIL=trisquel-devel@listas.trisquel.info export DEBFULLNAME="Trisquel GNU/Linux developers" -export CODENAME=flidas -export REVISION=8.0 +export CODENAME=etiona +export REVISION=9.0 export RELEASE=trisquel export DOMAIN=trisquel.info -export UPSTREAM=xenial -export UPSTREAMRELEASE=16.04 +export UPSTREAM=bionic +export UPSTREAMRELEASE=18.04 MIRROR=http://archive.ubuntu.com/ubuntu DEVELMIRROR=http://devel.trisquel.info/trisquel/$CODENAME LOCALMIRROR=http://archive.trisquel.info/trisquel diff --git a/helpers/make-argon2 b/helpers/make-argon2 deleted file mode 100644 index a93800e..0000000 --- a/helpers/make-argon2 +++ /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 bionic main universe' -REPOKEY=7638D0442B90D010 - -. ./config - -changelog "Backported from bionic" - -compile diff --git a/helpers/make-asterisk b/helpers/make-asterisk deleted file mode 100644 index e8bbbfa..0000000 --- a/helpers/make-asterisk +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2017-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://deb.debian.org/debian-security/ stretch/updates main' -REPOKEY=7638D0442B90D010 - -. ./config - -sed 's/default-libmysqlclient-dev/libmysqlclient-dev/' -i debian/control - -changelog "Backported from debian-security stretch//updates" - -compile - diff --git a/helpers/make-compton b/helpers/make-compton index b8ce5ef..3dd37d6 100644 --- a/helpers/make-compton +++ b/helpers/make-compton @@ -72,7 +72,7 @@ sed 's/^Depends:/Depends: zenity, /' debian/control* -i chmod 755 compton-launcher chmod 755 trisquel-compton-switcher -changelog "Backported into Toutatis" +changelog "Customized for Trisquel" compile diff --git a/helpers/make-ffmpeg b/helpers/make-ffmpeg deleted file mode 100644 index a93800e..0000000 --- a/helpers/make-ffmpeg +++ /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 bionic main universe' -REPOKEY=7638D0442B90D010 - -. ./config - -changelog "Backported from bionic" - -compile diff --git a/helpers/make-gnutls28 b/helpers/make-gnutls28 deleted file mode 100644 index a93800e..0000000 --- a/helpers/make-gnutls28 +++ /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 bionic main universe' -REPOKEY=7638D0442B90D010 - -. ./config - -changelog "Backported from bionic" - -compile diff --git a/helpers/make-iproute2 b/helpers/make-iproute2 deleted file mode 100644 index 8080ec0..0000000 --- a/helpers/make-iproute2 +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2017 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 zesty main' - -. ./config - -changelog "Backported from zesty" - -compile diff --git a/helpers/make-libgit2 b/helpers/make-libgit2 deleted file mode 100644 index e63adaf..0000000 --- a/helpers/make-libgit2 +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2011 Rubén Rodríguez -# -# 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://security.ubuntu.com/ubuntu bionic-security universe' -REPOKEY="3B4FE6ACC0B21F32" - -. ./config - -changelog "Imported into Trisquel" - -compile \ No newline at end of file diff --git a/helpers/make-libmysofa b/helpers/make-libmysofa deleted file mode 100644 index a93800e..0000000 --- a/helpers/make-libmysofa +++ /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 bionic main universe' -REPOKEY=7638D0442B90D010 - -. ./config - -changelog "Backported from bionic" - -compile diff --git a/helpers/make-libopenmpt b/helpers/make-libopenmpt deleted file mode 100644 index 9a0dffa..0000000 --- a/helpers/make-libopenmpt +++ /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 artful main universe' -REPOKEY=7638D0442B90D010 - -. ./config - -changelog "Backported from artful" - -compile diff --git a/helpers/make-libsecp256k1 b/helpers/make-libsecp256k1 deleted file mode 100644 index a93800e..0000000 --- a/helpers/make-libsecp256k1 +++ /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 bionic main universe' -REPOKEY=7638D0442B90D010 - -. ./config - -changelog "Backported from bionic" - -compile diff --git a/helpers/make-libtasn1-6 b/helpers/make-libtasn1-6 deleted file mode 100644 index a93800e..0000000 --- a/helpers/make-libtasn1-6 +++ /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 bionic main universe' -REPOKEY=7638D0442B90D010 - -. ./config - -changelog "Backported from bionic" - -compile diff --git a/helpers/make-libunistring b/helpers/make-libunistring deleted file mode 100644 index a93800e..0000000 --- a/helpers/make-libunistring +++ /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 bionic main universe' -REPOKEY=7638D0442B90D010 - -. ./config - -changelog "Backported from bionic" - -compile diff --git a/helpers/make-libupnp b/helpers/make-libupnp deleted file mode 100644 index a93800e..0000000 --- a/helpers/make-libupnp +++ /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 bionic main universe' -REPOKEY=7638D0442B90D010 - -. ./config - -changelog "Backported from bionic" - -compile diff --git a/helpers/make-libvirt b/helpers/make-libvirt deleted file mode 100644 index 1d08d6d..0000000 --- a/helpers/make-libvirt +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2017 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 zesty-updates main' - -. ./config - -sed '/zfsutils/d' -i debian/control -sed 's/with-storage-zfs/without-storage-zfs/' -i debian/rules - -changelog "Backported from zesty, disabled zfs integration" - -compile diff --git a/helpers/make-mailman b/helpers/make-mailman deleted file mode 100644 index 6bba84f..0000000 --- a/helpers/make-mailman +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2014-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://ftp.us.debian.org/debian stable main' -REPOKEY=EF0F382A1A7B6500 - -. ./config - -rm debian/contrib/debianpowered.png -cp $DATA/trisquelpowered.png debian/contrib/ -replace debianpowered trisquelpowered . -sed '/SITE_URL/s/www.debian.org/trisquel.info/; s/Debian Powered/Trisquel GNU\/Linux Powered/' -i debian/patches/25_site_logo.patch - -changelog "Rebranded for Trisquel" - -compile - diff --git a/helpers/make-mate-calc b/helpers/make-mate-calc deleted file mode 100644 index 3ea6e77..0000000 --- a/helpers/make-mate-calc +++ /dev/null @@ -1,33 +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 -# - -# Can be dropped for Trisquel 9 - -VERSION=1 -EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu artful universe' -COMPONENT=main - -. ./config - -sed 's/debhelper.*,/debhelper ,/; s/mate-common.*,/mate-common,/' -i debian/control - -changelog "Backport from artful" - -compile - diff --git a/helpers/make-msgpack-c b/helpers/make-msgpack-c deleted file mode 100644 index 4fade61..0000000 --- a/helpers/make-msgpack-c +++ /dev/null @@ -1,30 +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 bionic main universe' -REPOKEY=7638D0442B90D010 - -. ./config - -sed '/googletest/d' -i debian/control - -changelog "Backported from bionic" - -compile diff --git a/helpers/make-nasm-mozilla b/helpers/make-nasm-mozilla index c7f8d61..7879529 100644 --- a/helpers/make-nasm-mozilla +++ b/helpers/make-nasm-mozilla @@ -18,7 +18,7 @@ # VERSION=1 -EXTERNAL='deb-src http://ppa.launchpad.net/ubuntu-mozilla-security/ppa/ubuntu xenial main' +EXTERNAL='deb-src http://ppa.launchpad.net/ubuntu-mozilla-security/ppa/ubuntu bionic main' REPOKEY="A6DCF7707EBC211F" . ./config diff --git a/helpers/make-pjproject b/helpers/make-pjproject deleted file mode 100644 index ccc75de..0000000 --- a/helpers/make-pjproject +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2017 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 zesty universe' - -. ./config - -changelog "Backported from zesty" - -compile - diff --git a/helpers/make-python-acme b/helpers/make-python-acme index 52f7ccb..516a18e 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 xenial main ' +EXTERNAL='deb-src http://ppa.launchpad.net/certbot/certbot/ubuntu bionic main ' REPOKEY=8C47BE8E75BCA694 . ./config diff --git a/helpers/make-python-certbot b/helpers/make-python-certbot index 8b9d99a..bf44c42 100644 --- a/helpers/make-python-certbot +++ b/helpers/make-python-certbot @@ -18,7 +18,7 @@ # VERSION=1 -EXTERNAL='deb-src http://ppa.launchpad.net/certbot/certbot/ubuntu xenial main ' +EXTERNAL='deb-src http://ppa.launchpad.net/certbot/certbot/ubuntu bionic main ' REPOKEY=8C47BE8E75BCA694 . ./config diff --git a/helpers/make-python-certbot-apache b/helpers/make-python-certbot-apache index 52f7ccb..516a18e 100644 --- a/helpers/make-python-certbot-apache +++ b/helpers/make-python-certbot-apache @@ -18,7 +18,7 @@ # VERSION=1 -EXTERNAL='deb-src http://ppa.launchpad.net/certbot/certbot/ubuntu xenial main ' +EXTERNAL='deb-src http://ppa.launchpad.net/certbot/certbot/ubuntu bionic main ' REPOKEY=8C47BE8E75BCA694 . ./config diff --git a/helpers/make-python-certbot-nginx b/helpers/make-python-certbot-nginx index 52f7ccb..516a18e 100644 --- a/helpers/make-python-certbot-nginx +++ b/helpers/make-python-certbot-nginx @@ -18,7 +18,7 @@ # VERSION=1 -EXTERNAL='deb-src http://ppa.launchpad.net/certbot/certbot/ubuntu xenial main ' +EXTERNAL='deb-src http://ppa.launchpad.net/certbot/certbot/ubuntu bionic main ' REPOKEY=8C47BE8E75BCA694 . ./config diff --git a/helpers/make-restbed b/helpers/make-restbed deleted file mode 100644 index a93800e..0000000 --- a/helpers/make-restbed +++ /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 bionic main universe' -REPOKEY=7638D0442B90D010 - -. ./config - -changelog "Backported from bionic" - -compile diff --git a/helpers/make-softhsm2 b/helpers/make-softhsm2 deleted file mode 100644 index a93800e..0000000 --- a/helpers/make-softhsm2 +++ /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 bionic main universe' -REPOKEY=7638D0442B90D010 - -. ./config - -changelog "Backported from bionic" - -compile diff --git a/helpers/make-software-properties b/helpers/make-software-properties index 9cd5bbd..a2c6993 100644 --- a/helpers/make-software-properties +++ b/helpers/make-software-properties @@ -25,11 +25,12 @@ VERSION=1 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,16 @@ +@@ -725,8 +725,17 @@ site is in whitelist or the shortcut implementer adds it. """ + codenames = {} ++ codenames["etiona"] = "bionic" + codenames["flidas"] = "xenial" + codenames["belenos"] = "trusty" + codenames["toutatis"] = "precise" diff --git a/helpers/make-sugar b/helpers/make-sugar deleted file mode 100644 index 4f07941..0000000 --- a/helpers/make-sugar +++ /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 bionic universe' - -. ./config - -changelog "Backported into Trisquel" - -compile - diff --git a/helpers/make-sugar-artwork b/helpers/make-sugar-artwork deleted file mode 100644 index 4f07941..0000000 --- a/helpers/make-sugar-artwork +++ /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 bionic universe' - -. ./config - -changelog "Backported into Trisquel" - -compile - diff --git a/helpers/make-sugar-base b/helpers/make-sugar-base deleted file mode 100644 index 4f07941..0000000 --- a/helpers/make-sugar-base +++ /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 bionic universe' - -. ./config - -changelog "Backported into Trisquel" - -compile - diff --git a/helpers/make-sugar-datastore b/helpers/make-sugar-datastore deleted file mode 100644 index 4f07941..0000000 --- a/helpers/make-sugar-datastore +++ /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 bionic universe' - -. ./config - -changelog "Backported into Trisquel" - -compile - diff --git a/helpers/make-sugar-toolkit b/helpers/make-sugar-toolkit deleted file mode 100644 index 4f07941..0000000 --- a/helpers/make-sugar-toolkit +++ /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 bionic universe' - -. ./config - -changelog "Backported into Trisquel" - -compile - diff --git a/helpers/make-sugar-toolkit-gtk3 b/helpers/make-sugar-toolkit-gtk3 deleted file mode 100644 index 4f07941..0000000 --- a/helpers/make-sugar-toolkit-gtk3 +++ /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 bionic universe' - -. ./config - -changelog "Backported into Trisquel" - -compile - diff --git a/helpers/make-tor b/helpers/make-tor index c20766b..af8a139 100644 --- a/helpers/make-tor +++ b/helpers/make-tor @@ -18,7 +18,7 @@ # VERSION=1 -EXTERNAL='deb-src http://deb.torproject.org/torproject.org xenial main' +EXTERNAL='deb-src http://deb.torproject.org/torproject.org bionic main' REPOKEY="74A941BA219EC810" . ./config diff --git a/helpers/make-unbound b/helpers/make-unbound deleted file mode 100644 index a93800e..0000000 --- a/helpers/make-unbound +++ /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 bionic main universe' -REPOKEY=7638D0442B90D010 - -. ./config - -changelog "Backported from bionic" - -compile