From 129f72c9cd2de50ef0423f15fc125d65e72af274 Mon Sep 17 00:00:00 2001 From: Ark74 <ark@switnet.org> Date: Fri, 13 Mar 2020 23:51:23 -0600 Subject: [PATCH] Fix dependencys and versions numbers --- helpers/make-libixion | 6 +++--- helpers/make-liborcus | 7 +++---- helpers/make-libreoffice | 19 ++++++++++++------- helpers/make-mdds | 6 +++--- helpers/make-nspr | 30 ++++++++++++++++++++++++++++++ helpers/make-nss | 31 +++++++++++++++++++++++++++++++ helpers/make-qr-code-generator | 30 ++++++++++++++++++++++++++++++ helpers/make-xmlsec1 | 30 ++++++++++++++++++++++++++++++ 8 files changed, 142 insertions(+), 17 deletions(-) create mode 100644 helpers/make-nspr create mode 100644 helpers/make-nss create mode 100644 helpers/make-qr-code-generator create mode 100644 helpers/make-xmlsec1 diff --git a/helpers/make-libixion b/helpers/make-libixion index f46510f2..9c1066bc 100644 --- a/helpers/make-libixion +++ b/helpers/make-libixion @@ -17,15 +17,15 @@ # 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' +VERSION=2 +EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu focal main universe' REPOKEY="3B4FE6ACC0B21F32" BACKPORT=true DEPENDS=mdds . ./config -changelog "Backported from Disco" +changelog "Backported from Focal" compile diff --git a/helpers/make-liborcus b/helpers/make-liborcus index 0b01c0ed..2f2ce225 100644 --- a/helpers/make-liborcus +++ b/helpers/make-liborcus @@ -17,15 +17,14 @@ # 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' +VERSION=2 +EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu focal main universe' REPOKEY="3B4FE6ACC0B21F32" BACKPORT=true -DEPENDS=mdds,libixion . ./config -changelog "Backported from Disco" +changelog "Backported from Focal" compile diff --git a/helpers/make-libreoffice b/helpers/make-libreoffice index b3c0cab0..ab3515a4 100644 --- a/helpers/make-libreoffice +++ b/helpers/make-libreoffice @@ -18,10 +18,10 @@ # VERSION=1 -EXTERNAL='deb-src http://ppa.launchpad.net/libreoffice/ppa/ubuntu bionic main' +EXTERNAL='deb-src http://ppa.launchpad.net/libreoffice/libreoffice-6-4/ubuntu bionic main' REPOKEY="83FBA1751378B444" BACKPORT=true -DEPENDS=libcmis,mdds,libixion,liborcus,libnumbertext +DEPENDS=libcmis,mdds,libixion,liborcus,libnumbertext,xmlsec1,qr-code-generator . ./config @@ -29,15 +29,21 @@ DEPENDS=libcmis,mdds,libixion,liborcus,libnumbertext sed -i "s|zlib1g-dev|zlib1g-dev,|" debian/control #Add backport deps -# Disco +# Focal # libcmis sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libcmis-dev (>= 0.5.2)" debian/control # libixion -sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libixion-dev (>= 0.14.0)," debian/control +sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libixion-dev (>= 0.15)," debian/control # mdds -sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libmdds-dev (>= 1.4.1)," debian/control +sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libmdds-dev (>= 1.5)," debian/control # liborcus -sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ liborcus-dev (>= 0.14.0)," debian/control +sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ liborcus-dev (>= 0.15)," debian/control +# libnss +sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libnss3-dev (>= 3.42)," debian/control +# qr-code-generator +sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libqrcodegencpp-dev," debian/control +# xmlsec1 +sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libxmlsec1-dev (>= 1.2.28)," debian/control # Cosmic # libnumbertext @@ -45,7 +51,6 @@ sed -i "/zlib1g-dev/a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ libnumbertext-dev," debian/c #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 diff --git a/helpers/make-mdds b/helpers/make-mdds index c1445df0..2f2ce225 100644 --- a/helpers/make-mdds +++ b/helpers/make-mdds @@ -17,14 +17,14 @@ # 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' +VERSION=2 +EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu focal main universe' REPOKEY="3B4FE6ACC0B21F32" BACKPORT=true . ./config -changelog "Backported from Disco" +changelog "Backported from Focal" compile diff --git a/helpers/make-nspr b/helpers/make-nspr new file mode 100644 index 00000000..2f2ce225 --- /dev/null +++ b/helpers/make-nspr @@ -0,0 +1,30 @@ +#!/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 + diff --git a/helpers/make-nss b/helpers/make-nss new file mode 100644 index 00000000..fc8b4dda --- /dev/null +++ b/helpers/make-nss @@ -0,0 +1,31 @@ +#!/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 + diff --git a/helpers/make-qr-code-generator b/helpers/make-qr-code-generator new file mode 100644 index 00000000..2f2ce225 --- /dev/null +++ b/helpers/make-qr-code-generator @@ -0,0 +1,30 @@ +#!/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 + diff --git a/helpers/make-xmlsec1 b/helpers/make-xmlsec1 new file mode 100644 index 00000000..1b3874c4 --- /dev/null +++ b/helpers/make-xmlsec1 @@ -0,0 +1,30 @@ +#!/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 + +. ./config + +changelog "Backported from Focal" + +compile + -- GitLab