Added removal of old GPG key in trinity-keyring on Debian and Ubuntu

Cleanup build rules

7 files changed, 78 insertions, 68 deletions

diff --git a/ubuntu/maverick/metapackages/trinity-keyring/debian/compat b/ubuntu/maverick/metapackages/trinity-keyring/debian/compat
new file mode 100644
index 000000000..7f8f011eb
--- /dev/null
+++ b/ubuntu/maverick/metapackages/trinity-keyring/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/ubuntu/maverick/metapackages/trinity-keyring/debian/distrospecific/changelog b/ubuntu/maverick/metapackages/trinity-keyring/debian/distrospecific/changelog
deleted file mode 100644
index eca44f384..000000000
--- a/ubuntu/maverick/metapackages/trinity-keyring/debian/distrospecific/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-debian-archive-keyring (2006.01.10) unstable; urgency=low
-
-  * Initial release
-
- -- Michael Vogt <mvo@debian.org>  Tue, 10 Jan 2006 09:17:43 +0100
diff --git a/ubuntu/maverick/metapackages/trinity-keyring/debian/distrospecific/keyrings/trinity-keyring-removed.gpg b/ubuntu/maverick/metapackages/trinity-keyring/debian/distrospecific/keyrings/trinity-keyring-removed.gpg
new file mode 100644
index 000000000..d703b13cc
--- /dev/null
+++ b/ubuntu/maverick/metapackages/trinity-keyring/debian/distrospecific/keyrings/trinity-keyring-removed.gpg
@@ -0,0 +1,13 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.10 (GNU/Linux)
+
+mI0ETBb5vwEEANKouZGon6I/wxSh8LO49a/JRCsEI/wiXMBDw/eOa+AF6onugRs3
+9XYo0fPuSu5OzJW+Mjt7FD+IYBwrqWH8kqshXHEpiPfVh1uEa0lSDmDoEx6BEude
+CVvt/tc2x4YDzwxdChQ5X/Bwhq/kfTXCUXuNLmT1rifJiujeuISd+06VABEBAAG0
+JlF1aWNrQnVpbGQgVHJpbml0eSBEZXNrdG9wIEVudmlyb25tZW50iLgEEwECACIF
+AkwW+b8CGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEEPx3E8rhjjQu30E
+AJpz2+fjYXvpQOGIN3w2BoKBF0jVROS+xPs1dZMzHhvdwQR6/2KI8RVZ7M+VnnJi
+Y0VaYf6jYd08S4SsX5LuDuiCxxkMkno7RRdEOdsnxfiqGnv2EjvQEM3trflQzIBi
+9wc+mh9XeI7OZNke/KryAqRTLMdYlTIlv2XNAy/bXFS4
+=qpbT
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/ubuntu/maverick/metapackages/trinity-keyring/debian/install b/ubuntu/maverick/metapackages/trinity-keyring/debian/install
new file mode 100644
index 000000000..03bc5d979
--- /dev/null
+++ b/ubuntu/maverick/metapackages/trinity-keyring/debian/install
@@ -0,0 +1,2 @@
+keyrings			usr/share
+repositories/trinity.list	etc/apt/sources.list.d
diff --git a/ubuntu/maverick/metapackages/trinity-keyring/debian/postinst b/ubuntu/maverick/metapackages/trinity-keyring/debian/postinst
index fa0073eba..1da9ae7ae 100644
--- a/ubuntu/maverick/metapackages/trinity-keyring/debian/postinst
+++ b/ubuntu/maverick/metapackages/trinity-keyring/debian/postinst
@@ -1,5 +1,31 @@
 #!/bin/sh
+# postinst script for trinity-keyring
 
-if [ -x /usr/bin/apt-key ]; then
-    /usr/bin/apt-key add /usr/share/keyrings/trinity-keyring.gpg
-fi
+set -e
+
+case "$1" in
+    configure)
+      if [ -x /usr/bin/apt-key ]; then
+        # Key F5CFC95C (2014.06.08)
+        apt-key add /usr/share/keyrings/trinity-keyring.gpg > /dev/null
+
+        # Key 2B8638D0 (2010.06.15)
+        apt-key del 2B8638D0 2> /dev/null || true
+      fi
+    ;;
+
+    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/ubuntu/maverick/metapackages/trinity-keyring/debian/prerm b/ubuntu/maverick/metapackages/trinity-keyring/debian/prerm
index 4af539bb3..5b746100f 100644
--- a/ubuntu/maverick/metapackages/trinity-keyring/debian/prerm
+++ b/ubuntu/maverick/metapackages/trinity-keyring/debian/prerm
@@ -1,9 +1,28 @@
 #!/bin/sh
