Move keyrings from /etc/apt/trusted.gnupg.d to /usr/share/keyrings; add dependency on gnupg

4 files changed, 20 insertions, 3 deletions

diff --git a/debian/changelog b/debian/changelog
index e8a28d2..7bcbf32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+leap-archive-keyring (2017.05.01) unstable; urgency=medium
+
+  * Move keyrings from /etc/apt/trusted.gnupg.d to
+    /usr/share/keyrings
+  * Add dependency on gnupg
+
+ -- Micah Anderson <micah@debian.org>  Tue, 02 May 2017 14:40:37 -0400
+
 leap-archive-keyring (2016.03.08) unstable; urgency=medium
 
   [ Micah Anderson]
@@ -8,7 +16,7 @@ leap-archive-keyring (2016.03.08) unstable; urgency=medium
   * remove duplicate priority in binary package
   * rename keyrings to be 'archive' instead of 'keyring'
   * redirect preinst stderr keyremovals to /dev/null to remove
-    unnecessary errors if you dont already have it installed
+    unnecessary errors if you don't already have it installed
  
   [ Daniel Kahn Gillmor]
   * convert to debhelper
diff --git a/debian/control b/debian/control
index e8ae590..1946e9c 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Architecture: all
 Provides: leap-keyring
 Breaks: leap-keyring (<< 2016.03.08)
 Replaces: leap-keyring
-Depends: ${misc:Depends}
+Depends: gnupg, ${misc:Depends}
 Description: OpenPGP archive key for the leap.se software repositories
  The leap.se software repositories digitally sign their Release
  files. This package contains the repository keys used to verify those
diff --git a/debian/install b/debian/install
index e577cfc..334c73b 100644
--- a/debian/install
+++ b/debian/install
@@ -1 +1 @@
-keyrings/*.gpg etc/apt/trusted.gpg.d
+keyrings/*.gpg usr/share/keyrings
diff --git a/debian/preinst b/debian/preinst
index c88a2f1..6ea7df1 100755
--- a/debian/preinst
+++ b/debian/preinst
@@ -19,4 +19,13 @@ if [ -e /etc/apt/trusted.gpg ] && which gpg >/dev/null; then
    gpg --batch --no-tty --no-default-keyring --keyring /etc/apt/trusted.gpg --delete-key 0xCE433F407BAB443AFEA196C1837C1AD5367429D9 2>/dev/null || true
 fi
 
+# Remove the leap keyrings from apt-key, they are being placed in
+# /usr/share/keyrings and /etc/apt/sources.list.d/leap.list is being generated
+# to have signed-by lines such as:
+#
+#deb [signed-by /usr/share/keyrings/leap-experimental-archive.gpg] http://deb.leap.se/platform snapshots main
+
+apt-key del 1E453B2CE87BEE2F7DFE99661E34A1828E207901 || true
+apt-key del CE433F407BAB443AFEA196C1837C1AD5367429D9 || true
+
 #DEBHELPER#