[24136] in Source-Commits
/svn/athena r23738 - in trunk/debathena/debathena/archive-keyring: . debian
daemon@ATHENA.MIT.EDU (Evan Broder)
Sun Apr 12 01:48:34 2009
Date: Sun, 12 Apr 2009 01:48:20 -0400
From: Evan Broder <broder@MIT.EDU>
Message-Id: <200904120548.n3C5mKwH002192@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: broder
Date: 2009-04-12 01:48:20 -0400 (Sun, 12 Apr 2009)
New Revision: 23738
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:
* Remove the Athena 10 key, as it was only needed for a transitional
period. (Trac: #181)
Modified: trunk/debathena/debathena/archive-keyring/debathena-archive-keyring.gpg
===================================================================
--- trunk/debathena/debathena/archive-keyring/debathena-archive-keyring.gpg 2009-04-12 05:11:07 UTC (rev 23737)
+++ trunk/debathena/debathena/archive-keyring/debathena-archive-keyring.gpg 2009-04-12 05:48:20 UTC (rev 23738)
@@ -1,5 +1,4 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.9 (GNU/Linux)
mQGiBEX9ncMRBADiYGGhQGHN2GTFa7ID7c06yEPRugBDB78sm9+AUpubM86PbRbt
8WJGadtG1drKclV8dvsznxaes4NmBt2fyqzvpflOjpdbEeLOIrNJyZhcqPIYf2ze
@@ -13,42 +12,26 @@
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
-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
-=2cPI
+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
-----END PGP PUBLIC KEY BLOCK-----
Modified: trunk/debathena/debathena/archive-keyring/debian/changelog
===================================================================
--- trunk/debathena/debathena/archive-keyring/debian/changelog 2009-04-12 05:11:07 UTC (rev 23737)
+++ trunk/debathena/debathena/archive-keyring/debian/changelog 2009-04-12 05:48:20 UTC (rev 23738)
@@ -1,3 +1,10 @@
+debathena-archive-keyring (1.1) unstable; urgency=low
+
+ * Remove the Athena 10 key, as it was only needed for a transitional
+ period. (Trac: #181)
+
+ -- Evan Broder <broder@mit.edu> Sun, 12 Apr 2009 01:45:31 -0400
+
debathena-archive-keyring (1.0) unstable; urgency=low
* Initial commit.
Modified: trunk/debathena/debathena/archive-keyring/debian/debathena-archive-keyring.postinst
===================================================================
--- trunk/debathena/debathena/archive-keyring/debian/debathena-archive-keyring.postinst 2009-04-12 05:11:07 UTC (rev 23737)
+++ trunk/debathena/debathena/archive-keyring/debian/debathena-archive-keyring.postinst 2009-04-12 05:48:20 UTC (rev 23738)
@@ -1,5 +1,6 @@
#!/bin/sh
-if [ -x /usr/bin/apt-key ]; then
- /usr/bin/apt-key add /usr/share/keyrings/debathena-archive-keyring.gpg
+if hash apt-key >/dev/null 2>&1; then
+ apt-key add /usr/share/keyrings/debathena-archive-keyring.gpg
+ apt-key del 0xA2DA1A6C || [ $? = 2 ]
fi
