From 6fbb51763e339cdb35e9a872d1a04291f66062d5 Mon Sep 17 00:00:00 2001 From: Ruben Rodriguez <ruben@trisquel.info> Date: Sat, 17 Oct 2020 13:26:22 -0400 Subject: [PATCH] Added changes for sugar v 117 --- helpers/make-csound | 29 +++++++++++++++++++++++++++ helpers/make-pygame | 30 ++++++++++++++++++++++++++++ helpers/make-python-gwebsockets | 29 +++++++++++++++++++++++++++ helpers/make-sugar | 34 ++++++++++++++++++++++++++++++++ helpers/make-sugar-artwork | 31 +++++++++++++++++++++++++++++ helpers/make-sugar-datastore | 31 +++++++++++++++++++++++++++++ helpers/make-sugar-toolkit-gtk3 | 35 +++++++++++++++++++++++++++++++++ 7 files changed, 219 insertions(+) create mode 100644 helpers/make-csound create mode 100644 helpers/make-pygame create mode 100644 helpers/make-python-gwebsockets create mode 100644 helpers/make-sugar create mode 100644 helpers/make-sugar-artwork create mode 100644 helpers/make-sugar-datastore create mode 100644 helpers/make-sugar-toolkit-gtk3 diff --git a/helpers/make-csound b/helpers/make-csound new file mode 100644 index 00000000..feff3f0f --- /dev/null +++ b/helpers/make-csound @@ -0,0 +1,29 @@ +#!/bin/sh +# +# Copyright (C) 2020 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="3B4FE6ACC0B21F32" +BACKPORT=true + +. ./config + +changelog "Backported from Focal" + +compile diff --git a/helpers/make-pygame b/helpers/make-pygame new file mode 100644 index 00000000..ec0590bb --- /dev/null +++ b/helpers/make-pygame @@ -0,0 +1,30 @@ +#!/bin/sh +# +# Copyright (C) 2020 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="871920D1991BC93C" +BACKPORT=true + +. ./config + +changelog "Backported from focal" + +compile + diff --git a/helpers/make-python-gwebsockets b/helpers/make-python-gwebsockets new file mode 100644 index 00000000..67f11452 --- /dev/null +++ b/helpers/make-python-gwebsockets @@ -0,0 +1,29 @@ +#!/bin/sh +# +# Copyright (C) 2020 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 groovy main universe' +REPOKEY="871920D1991BC93C" + +. ./config + +changelog "Backported from groovy" + +compile + diff --git a/helpers/make-sugar b/helpers/make-sugar new file mode 100644 index 00000000..3598b86d --- /dev/null +++ b/helpers/make-sugar @@ -0,0 +1,34 @@ +#!/bin/sh +# +# Copyright (C) 2020 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 groovy main universe' +REPOKEY="871920D1991BC93C" + +. ./config + +patch -p1 < $DATA/git-20201017.patch + +#sed '1aexport PYBUILD_NAME = sugar' -i debian/rules + +changelog "Backported from groovy" + +compile + + diff --git a/helpers/make-sugar-artwork b/helpers/make-sugar-artwork new file mode 100644 index 00000000..c4738e0d --- /dev/null +++ b/helpers/make-sugar-artwork @@ -0,0 +1,31 @@ +#!/bin/sh +# +# Copyright (C) 2020 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 groovy main universe' +REPOKEY="871920D1991BC93C" + +. ./config + +sed 's/python3-empy,/python3-empy, python-empy,/' -i debian/control + +changelog "Backported from groovy" + +compile + diff --git a/helpers/make-sugar-datastore b/helpers/make-sugar-datastore new file mode 100644 index 00000000..7c981e10 --- /dev/null +++ b/helpers/make-sugar-datastore @@ -0,0 +1,31 @@ +#!/bin/sh +# +# Copyright (C) 2020 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 groovy main universe' +REPOKEY="871920D1991BC93C" + +. ./config + +sed '/dh-sequence-gir/d' -i debian/control + +changelog "Backported from groovy" + +compile + diff --git a/helpers/make-sugar-toolkit-gtk3 b/helpers/make-sugar-toolkit-gtk3 new file mode 100644 index 00000000..efaa85b2 --- /dev/null +++ b/helpers/make-sugar-toolkit-gtk3 @@ -0,0 +1,35 @@ +#!/bin/sh +# +# Copyright (C) 2020 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 groovy main universe' +REPOKEY="871920D1991BC93C" + +. ./config + +rm debian/patches/2003_bundlebuilder_exit_nonzero_on_error.patch debian/patches/1001_espeak-ng.patch +sed '/2003_bundlebuilder_exit_nonzero_on_error.patch/d; /1001_espeak-ng.patch/d' -i debian/patches/series + +patch -p1 < $DATA/git-20201017.patch + +sed '/dh-sequence-gir/d' -i debian/control + +changelog "Backported from groovy" + +compile -- GitLab