From: Michael Howe <michael@michaelhowe.org>
Date: Sat, 16 Mar 2013 15:43:37 +0000 (+0000)
Subject: Try twiddling names
X-Git-Tag: 2013.03.16~2
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=fbae181202f67b0ff6adcb112c54755493ea6c6e;p=packages%2Fm%2Fmh-archive-keyring.git

Try twiddling names
---

diff --git a/debian/install b/debian/install
new file mode 100644
index 0000000..24a1b06
--- /dev/null
+++ b/debian/install
@@ -0,0 +1,2 @@
+usr/share/keyrings/*
+etc/apt/trusted.gpg.d/*
diff --git a/debian/mh-archive-keyring.install b/debian/mh-archive-keyring.install
deleted file mode 100644
index 24a1b06..0000000
--- a/debian/mh-archive-keyring.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/keyrings/*
-etc/apt/trusted.gpg.d/*
diff --git a/debian/mh-archive-keyring.postinst b/debian/mh-archive-keyring.postinst
deleted file mode 100644
index 3563259..0000000
--- a/debian/mh-archive-keyring.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/mh-archive-keyring.postrm b/debian/mh-archive-keyring.postrm
deleted file mode 100644
index 62eabe5..0000000
--- a/debian/mh-archive-keyring.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/postinst b/debian/postinst
new file mode 100644
index 0000000..3563259
--- /dev/null
+++ b/debian/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/postrm b/debian/postrm
new file mode 100644
index 0000000..62eabe5
--- /dev/null
+++ b/debian/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#
+