From d015e7f2f0b7b2d3f1f2bb46ed3ffef70c59a4e8 Mon Sep 17 00:00:00 2001 From: Ark74 Date: Tue, 1 Oct 2019 09:34:02 -0500 Subject: [PATCH 1/6] Rebuild sane-backends --- helpers/make-sane-backends | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/helpers/make-sane-backends b/helpers/make-sane-backends index 96c02ef..5bf4871 100644 --- a/helpers/make-sane-backends +++ b/helpers/make-sane-backends @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2014 Andrew M. Lindley +# 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 @@ -17,14 +17,13 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=1 +VERSION=2 +EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu bionic-updates main' +REPOKEY="3B4FE6ACC0B21F32" . ./config -cp $DATA/snprintf.c ./lib/ -cat $DATA/copyright.snprintf >> debian/copyright - -changelog "Replace non-free snprintf #10713" +changelog "Imported into Trisquel" compile From f023f9890fc28425fe63bf4e0610216de78fcb30 Mon Sep 17 00:00:00 2001 From: Ark74 Date: Tue, 1 Oct 2019 09:35:31 -0500 Subject: [PATCH 2/6] Add libreoffice backport and dependencies. --- helpers/make-libcmis | 29 ++++++++++++++ helpers/make-libixion | 31 +++++++++++++++ helpers/make-libnumbertext | 30 +++++++++++++++ helpers/make-liborcus | 31 +++++++++++++++ helpers/make-libreoffice | 79 ++++++++++++++++++++++++++++++++++++++ helpers/make-mdds | 30 +++++++++++++++ 6 files changed, 230 insertions(+) create mode 100644 helpers/make-libcmis create mode 100644 helpers/make-libixion create mode 100644 helpers/make-libnumbertext create mode 100644 helpers/make-liborcus create mode 100644 helpers/make-libreoffice create mode 100644 helpers/make-mdds diff --git a/helpers/make-libcmis b/helpers/make-libcmis new file mode 100644 index 0000000..c0a1407 --- /dev/null +++ b/helpers/make-libcmis @@ -0,0 +1,29 @@ +#!/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 disco main universe' +REPOKEY="3B4FE6ACC0B21F32" +BACKPORT=true + +. ./config + +changelog "Backported from Disco" + +compile diff --git a/helpers/make-libixion b/helpers/make-libixion new file mode 100644 index 0000000..f46510f --- /dev/null +++ b/helpers/make-libixion @@ -0,0 +1,31 @@ +#!/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 disco main universe' +REPOKEY="3B4FE6ACC0B21F32" +BACKPORT=true +DEPENDS=mdds + +. ./config + +changelog "Backported from Disco" + +compile + diff --git a/helpers/make-libnumbertext b/helpers/make-libnumbertext new file mode 100644 index 0000000..2d59429 --- /dev/null +++ b/helpers/make-libnumbertext @@ -0,0 +1,30 @@ +#!/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 cosmic main universe' +REPOKEY="3B4FE6ACC0B21F32" +BACKPORT=true + +. ./config + +changelog "Backported from Cosmic" + +compile + diff --git a/helpers/make-liborcus b/helpers/make-liborcus new file mode 100644 index 0000000..0b01c0e --- /dev/null +++ b/helpers/make-liborcus @@ -0,0 +1,31 @@ +#!/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 disco main universe' +REPOKEY="3B4FE6ACC0B21F32" +BACKPORT=true +DEPENDS=mdds,libixion + +. ./config + +changelog "Backported from Disco" + +compile + diff --git a/helpers/make-libreoffice b/helpers/make-libreoffice new file mode 100644 index 0000000..f95bec4 --- /dev/null +++ b/helpers/make-libreoffice @@ -0,0 +1,79 @@ +#!/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://ppa.launchpad.net/libreoffice/ppa/ubuntu bionic main' +REPOKEY="83FBA1751378B444" +BACKPORT=true +DEPENDS=sane-backends*,doxygen*,libcmis,mdds,libstaroffice,libixion,liborcus,libnumbertext + +. ./config + +#Add backport deps +# Disco +# libcmis +sed -i "/libclucene-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libcmis-dev (>= 0.5.2)," debian/control +# mdds +sed -i "/liblpsolve55-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libmdds-dev (>= 1.4.1)," debian/control +# libixion +sed -i "/libicu-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libixion-dev (>= 0.14.0)," debian/control +# liborcus +sed -i "/libnss3-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ liborcus-dev (>= 0.14.0)," debian/control + +# Cosmic +# libnumbertext +sed -i "/liborcus-dev/i \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libnumbertext-dev," debian/control + +#Add required deps missing on debian/control +sed -i "/libxml2-utils/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libxmlsec1-dev (>= 1.2.24)," debian/control +sed -i "/libepoxy-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libepubgen-dev (>= 0.1.0)," debian/control +sed -i "/libqt5x11extras5-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libqxp-dev (>= 0.0.1)," debian/control +sed -i "/libepoxy-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libeot-dev (>= 0.01)," debian/control +sed -i "/liborcus-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libodfgen-dev," debian/control +sed -i "/libsuitesparse-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libwpd-dev," debian/control +sed -i "/libwpd-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libwpg-dev," debian/control +sed -i "/libwpg-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libwps-dev," debian/control +sed -i "/libsuitesparse-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libvisio-dev," debian/control +sed -i "/libcairo2-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libcdr-dev," debian/control +sed -i "/liblpsolve55-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libmspub-dev," debian/control +sed -i "/libmspub-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libmwaw-dev," debian/control +sed -i "/libeot-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libetonyek-dev," debian/control +sed -i "/libdconf-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libe-book-dev," debian/control +sed -i "/libfontconfig1-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libfreehand-dev," debian/control +sed -i "/junit4/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libabw-dev," debian/control +sed -i "/libodfgen-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libpagemaker-dev," debian/control +sed -i "/libxtst-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libzmf-dev," debian/control +sed -i "/libsm-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libstaroffice-dev," debian/control +sed -i "/libcommons-logging-java/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libcppunit-dev," debian/control +sed -i "/bzip2/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ coinor-libcoinmp-dev," debian/control +sed -i "/debhelper/i \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ coinor-libcoinutils-dev," debian/control +sed -i "/libsane-dev/i \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libsac-java," debian/control +sed -i "/libxml2-dev/i \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libxml-java, \\ +\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libflute-java, \\ +\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libpentaho-reporting-flow-engine-java, \\ +\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ liblayout-java, \\ +\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libloader-java, \\ +\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libformula-java, \\ +\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ librepository-java, \\ +\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libfonts-java, \\ +\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libserializer-java," debian/control + +changelog "Imported into Trisquel" + +compile diff --git a/helpers/make-mdds b/helpers/make-mdds new file mode 100644 index 0000000..c1445df --- /dev/null +++ b/helpers/make-mdds @@ -0,0 +1,30 @@ +#!/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 disco main universe' +REPOKEY="3B4FE6ACC0B21F32" +BACKPORT=true + +. ./config + +changelog "Backported from Disco" + +compile + From f3562e58514afb21d855c9320fded89d6905a119 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= Date: Fri, 4 Oct 2019 16:42:51 +0000 Subject: [PATCH 3/6] Fixing format of changes --- helpers/make-libreoffice | 82 +++++++++++++++++++++------------------- 1 file changed, 43 insertions(+), 39 deletions(-) diff --git a/helpers/make-libreoffice b/helpers/make-libreoffice index f95bec4..9639d55 100644 --- a/helpers/make-libreoffice +++ b/helpers/make-libreoffice @@ -25,54 +25,58 @@ DEPENDS=sane-backends*,doxygen*,libcmis,mdds,libstaroffice,libixion,liborcus,lib . ./config +#Set last package +sed -i "s|zlib1g-dev|zlib1g-dev,|" debian/control + #Add backport deps # Disco # libcmis -sed -i "/libclucene-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libcmis-dev (>= 0.5.2)," debian/control -# mdds -sed -i "/liblpsolve55-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libmdds-dev (>= 1.4.1)," debian/control +sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libcmis-dev (>= 0.5.2)" debian/control # libixion -sed -i "/libicu-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libixion-dev (>= 0.14.0)," debian/control +sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libixion-dev (>= 0.14.0)," debian/control +# mdds +sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libmdds-dev (>= 1.4.1)," debian/control # liborcus -sed -i "/libnss3-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ liborcus-dev (>= 0.14.0)," debian/control +sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ liborcus-dev (>= 0.14.0)," debian/control # Cosmic # libnumbertext -sed -i "/liborcus-dev/i \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libnumbertext-dev," debian/control +sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libnumbertext-dev," debian/control + +#Add required deps missing on debian/control for building +sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libzmf-dev," debian/control +sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libxmlsec1-dev (>= 1.2.24)," debian/control +sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libxml-java," debian/control +sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libwps-dev," debian/control +sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libwpg-dev," debian/control +sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libwpd-dev," debian/control +sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libvisio-dev," debian/control +sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libstaroffice-dev," debian/control +sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libserializer-java," debian/control +sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libsac-java," debian/control +sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ librepository-java," debian/control +sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libqxp-dev (>= 0.0.1)," debian/control +sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libpentaho-reporting-flow-engine-java," debian/control +sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libpagemaker-dev," debian/control +sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libodfgen-dev," debian/control +sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libmwaw-dev," debian/control +sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libmspub-dev," debian/control +sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libloader-java," debian/control +sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ liblayout-java," debian/control +sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libfreehand-dev," debian/control +sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libformula-java," debian/control +sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libfonts-java," debian/control +sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libflute-java," debian/control +sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libetonyek-dev," debian/control +sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libepubgen-dev (>= 0.1.0)," debian/control +sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libeot-dev (>= 0.01)," debian/control +sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libe-book-dev," debian/control +sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libcppunit-dev," debian/control +sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libcdr-dev," debian/control +sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libabw-dev," debian/control +sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ coinor-libcoinutils-dev," debian/control +sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ coinor-libcoinmp-dev," debian/control -#Add required deps missing on debian/control -sed -i "/libxml2-utils/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libxmlsec1-dev (>= 1.2.24)," debian/control -sed -i "/libepoxy-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libepubgen-dev (>= 0.1.0)," debian/control -sed -i "/libqt5x11extras5-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libqxp-dev (>= 0.0.1)," debian/control -sed -i "/libepoxy-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libeot-dev (>= 0.01)," debian/control -sed -i "/liborcus-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libodfgen-dev," debian/control -sed -i "/libsuitesparse-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libwpd-dev," debian/control -sed -i "/libwpd-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libwpg-dev," debian/control -sed -i "/libwpg-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libwps-dev," debian/control -sed -i "/libsuitesparse-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libvisio-dev," debian/control -sed -i "/libcairo2-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libcdr-dev," debian/control -sed -i "/liblpsolve55-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libmspub-dev," debian/control -sed -i "/libmspub-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libmwaw-dev," debian/control -sed -i "/libeot-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libetonyek-dev," debian/control -sed -i "/libdconf-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libe-book-dev," debian/control -sed -i "/libfontconfig1-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libfreehand-dev," debian/control -sed -i "/junit4/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libabw-dev," debian/control -sed -i "/libodfgen-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libpagemaker-dev," debian/control -sed -i "/libxtst-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libzmf-dev," debian/control -sed -i "/libsm-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libstaroffice-dev," debian/control -sed -i "/libcommons-logging-java/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libcppunit-dev," debian/control -sed -i "/bzip2/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ coinor-libcoinmp-dev," debian/control -sed -i "/debhelper/i \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ coinor-libcoinutils-dev," debian/control -sed -i "/libsane-dev/i \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libsac-java," debian/control -sed -i "/libxml2-dev/i \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libxml-java, \\ -\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libflute-java, \\ -\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libpentaho-reporting-flow-engine-java, \\ -\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ liblayout-java, \\ -\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libloader-java, \\ -\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libformula-java, \\ -\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ librepository-java, \\ -\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libfonts-java, \\ -\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libserializer-java," debian/control changelog "Imported into Trisquel" From c5e6534a2ed6fa6a6edff6f9881d7183071303b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= Date: Fri, 4 Oct 2019 19:32:45 +0000 Subject: [PATCH 4/6] Update make-libreoffice Remove redinder of (arch=all) missing packages. --- helpers/make-libreoffice | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpers/make-libreoffice b/helpers/make-libreoffice index 9639d55..d9c9af5 100644 --- a/helpers/make-libreoffice +++ b/helpers/make-libreoffice @@ -21,7 +21,7 @@ VERSION=1 EXTERNAL='deb-src http://ppa.launchpad.net/libreoffice/ppa/ubuntu bionic main' REPOKEY="83FBA1751378B444" BACKPORT=true -DEPENDS=sane-backends*,doxygen*,libcmis,mdds,libstaroffice,libixion,liborcus,libnumbertext +DEPENDS=libcmis,mdds,libstaroffice,libixion,liborcus,libnumbertext . ./config From e866ba64545be32c672319e9b9d1975057194ac7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= Date: Tue, 12 Nov 2019 02:50:01 +0000 Subject: [PATCH 5/6] Revert "Rebuild sane-backends" This reverts commit d015e7f2f0b7b2d3f1f2bb46ed3ffef70c59a4e8 --- helpers/make-sane-backends | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/helpers/make-sane-backends b/helpers/make-sane-backends index 5bf4871..96c02ef 100644 --- a/helpers/make-sane-backends +++ b/helpers/make-sane-backends @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2019 Luis Guzmán +# Copyright (C) 2014 Andrew M. Lindley # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,13 +17,14 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=2 -EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu bionic-updates main' -REPOKEY="3B4FE6ACC0B21F32" +VERSION=1 . ./config -changelog "Imported into Trisquel" +cp $DATA/snprintf.c ./lib/ +cat $DATA/copyright.snprintf >> debian/copyright + +changelog "Replace non-free snprintf #10713" compile From f84c4fdc99bf4d5aa2698c5cc524de218b2e1910 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= Date: Wed, 13 Nov 2019 15:07:25 +0000 Subject: [PATCH 6/6] remove libstaroffice source dependency (binary package exist on repository) --- helpers/make-libreoffice | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpers/make-libreoffice b/helpers/make-libreoffice index d9c9af5..b3c0cab 100644 --- a/helpers/make-libreoffice +++ b/helpers/make-libreoffice @@ -21,7 +21,7 @@ VERSION=1 EXTERNAL='deb-src http://ppa.launchpad.net/libreoffice/ppa/ubuntu bionic main' REPOKEY="83FBA1751378B444" BACKPORT=true -DEPENDS=libcmis,mdds,libstaroffice,libixion,liborcus,libnumbertext +DEPENDS=libcmis,mdds,libixion,liborcus,libnumbertext . ./config