+# prerm script for trinity-keyring
+
+set -e
 
 case "$1" in
-    remove|purge)
-	if [ -x /usr/bin/apt-key ]; then
-		/usr/bin/apt-key del 2B8638D0
-	fi
-	;;
+    remove)
+      if [ -x /usr/bin/apt-key ]; then
+        # Key F5CFC95C (2014.06.08)
+        apt-key del F5CFC95C 2> /dev/null || true
+      fi
+    ;;
+
+    upgrade|failed-upgrade|deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
 esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/ubuntu/maverick/metapackages/trinity-keyring/debian/rules b/ubuntu/maverick/metapackages/trinity-keyring/debian/rules
index 39064539d..61e9dffa1 100755
--- a/ubuntu/maverick/metapackages/trinity-keyring/debian/rules
+++ b/ubuntu/maverick/metapackages/trinity-keyring/debian/rules
@@ -1,24 +1,14 @@
 #!/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
 
-install_dir=install -d -m 755
-install_file=install -m 644
-install_script=install -m 755
-install_binary=install -m 755 -s
+include /usr/share/cdbs/1/rules/debhelper.mk
 
 VERSION := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2)
 DISTRIBUTION := $(shell dpkg-parsechangelog | grep ^Distribution: | cut -d' ' -f2)
 
-build: debian/stamp-distrospecific
-	$(checkdir)
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
+
+pre-build:: debian/stamp-distrospecific
 
 debian/stamp-distrospecific:
 	dh_testdir
@@ -27,49 +17,13 @@ debian/stamp-distrospecific:
 	tee debian/stamp-distrospecific | \
 	tr "\n" "\0" | (cd debian/distrospecific && xargs -r0 mv -t ../..)
 
-clean:
+clean::
 	dh_testdir
 	[ ! -e debian/stamp-distrospecific ] || \
 	cat debian/stamp-distrospecific | \
 	tr "\n" "\0" | xargs -r0 mv -t debian/distrospecific
 	rm -f debian/stamp-distrospecific
-	-rm -f foo foo.asc *.bak *~ */*~ debian/files* debian/*substvars
-	-rm -rf debian/tmp
-
-binary-indep: checkroot
-	$(checkdir)
-	-rm -rf debian/tmp
-	$(install_dir) debian/tmp/DEBIAN/
-	$(install_script) debian/postinst debian/tmp/DEBIAN/
-	$(install_script) debian/prerm debian/tmp/DEBIAN/
-
-	$(install_dir) debian/tmp/usr/share/keyrings/
-	$(install_file) keyrings/trinity-keyring.gpg debian/tmp/usr/share/keyrings/
-	$(install_dir) debian/tmp/etc/apt/sources.list.d/
-	$(install_file) repositories/trinity.list debian/tmp/etc/apt/sources.list.d/
-	sed -i 's|ubuntu [^ ]* main|ubuntu ${DISTRIBUTION} main|g' debian/tmp/etc/apt/sources.list.d/trinity.list
-
-	$(install_dir) debian/tmp/usr/share/doc/trinity-keyring/
-	$(install_file) debian/changelog debian/tmp/usr/share/doc/trinity-keyring/changelog
-	$(install_file) debian/copyright debian/tmp/usr/share/doc/trinity-keyring/
-
-	dpkg-gencontrol -ptrinity-keyring -isp
-	chown -R root.root debian/tmp
-	chmod -R go=rX debian/tmp
-	dpkg --build debian/tmp ..
-
-binary-arch:
 
-define checkdir
-	test -f keyrings/trinity-keyring.gpg
-endef
-
-# Below here is fairly generic really
-
-binary:		binary-indep binary-arch
-
-checkroot:
-	$(checkdir)
-	test root = "`whoami`"
-
-.PHONY: binary binary-arch binary-indep clean checkroot
+binary-install/trinity-keyring::
+	dh_testdir
+	sed -i 's|ubuntu [^ ]* main|ubuntu ${DISTRIBUTION} main|g' debian/$(cdbs_curpkg)/etc/apt/sources.list.d/trinity.list