Build a udeb too, even though it won't really work

diff --git a/debian/control b/debian/control
index 6298960a9f40f1b94e004f780b7a30119b973d96..efd4929ae1d1124e9687a3dea2b3e272c6005a28 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,3 +11,14 @@ Depends: gpgv, ${misc:Depends}
 Recommends: gnupg
 Breaks: apt (<< 0.7.25.1)
 Description: GnuPG archive keys of the michaelhowe.org archive
+
+Package: mh-archive-keyring-udeb
+XC-Package-Type: udeb
+Priority: optional
+Architecture: all
+Section: debian-installer
+Depends: ${misc:Depends}
+Recommends: gpgv-udeb
+Description: GnuPG archive keys of the michaelhowe.org archive
+ This package contains archive keys used for signing the michaelhowe.org Debian
+ archive, in a minimal form for use in the installer.

diff --git a/debian/install b/debian/install
deleted file mode 100644 (file)
index 24a1b06..0000000
--- a/debian/install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/keyrings/*
-etc/apt/trusted.gpg.d/*

diff --git a/debian/mh-archive-keyring-udeb.install b/debian/mh-archive-keyring-udeb.install
new file mode 100644 (file)
index 0000000..e7d5866
--- /dev/null
+++ b/debian/mh-archive-keyring-udeb.install
@@ -0,0 +1 @@
+usr/share/keyrings/mh-archive-keyring.gpg

diff --git a/debian/mh-archive-keyring-udeb.postinst b/debian/mh-archive-keyring-udeb.postinst
new file mode 100644 (file)
index 0000000..45974b5
--- /dev/null
+++ b/debian/mh-archive-keyring-udeb.postinst
@@ -0,0 +1,7 @@
+#!/bin/sh
+set -e
+exit 0
+DIR=/usr/share/keyrings
+if [ ! -e $DIR/archive.gpg ]; then
+       ln -s mh-archive-keyring.gpg $DIR/archive.gpg 
+fi

diff --git a/debian/mh-archive-keyring.install b/debian/mh-archive-keyring.install
new file mode 100644 (file)
index 0000000..24a1b06
--- /dev/null
+++ b/debian/mh-archive-keyring.install
@@ -0,0 +1,2 @@
+usr/share/keyrings/*
+etc/apt/trusted.gpg.d/*

diff --git a/debian/mh-archive-keyring.postinst b/debian/mh-archive-keyring.postinst
new file mode 100644 (file)
index 0000000..3563259
--- /dev/null
+++ b/debian/mh-archive-keyring.postinst
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = 'configure' -a -n "$2" ]; then
+       # 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
+                       for KEY in F42584E6 55BE302B 6D849617 B98321F9 473041FA 46925553 65FFB764; do
+                               apt-key --keyring "$TRUSTEDFILE" del $KEY > /dev/null 2>&1 || :
+                       done
+               fi
+       fi
+fi
+
+#DEBHELPER#

diff --git a/debian/mh-archive-keyring.postrm b/debian/mh-archive-keyring.postrm
new file mode 100644 (file)
index 0000000..62eabe5
--- /dev/null
+++ b/debian/mh-archive-keyring.postrm
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "purge" ]
+then
+  # Remove the symlink
+  rm -f /etc/apt/trusted.gpg.d/mh-archive-keyring.gpg
+fi
+
+#DEBHELPER#
+

diff --git a/debian/postinst b/debian/postinst
deleted file mode 100644 (file)
index 3563259..0000000
--- a/debian/postinst
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = 'configure' -a -n "$2" ]; then
-       # 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
-                       for KEY in F42584E6 55BE302B 6D849617 B98321F9 473041FA 46925553 65FFB764; do
-                               apt-key --keyring "$TRUSTEDFILE" del $KEY > /dev/null 2>&1 || :
-                       done
-               fi
-       fi
-fi
-
-#DEBHELPER#

diff --git a/debian/postrm b/debian/postrm
deleted file mode 100644 (file)
index 62eabe5..0000000
--- a/debian/postrm
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "purge" ]
-then
-  # Remove the symlink
-  rm -f /etc/apt/trusted.gpg.d/mh-archive-keyring.gpg
-fi
-
-#DEBHELPER#
-

diff --git a/debian/rules b/debian/rules
index b760bee7f4c367c013d228df52f8332ae6744cf2..fcc2b6104dd64e8331eb15fae0c51d8d1a844c7f 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@
 # This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
 
 %:
        dh $@