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>

diff --git a/debian/control b/debian/control
index 8bd613b6e1322d5a02c8be60b1200e22874b09a9..ed2f08082738837cb0f233245f81bee39dd599c1 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -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

diff --git a/debian/copyright b/debian/copyright
index 29d08aaeb3eedd59edc7f4065efc17fa4921b8bf..c905181e215b525ab7ceb96690eb9cddca869ad8 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -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

diff --git a/debian/postinst b/debian/postinst
index 2c339abc76b8d3b1d069f51a6fa27a3d7b25b5ae..a8ed163cc45be1c75b26f82bdbae510608803b00 100755 (executable)
--- a/debian/postinst
+++ b/debian/postinst
@@ -12,4 +12,6 @@ case "$1" in
     ;;
 esac
 
+#DEBHELPER#
+
 exit 0

diff --git a/debian/postrm b/debian/postrm
index 2ee5c14334d364ef856a5bab9c2831e2060091c1..c2614d40cac96169fa64a046aea2f1b859234c8f 100755 (executable)
--- a/debian/postrm
+++ b/debian/postrm
@@ -17,3 +17,4 @@ case "$1" in
     ;;
 esac
 
+#DEBHELPER#

diff --git a/debian/proxmox-backup.install b/debian/proxmox-backup.install
index 5541490efd6617b5d7b0055a2fd5d3931c3c6a6e..60bcddcf1bee4c68539cb25e8425da9c4b5aea9f 100644 (file)
--- a/debian/proxmox-backup.install
+++ b/debian/proxmox-backup.install
@@ -1,2 +1 @@
-debian/proxmox-ve-release-6.x.gpg etc/apt/trusted.gpg.d/
 debian/grub/proxmox-backup.cfg etc/default/grub.d/

diff --git a/debian/proxmox-backup.lintian-overrides b/debian/proxmox-backup.lintian-overrides
deleted file mode 100644 (file)
index 03a167d..0000000
--- a/debian/proxmox-backup.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-proxmox-backup: package-installs-apt-keyring etc/apt/trusted.gpg.d/proxmox-ve-release-*

diff --git a/debian/proxmox-ve-release-6.x.gpg b/debian/proxmox-ve-release-6.x.gpg
deleted file mode 100644 (file)
index efebf1c..0000000
Binary files a/debian/proxmox-ve-release-6.x.gpg and /dev/null differ