Merge branch 'libo-64b' into 'etiona'

Add libreoffice 6.4.1 to Etiona

See merge request trisquel/package-helpers!295

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
 

helpers/make-liborcus

@@ -17,15 +17,16 @@
 #    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
+#,libetonyek
 
 . ./config
 
-changelog "Backported from Disco"
+changelog "Backported from Focal"
 
 compile
 

helpers/make-libreoffice

@@ -17,11 +17,11 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=1
+VERSION=2
 EXTERNAL='deb-src http://ppa.launchpad.net/libreoffice/ppa/ubuntu bionic main'
 REPOKEY="83FBA1751378B444"
 BACKPORT=true
-DEPENDS=libcmis,mdds,libixion,liborcus,libnumbertext
+DEPENDS=libcmis,mdds,libixion,liborcus,libnumbertext,xmlsec1,qr-code-generator,nss
 
 . ./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

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
 

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=1
+EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu focal main universe'
+REPOKEY="3B4FE6ACC0B21F32"
+BACKPORT=true
+
+. ./config
+
+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-qr-code-generator

+#!/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-xmlsec1

+#!/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
+