remove archive keys from proxmox-ve

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

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

diff --git a/debian/control b/debian/control
index 47d300ddc402344e66760c9f1981cb2133a10560..b3fc438ead36b7645d8752a120d333d07ed41cd2 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,7 @@ Replaces: proxmox-ve-3.10.0,
 Depends: apt,
          openssh-client,
          openssh-server,
+         proxmox-archive-keyring,
          pve-kernel-5.4,
          pve-kernel-helper,
          pve-manager,

diff --git a/debian/postinst b/debian/postinst
index fe9760878374650dd4dae5fc709dee2a21b94083..a4b671688cef57e4dc5df7d0bd632c2290b87d03 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-ve-release-5.x.gpg b/debian/proxmox-ve-release-5.x.gpg
deleted file mode 100644 (file)
index 8488f45..0000000
Binary files a/debian/proxmox-ve-release-5.x.gpg and /dev/null differ

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

diff --git a/debian/proxmox-ve.install b/debian/proxmox-ve.install
index e482438a03f6e147dcc4848987dec415cfa22608..5780d2a03c1c22827c1f032d253df9738e80c980 100644 (file)
--- a/debian/proxmox-ve.install
+++ b/debian/proxmox-ve.install
@@ -1,4 +1,2 @@
 debian/apthook/10pveapthook etc/apt/apt.conf.d/
 debian/apthook/pve-apt-hook usr/share/proxmox-ve/
-debian/proxmox-ve-release-5.x.gpg etc/apt/trusted.gpg.d/
-debian/proxmox-ve-release-6.x.gpg etc/apt/trusted.gpg.d/

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

diff --git a/debian/proxmox-ve.maintscript b/debian/proxmox-ve.maintscript
new file mode 100644 (file)
index 0000000..d1b0d38
--- /dev/null
+++ b/debian/proxmox-ve.maintscript
@@ -0,0 +1,3 @@
+# moved to proxmox-archive-keyring under more generic paths
+rm_conffile /etc/apt/trusted.gpg.d/proxmox-ve-release-5.x.gpg 6.2-2~~
+rm_conffile /etc/apt/trusted.gpg.d/proxmox-ve-release-6.x.gpg 6.2-2~~