DEB trinity-keyring: Remove the binary package dependency on gnupg.

Use the code to remove the old keys the same as debian-archive-keyring.
Add package trinity-keyring-udeb, which could be suitable for the installer.

This resolves bug 3170.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

5 files changed, 50 insertions, 31 deletions

diff --git a/debian/_base/metapackages/trinity-keyring/debian/control b/debian/_base/metapackages/trinity-keyring/debian/control
index 85fe9741b..5b1fef513 100644
--- a/debian/_base/metapackages/trinity-keyring/debian/control
+++ b/debian/_base/metapackages/trinity-keyring/debian/control
@@ -8,7 +8,20 @@ Standards-Version: 3.8.4
 Package: trinity-keyring
 Priority: important
 Architecture: all
-Depends: gnupg (>= 1.0.6-4)
-Description: GnuPG key of the Trinity Desktop Environment repository
+Multi-Arch: foreign
+Depends: ${misc:Depends}
+Description: GnuPG keys of the Trinity Desktop Environment repository
  The Trinity repository digitally signs its Release files. This package
  contains the repository key used for that.
+
+Package: trinity-keyring-udeb
+Package-Type: udeb
+Priority: important
+Architecture: all
+Section: debian-installer
+Depends: ${misc:Depends}
+Recommends: gpgv-udeb
+Description: GnuPG keys of the Trinity Desktop Environment repository
+ The Trinity repository digitally signs its Release files. This package
+ contains the repository key used for that, in a minimal form for use
+ in the installer.
diff --git a/debian/_base/metapackages/trinity-keyring/debian/preinst b/debian/_base/metapackages/trinity-keyring/debian/preinst
deleted file mode 100644
index 53c7d0cbc..000000000
--- a/debian/_base/metapackages/trinity-keyring/debian/preinst
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /bin/sh
-# preinst script for trinity-keyring
-
-set -e
-
-case "$1" in
-    install|upgrade)
-        if [ ! -f /etc/apt/trusted.gpg.d/trinity-keyring.gpg ] &&
-           [ -f /etc/apt/trusted.gpg ]; then
-            # Remove key F5CFC95C (2014.06.08) from apt keyring
-            apt-key --keyring /etc/apt/trusted.gpg del F5CFC95C 2> /dev/null || true
-
-            # Remove key 2B8638D0 (2010.06.15) from apt keyring
-            apt-key --keyring /etc/apt/trusted.gpg del 2B8638D0 2> /dev/null || true
-        fi
-    ;;
-
-    abort-upgrade)
-    ;;
-
-    *)
-        echo "preinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/_base/metapackages/trinity-keyring/debian/install b/debian/_base/metapackages/trinity-keyring/debian/trinity-keyring-udeb.install
index b3a5bac5c..b3a5bac5c 100644
--- a/debian/_base/metapackages/trinity-keyring/debian/install
+++ b/debian/_base/metapackages/trinity-keyring/debian/trinity-keyring-udeb.install
diff --git a/debian/_base/metapackages/trinity-keyring/debian/trinity-keyring.install b/debian/_base/metapackages/trinity-keyring/debian/trinity-keyring.install
new file mode 100644
index 000000000..b3a5bac5c
--- /dev/null
+++ b/debian/_base/metapackages/trinity-keyring/debian/trinity-keyring.install
@@ -0,0 +1 @@
+keyrings			usr/share
diff --git a/debian/_base/metapackages/trinity-keyring/debian/trinity-keyring.preinst b/debian/_base/metapackages/trinity-keyring/debian/trinity-keyring.preinst
new file mode 100644
index 000000000..ba8d428b1
--- /dev/null
+++ b/debian/_base/metapackages/trinity-keyring/debian/trinity-keyring.preinst
@@ -0,0 +1,34 @@
+#! /bin/sh
+# preinst script for trinity-keyring
+
+set -e
+
+case "$1" in
+    install|upgrade)
+        # remove keys from the trusted.gpg file as they are now shipped in fragment files in trusted.gpg.d
+        if dpkg --compare-versions "$2" 'lt' "2012.1" && which gpg > /dev/null && which apt-key > /dev/null; then
+                TRUSTEDFILE='/etc/apt/trusted.gpg'
+                eval $(apt-config shell TRUSTEDFILE Apt::GPGV::TrustedKeyring)
+                eval $(apt-config shell TRUSTEDFILE Dir::Etc::Trusted/f)
+                if [ -e "$TRUSTEDFILE" ]; then
+                        # Key F5CFC95C - 2014.06.08
+                        # Key 2B8638D0 - 2010.06.15
+                        for KEY in F5CFC95C 2B8638D0; do
+                                apt-key --keyring "$TRUSTEDFILE" del $KEY > /dev/null 2>&1 || :
+                        done
+                fi
+        fi
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0