commit 8ca7cf0502d82ceb872b307b9f5503af39a44d19
parent 73e182629e04ba97531a7dadb1aeee361801156c
Author: Franco (nextime) Lanza <nextime@nexlab.it>
Date: Mon, 10 Oct 2016 12:44:46 +0200
Removed apt-key dependency and refreshed package
Diffstat:
7 files changed, 97 insertions(+), 39 deletions(-)
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,11 @@
+devuan-keyring (2016.10.10) unstable; urgency=medium
+
+ * Removed apt-key dependency
+ * Remastered rules and package (copied from the ubuntu one)
+ * Refreshed keyring
+
+ -- Franco (nextime) Lanza <nextime@devuan.org> Mon, 10 Oct 2016 12:43:40 +0200
+
devuan-keyring (2016.10.07) unstable; urgency=medium
* Added devuan toaster pub key
diff --git a/debian/control b/debian/control
@@ -1,17 +1,18 @@
-Source:devuan-keyring
+Source: devuan-keyring
Section: misc
-Priority: important
+Priority: optional
Maintainer: Franco (nextime) Lanza <nextime@devuan.org>
Bugs: mailto:nextime@devuan.org
Homepage: http://www.devuan.org
Standards-Version: 3.9.6
-Build-Depends: debhelper (>= 9), gnupg
+Build-Depends: debhelper (>= 9), gnupg, debian-keyring
Package: devuan-keyring
+Priority: important
Architecture: all
Multi-Arch: foreign
-Depends: gpgv, ${misc:Depends}
-Recommends: gnupg
+Depends: gpgv
+Recommends: gnupg | gnupg1
Breaks: apt (<< 0.7.25.1)
Description: GnuPG archive key of the devuan repository
The devuan repository digitally signs its Release files.
@@ -23,7 +24,6 @@ XC-Package-Type: udeb
Priority: optional
Architecture: all
Section: debian-installer
-Depends: ${misc:Depends}
Recommends: gpgv-udeb
Description: GnuPG keys of the Devuan archive
The Devuan project digitally signs its Release files. This package
diff --git a/debian/devuan-keyring-udeb.install b/debian/devuan-keyring-udeb.install
@@ -1 +0,0 @@
-usr/share/keyrings/*
diff --git a/debian/devuan-keyring.install b/debian/devuan-keyring.install
@@ -1 +0,0 @@
-usr/share/keyrings/devuan-keyring.gpg
diff --git a/debian/devuan-keyring.postinst b/debian/devuan-keyring.postinst
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- configure)
- if [ -x /usr/bin/apt-key ]; then
- apt-key add /usr/share/keyrings/devuan-keyring.gpg
- fi
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/rules b/debian/rules
@@ -1,12 +1,87 @@
#!/usr/bin/make -f
+# debian/rules file - for debian/keyring
+# Based on sample debian/rules file - for GNU Hello (1.3).
+# Copyright 1994,1995 by Ian Jackson.
+# Copyright 1998-2003 James Troup
+# I hereby give you perpetual unlimited permission to copy,
+# modify and relicense this file, provided that you do not remove
+# my name from the file itself. (I assert my moral right of
+# paternity under the Copyright, Designs and Patents Act 1988.)
+# This file may have to be extensively modified
-%:
- dh $@
+install_dir=install -d -m 755
+install_file=install -m 644
+install_script=install -m 755
+install_binary=install -m 755 -s
-override_dh_install:
- mkdir -p debian/tmp/usr/share/keyrings
- cp keyrings/* debian/tmp/usr/share/keyrings
- dh_install
+VERSION := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2)
-override_dh_builddeb:
- dh_builddeb -- -Zxz
+build:
+
+clean:
+ $(checkdir)
+ -rm -f foo foo.asc *.bak *~ */*~ debian/files* debian/*substvars
+ -rm -rf debian/tmp debian/devuan-keyring-udeb
+
+binary-indep: checkroot checkkeyrings
+ $(checkdir)
+ -rm -rf debian/tmp
+ $(install_dir) debian/tmp/DEBIAN/
+ $(install_script) debian/postinst debian/tmp/DEBIAN/
+
+ $(install_dir) debian/tmp/usr/share/keyrings/
+ $(install_file) keyrings/devuan-keyring.gpg debian/tmp/usr/share/keyrings/
+
+ $(install_dir) debian/tmp/usr/share/doc/devuan-keyring/
+ $(install_file) README debian/tmp/usr/share/doc/devuan-keyring/
+ $(install_file) debian/changelog debian/tmp/usr/share/doc/devuan-keyring/changelog
+ gzip -9v debian/tmp/usr/share/doc/devuan-keyring/*
+ $(install_file) debian/copyright debian/tmp/usr/share/doc/devuan-keyring/
+ cd debian/tmp; find -type f \! -regex '.*/DEBIAN/.*' -printf '%P\0' | xargs -r0 md5sum >DEBIAN/md5sums
+
+ dpkg-gencontrol -pdevuan-keyring -isp
+ chown -R root.root debian/tmp
+ chmod -R go=rX debian/tmp
+ dpkg --build debian/tmp ..
+
+ -rm -rf debian/devuan-keyring-udeb
+ $(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 -m 755 debian/devuan-keyring-udeb.postinst debian/devuan-keyring-udeb/DEBIAN/postinst
+
+ # Don't let dpkg-gencontrol write incorrect guesses to debian/files.
+ # Instead, register the udeb manually.
+ dpkg-gencontrol -ndevuan-keyring-udeb_$(VERSION)_all.udeb -pdevuan-keyring-udeb -Tdebian/devuan-keyring-udeb.substvars -Pdebian/devuan-keyring-udeb -isp
+ chown -R root.root debian/devuan-keyring-udeb
+ chmod -R go=rX debian/devuan-keyring-udeb
+ dpkg --build debian/devuan-keyring-udeb ../devuan-keyring-udeb_$(VERSION)_all.udeb
+
+binary-arch:
+
+define checkdir
+ test -f keyrings/devuan-keyring.gpg
+endef
+
+# Below here is fairly generic really
+
+binary: binary-indep binary-arch
+
+checkroot:
+ $(checkdir)
+ test root = "`whoami`"
+
+regenerate-key-fragments:
+ rm -f keyrings/ubuntu-keyring-*.gpg
+ gpg --no-default-keyring --keyring ./keyrings/ubuntu-archive-keyring.gpg --output keyrings/ubuntu-keyring-2004-archive.gpg --export 0x630239CC130E1A7FD81A27B140976EAF437D05B5
+ gpg --no-default-keyring --keyring ./keyrings/ubuntu-archive-keyring.gpg --output keyrings/ubuntu-keyring-2004-cdimage.gpg --export 0xC5986B4F1257FFA86632CBA746181433FBB75451
+ gpg --no-default-keyring --keyring ./keyrings/ubuntu-archive-keyring.gpg --output keyrings/ubuntu-keyring-2012-archive.gpg --export 0x790BC7277767219C42C86F933B4FE6ACC0B21F32
+ gpg --no-default-keyring --keyring ./keyrings/ubuntu-archive-keyring.gpg --output keyrings/ubuntu-keyring-2012-cdimage.gpg --export 0x843938DF228D22F7B3742BC0D94AA3F0EFE21092
+ sha512sum keyrings/*.gpg | gpg --clearsign > SHA512SUMS.txt.asc
+
+checkkeyrings:
+ gpg --no-default-keyring --keyring /usr/share/keyrings/debian-keyring.gpg --decrypt SHA512SUMS.txt.asc | sha512sum -c -
+ gpg --no-default-keyring --keyring /usr/share/keyrings/debian-keyring.gpg --decrypt md5sums.txt | md5sum -c -
+
+.PHONY: binary binary-arch binary-indep clean checkroot checkkeyrings build
diff --git a/keyrings/devuan-keyring.gpg b/keyrings/devuan-keyring.gpg
Binary files differ.