[24192] in Source-Commits
/svn/athena r23793 - in trunk/debathena/debathena/archive-keyring: . debian
daemon@ATHENA.MIT.EDU (Evan Broder)
Mon May 18 12:29:59 2009
Date: Mon, 18 May 2009 12:29:49 -0400
From: Evan Broder <broder@MIT.EDU>
Message-Id: <200905181629.n4IGTnA8023920@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: broder
Date: 2009-05-18 12:29:49 -0400 (Mon, 18 May 2009)
New Revision: 23793
Modified:
trunk/debathena/debathena/archive-keyring/debathena-archive-keyring.gpg
trunk/debathena/debathena/archive-keyring/debian/changelog
trunk/debathena/debathena/archive-keyring/debian/debathena-archive-keyring.postinst
Log:
In archive-keyring:
* Don't try to repeatedly delete the old keys, and actually fail if it
fails to remove.
* Add the new Debathena signing key (0D8A9E8F) to the keyring.
Modified: trunk/debathena/debathena/archive-keyring/debathena-archive-keyring.gpg
===================================================================
--- trunk/debathena/debathena/archive-keyring/debathena-archive-keyring.gpg 2009-05-17 15:29:57 UTC (rev 23792)
+++ trunk/debathena/debathena/archive-keyring/debathena-archive-keyring.gpg 2009-05-18 16:29:49 UTC (rev 23793)
@@ -1,4 +1,5 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.9 (GNU/Linux)
mQGiBEX9ncMRBADiYGGhQGHN2GTFa7ID7c06yEPRugBDB78sm9+AUpubM86PbRbt
8WJGadtG1drKclV8dvsznxaes4NmBt2fyqzvpflOjpdbEeLOIrNJyZhcqPIYf2ze
@@ -12,26 +13,42 @@
aGVuYSBQcm9qZWN0IChBcmNoaXZlIFNpZ25pbmcgS2V5KSA8ZGViYXRoZW5hQG1p
dC5lZHU+iGAEExECACAFAkX9ncMCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAK
CRCqmRi7mX1rI7vlAJwJrCIX3hql0fMU75qXuPpr+zNXcwCfcfOLJR5WbYEm2GMs
-TCW+wsMGXV2IRgQQEQIABgUCSQetewAKCRDyZrIx8tZysHVFAKCD0Ijnz7a4xdN4
-94enARaRL0ESNgCbBh8u/oSo8SqW+DsOt1SiaO6QsXGIRgQTEQIABgUCSUROqwAK
-CRANRvApHS+rmaDQAKDQKfgvEk+w7AkMEPAUKTwq/NiK4wCglgN+KZ1/jii+B5Xd
-o8uowCE9F4GIRgQTEQIABgUCSURQEgAKCRAb2JehJfpcVqI4AKCSRThG7gQFi7R5
-M7WjjJUnS6rFzQCgw3Zd+vPbnYjKriwSN3F8W0JqOhiIRgQSEQIABgUCSUcMGwAK
-CRAWKAdg4FkEVtV4AJ4m/nAqRXnvvvwH9XLIHJZSEYK11wCffk7q/YyvWKK0mq+C
-B94bh2LXZjOIRgQTEQIABgUCSUb9rgAKCRBYg8pP8GSBck8+AJ0csJ20FKX9wFz3
-voRMWVxk7dbSUgCgweqmuoC2NXWuwozHO3iZIPSilE25Ag0ERf2d1RAIAOXjiYYa
-qiEJExD2y0xcyC3z/vGzj18h2Qivci/F0aF3zlQ+GK5VRY87aSbUgPSr8ppt+vdd
-HiAhZhFECOinRINweLVXLDRpAIcTPCN9HI75xLW5JiNhD3Sfpmc3vwZKmwk861mv
-ZPSudjoeFUB3cyXg/+Am5yjxzaydYjiKuTmRxuutTksj5zYkadKLdBV7u76nI8N3
-PzAGtKxoEjK7wLBNsS3uHr4jmoGVGV3IU6Z6UNe7vMzPVOWDNdyomdkE+lJxE1j0
-PyCo2wyNhWWNqBuNfDVT7VnYoyFKPeSxDvoFZQhVJs+1djCqowqphnAGZNm9yYu4
-P3Xjet4c7yK4EGsAAwUH/1130/lSm/M2pE/F0njF3q2ySGTBMb269wRGJDoTjSvC
-3zRa3QuRZ8bRdtn8/7wr63/vlmVba2wfvIWUgAnD3WydSgiV0xKMidQ0wFE8J3y6
-CQSr0DZmfm4jG6vbraSKUruIyyLa/n/mE9Y4kmdEI2watlI93Df/WDh9KBJ+Mg2W
-lFdb4XRxDnKW4w+lVwvLysu2bziTWNo6puwcW873OKnOGTPtpcbT73JQe4iCI6yK
-6SqsKP4+xk7mQ6bdUatTssHvQmvfgF5eOaX4YS/HZeOw4ZPuZkDjF2A/YngcUrLd
-qgUpQQ8NUkpyblFY7aaNRkYlghXbT9qydN5Wm6LdMqaISQQYEQIACQUCRf2d1QIb
-DAAKCRCqmRi7mX1rI92DAJ92xa7wDExgvtv5szzzTMGGd44hxQCdG3yIDUWC8sXx
-/oNCfx8Wyil006Y=
-=gGl0
+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
+=9JP+
-----END PGP PUBLIC KEY BLOCK-----
Modified: trunk/debathena/debathena/archive-keyring/debian/changelog
===================================================================
--- trunk/debathena/debathena/archive-keyring/debian/changelog 2009-05-17 15:29:57 UTC (rev 23792)
+++ trunk/debathena/debathena/archive-keyring/debian/changelog 2009-05-18 16:29:49 UTC (rev 23793)
@@ -1,3 +1,11 @@
+debathena-archive-keyring (1.2) unstable; urgency=low
+
+ * Don't try to repeatedly delete the old keys, and actually fail if it
+ fails to remove.
+ * Add the new Debathena signing key (0D8A9E8F) to the keyring.
+
+ -- Evan Broder <broder@mit.edu> Mon, 18 May 2009 12:29:31 -0400
+
debathena-archive-keyring (1.1) unstable; urgency=low
* Remove the Athena 10 key, as it was only needed for a transitional
Modified: trunk/debathena/debathena/archive-keyring/debian/debathena-archive-keyring.postinst
===================================================================
--- trunk/debathena/debathena/archive-keyring/debian/debathena-archive-keyring.postinst 2009-05-17 15:29:57 UTC (rev 23792)
+++ trunk/debathena/debathena/archive-keyring/debian/debathena-archive-keyring.postinst 2009-05-18 16:29:49 UTC (rev 23793)
@@ -2,5 +2,7 @@
if hash apt-key >/dev/null 2>&1; then
apt-key add /usr/share/keyrings/debathena-archive-keyring.gpg
- apt-key del 0xA2DA1A6C || [ $? = 2 ]
+ if apt-key list | grep -q A2DA1A6C; then
+ apt-key del A2DA1A6C
+ fi
fi
