remove archive keys from proxmox-backup meta package

and depend on proxmox-archive-keyring instead, which ships
them for all Proxmox products.

Else we got conflicts if one wanted to install PBS and PVE alongside.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2020-09-17 17:18:42 +02:00
parent 6cbf6f54c8
commit bee3e324d9
7 changed files with 10 additions and 9 deletions

12
debian/control vendored
View File

@ -1,17 +1,17 @@
Source: proxmox-backup
Section: admin
Priority: optional
Build-Depends: debhelper (>=12~),
lintian
Build-Depends: debhelper (>=12~), lintian
Maintainer: Proxmox Support Team <support@proxmox.com>
Package: proxmox-backup
Architecture: all
Depends: libc6,
pve-kernel-5.4,
pve-kernel-helper,
proxmox-backup-server,
proxmox-backup-client,
proxmox-archive-keyring,
proxmox-backup-client,
proxmox-backup-server,
pve-kernel-5.4,
pve-kernel-helper,
Description: Proxmox Backup Server metapackage
This is a meta package which will install everything needed to run a
Proxmox Backup server. This package also depends on the latest

2
debian/copyright vendored
View File

@ -14,7 +14,7 @@ This software is written by Proxmox Server Solutions GmbH <support@proxmox.com>
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 Street, Fifth Floor, Boston,
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301 USA
The complete text of the GNU General

2
debian/postinst vendored
View File

@ -12,4 +12,6 @@ case "$1" in
;;
esac
#DEBHELPER#
exit 0

1
debian/postrm vendored
View File

@ -17,3 +17,4 @@ case "$1" in
;;
esac
#DEBHELPER#

View File

@ -1,2 +1 @@
debian/proxmox-ve-release-6.x.gpg etc/apt/trusted.gpg.d/
debian/grub/proxmox-backup.cfg etc/default/grub.d/

View File

@ -1 +0,0 @@
proxmox-backup: package-installs-apt-keyring etc/apt/trusted.gpg.d/proxmox-ve-release-*

Binary file not shown.