devuan-keyring

commit ecd2bd775de0b927484d66bc6aa9b6e2b823db9d
parent 9997d68dd117d92cb2db4a0adfbae14fe14a2b16
Author: Franco (nextime) Lanza <nextime@nexlab.it>
Date:   Tue, 22 Nov 2016 23:39:42 +0200

Proper fix for devuan installer udeb

Diffstat:
M
debian/changelog
 | 
6
++++++
M
debian/devuan-keyring-udeb.postinst
 | 
5
++---
M
debian/rules
 | 
4
+---

3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
@@ -1,5 +1,11 @@
 devuan-keyring (2016.10.29) unstable; urgency=medium
 
+  * Proper fix for devuan installer and debootstrap udeb
+
+ -- Franco (nextime) Lanza <nextime@devuan.org>  Tue, 22 Nov 2016 22:39:12 +0200
+
+devuan-keyring (2016.10.29) unstable; urgency=medium
+
   * Add devuan-archive-keyring.gpg to /usr/share/keyrings
 
  -- Franco (nextime) Lanza <nextime@devuan.org>  Sat, 29 Oct 2016 23:19:20 +0200
diff --git a/debian/devuan-keyring-udeb.postinst b/debian/devuan-keyring-udeb.postinst
@@ -2,5 +2,5 @@
 set -e
 DIR=/usr/share/keyrings
 if [ ! -e $DIR/archive.gpg ]; then
-	ln -s devuan-keyring.gpg $DIR/archive.gpg 
-fi-
\ No newline at end of file
+	ln -s devuan-archive-keyring.gpg $DIR/archive.gpg 
+fi
diff --git a/debian/rules b/debian/rules
@@ -53,9 +53,7 @@ binary-indep: checkroot
 	$(install_dir) debian/devuan-keyring-udeb/DEBIAN/
 
 	$(install_dir) debian/devuan-keyring-udeb/usr/share/keyrings/
-	$(install_file) keyrings/devuan-keyring.gpg debian/devuan-keyring-udeb/usr/share/keyrings/
-	$(install_file) keyrings/devuan-keyring-2016-archive.gpg debian/devuan-keyring-udeb/usr/share/keyrings/
-	$(install_file) keyrings/devuan-keyring-2016-cdimage.gpg debian/devuan-keyring-udeb/usr/share/keyrings/
+	$(install_file) keyrings/devuan-archive-keyring.gpg debian/devuan-keyring-udeb/usr/share/keyrings/
 
 	install -m 755 debian/devuan-keyring-udeb.postinst debian/devuan-keyring-udeb/DEBIAN/postinst