diff -Nru bareos-17.2.7/debian/changelog bareos-17.2.7/debian/changelog --- bareos-17.2.7/debian/changelog 2019-02-23 16:52:56.000000000 +0000 +++ bareos-17.2.7/debian/changelog 2019-08-22 19:56:31.000000000 +0000 @@ -1,3 +1,10 @@ +bareos (17.2.7-2ubuntu1) eoan; urgency=medium + + * Disable glusterfs support due to API changes + * Disable MySQL/SQLite DEP8 due to bad tests (LP: #1840485) + + -- Rafael David Tinoco Thu, 22 Aug 2019 19:56:31 +0000 + bareos (17.2.7-2) unstable; urgency=high * Remove Felix Geyer from Uploaders. diff -Nru bareos-17.2.7/debian/control bareos-17.2.7/debian/control --- bareos-17.2.7/debian/control 2019-02-12 00:29:08.000000000 +0000 +++ bareos-17.2.7/debian/control 2019-08-22 19:56:31.000000000 +0000 @@ -1,7 +1,8 @@ Source: bareos Section: admin Priority: optional -Maintainer: Bareos Packaging Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Bareos Packaging Team Uploaders: Dominik George , Build-Depends: @@ -16,7 +17,7 @@ libcap-dev [linux-any], libcephfs-dev [linux-any], libcmocka-dev (>= 1.0.1), - libglusterfs-dev [linux-any], +# libglusterfs-dev [linux-any], libgnutls28-dev, libjansson-dev, liblzo2-dev, @@ -139,6 +140,7 @@ Depends: lsb-base (>= 3.2-13), postgresql-client, + dbconfig-pgsql (>= 2.0.11ubuntu2~), ${misc:Depends}, ${shlibs:Depends}, Suggests: @@ -156,6 +158,7 @@ debconf (>= 1.4.30) | debconf-2.0, Depends: lsb-base (>= 3.2-13), + dbconfig-mysql (>= 2.0.11ubuntu2~), ${misc:Depends}, ${shlibs:Depends}, Suggests: @@ -174,6 +177,7 @@ Depends: lsb-base (>= 3.2-13), sqlite3, + dbconfig-sqlite (>= 2.0.11ubuntu2~), ${misc:Depends}, ${shlibs:Depends}, Description: Backup Archiving Recovery Open Sourced - SQLite backend @@ -400,19 +404,19 @@ . This package provides the CEPH plugins for the file daemon. -Package: bareos-filedaemon-glusterfs-plugin -Architecture: linux-any -Pre-Depends: - debconf (>= 1.4.30) | debconf-2.0, -Depends: - bareos-filedaemon (= ${binary:Version}), - ${misc:Depends}, - ${shlibs:Depends}, -Description: Backup Archiving Recovery Open Sourced - filedaemon-glusterfs-plugin - Bareos is a set of programs to manage backup, recovery and verification of - data across a network of computers of different kinds. - . - This package provides the glusterfs plugin for the file daemon. +# Package: bareos-filedaemon-glusterfs-plugin +# Architecture: linux-any +# Pre-Depends: +# debconf (>= 1.4.30) | debconf-2.0, +# Depends: +# bareos-filedaemon (= ${binary:Version}), +# ${misc:Depends}, +# ${shlibs:Depends}, +# Description: Backup Archiving Recovery Open Sourced - filedaemon-glusterfs-plugin +# Bareos is a set of programs to manage backup, recovery and verification of +# data across a network of computers of different kinds. +# . +# This package provides the glusterfs plugin for the file daemon. Package: bareos-filedaemon-python-plugin Architecture: any @@ -460,19 +464,19 @@ . This package provides the CEPH backend for the storage daemon. -Package: bareos-storage-glusterfs -Architecture: linux-any -Pre-Depends: - debconf (>= 1.4.30) | debconf-2.0, -Depends: - bareos-storage (= ${binary:Version}), - ${misc:Depends}, - ${shlibs:Depends}, -Description: Backup Archiving Recovery Open Sourced - storage-glusterfs-plugin - Bareos is a set of programs to manage backup, recovery and verification of - data across a network of computers of different kinds. - . - This package provides the glusterfs backend for the storage daemon. +# Package: bareos-storage-glusterfs +# Architecture: linux-any +# Pre-Depends: +# debconf (>= 1.4.30) | debconf-2.0, +# Depends: +# bareos-storage (= ${binary:Version}), +# ${misc:Depends}, +# ${shlibs:Depends}, +# Description: Backup Archiving Recovery Open Sourced - storage-glusterfs-plugin +# Bareos is a set of programs to manage backup, recovery and verification of +# data across a network of computers of different kinds. +# . +# This package provides the glusterfs backend for the storage daemon. Package: bareos-storage-python-plugin Architecture: any diff -Nru bareos-17.2.7/debian/rules bareos-17.2.7/debian/rules --- bareos-17.2.7/debian/rules 2019-02-11 10:33:42.000000000 +0000 +++ bareos-17.2.7/debian/rules 2019-08-22 19:49:03.000000000 +0000 @@ -59,6 +59,7 @@ --with-tcp-wrappers \ --without-openssl \ --with-gnutls \ + --without-glusterfs \ --with-dir-user=$(DIRECTOR_DAEMON_USER) \ --with-dir-group=$(DAEMON_GROUP) \ --with-sd-user=$(STORAGE_DAEMON_USER) \ diff -Nru bareos-17.2.7/debian/tests/control bareos-17.2.7/debian/tests/control --- bareos-17.2.7/debian/tests/control 2019-02-11 10:29:18.000000000 +0000 +++ bareos-17.2.7/debian/tests/control 2019-08-22 19:56:17.000000000 +0000 @@ -4,22 +4,29 @@ bareos, bareos-database-postgresql, postgresql, + dbconfig-pgsql (>= 2.0.11ubuntu2), -Tests: mysql-all -Restrictions: breaks-testbed needs-root allow-stderr -Depends: - bareos, - bareos-database-mysql, - default-mysql-server | virtual-mysql-server, - -Test-Command: test/all -Restrictions: breaks-testbed needs-root allow-stderr -Depends: - bareos, - bareos-database-sqlite3, - -Tests: tls tls-passive sha1 -Restrictions: breaks-testbed needs-root allow-stderr -Depends: - bareos, - bareos-database-sqlite3, +# +# Needs fixing: (LP: #1840485) +# +# Tests: mysql-all +# Restrictions: breaks-testbed needs-root allow-stderr +# Depends: +# bareos, +# bareos-database-mysql, +# default-mysql-server | virtual-mysql-server, +# dbconfig-mysql (>= 2.0.11ubuntu2), +# +# Test-Command: test/all +# Restrictions: breaks-testbed needs-root allow-stderr +# Depends: +# bareos, +# bareos-database-sqlite3, +# dbconfig-sqlite (>= 2.0.11ubuntu2), +# +# Tests: tls tls-passive sha1 +# Restrictions: breaks-testbed needs-root allow-stderr +# Depends: +# bareos, +# bareos-database-sqlite3, +# dbconfig-sqlite (>= 2.0.11ubuntu2),