From c0ea3fe7f9f454534187cd77d8236727ea945109 Mon Sep 17 00:00:00 2001
From: Sebastian Boehm <sebastian@sometimesfood.org>
Date: Wed, 17 Jun 2015 13:05:38 +0200
Subject: [PATCH] Install archive key to /etc/apt/trusted.gpg.d/

---
 debian/install                                         |   2 +-
 debian/postinst                                        |   9 ---------
 debian/prerm                                           |  13 -------------
 keyrings/{grml-debian-keyring.gpg => grml-archive.gpg} | Bin
 keyrings/grml-debian-removed-keys.gpg                  |   0
 md5sums.txt                                            |  13 +------------
 6 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100755 debian/postinst
 delete mode 100755 debian/prerm
 rename keyrings/{grml-debian-keyring.gpg => grml-archive.gpg} (100%)
 delete mode 100644 keyrings/grml-debian-removed-keys.gpg

diff --git a/debian/install b/debian/install
index 724dabd..cd8ff4d 100644
--- a/debian/install
+++ b/debian/install
@@ -1,2 +1,2 @@
-keyrings usr/share
+keyrings/grml-archive.gpg etc/apt/trusted.gpg.d
 origins etc/dpkg
diff --git a/debian/postinst b/debian/postinst
deleted file mode 100755
index 8847a6e..0000000
--- a/debian/postinst
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ -x /usr/bin/apt-key ]; then
-    /usr/bin/apt-key add /usr/share/keyrings/grml-debian-keyring.gpg
-fi
-
-#DEBHELPER#
diff --git a/debian/prerm b/debian/prerm
deleted file mode 100755
index d46b0e8..0000000
--- a/debian/prerm
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
-    remove|purge)
-	if [ -x /usr/bin/apt-key ]; then
-		/usr/bin/apt-key del ECDEA787
-	fi
-	;;
-esac
-
-#DEBHELPER#
diff --git a/keyrings/grml-debian-keyring.gpg b/keyrings/grml-archive.gpg
similarity index 100%
rename from keyrings/grml-debian-keyring.gpg
rename to keyrings/grml-archive.gpg
diff --git a/keyrings/grml-debian-removed-keys.gpg b/keyrings/grml-debian-removed-keys.gpg
deleted file mode 100644
index e69de29..0000000
diff --git a/md5sums.txt b/md5sums.txt
index 04dc613..025188a 100644
--- a/md5sums.txt
+++ b/md5sums.txt
@@ -1,12 +1 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-24c87ef79563fad1f32d7356172ff890  keyrings/grml-debian-keyring.gpg
-d41d8cd98f00b204e9800998ecf8427e  keyrings/grml-debian-removed-keys.gpg
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFGa7P201u8mbx9AgoRAoNDAJoDiNoi08MX6tb7oVCefT9X8t+3/wCfYTA6
-iIQHDhQf3+cZzYeS76OEmSA=
-=QZ3s
------END PGP SIGNATURE-----
+24c87ef79563fad1f32d7356172ff890  keyrings/grml-archive.gpg
-- 
2.1.4