From 6aa944bc539cea4095971ccb2354c1e8f9f2c90a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 2 Jan 2010 17:53:05 +0100 Subject: [PATCH] remove the horrible outdated share/*-archive.gpg files and all there traces We already depend on the proper keyring so we don't need to ship our own version which isn't used anyway. --- debian/apt.postinst | 6 ------ debian/changelog | 3 +++ debian/rules | 1 - share/debian-archive.gpg | Bin 2280 -> 0 bytes share/ubuntu-archive.gpg | Bin 1724 -> 0 bytes 5 files changed, 3 insertions(+), 7 deletions(-) delete mode 100644 share/debian-archive.gpg delete mode 100644 share/ubuntu-archive.gpg diff --git a/debian/apt.postinst b/debian/apt.postinst index 88fb932d..cc0d8b1f 100644 --- a/debian/apt.postinst +++ b/debian/apt.postinst @@ -15,13 +15,7 @@ set -e case "$1" in configure) - - if ! test -f /etc/apt/trusted.gpg; then - cp /usr/share/apt/debian-archive.gpg /etc/apt/trusted.gpg - fi - apt-key update - ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/changelog b/debian/changelog index 1e935c68..ffd8f5c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,9 @@ apt (0.7.26) UNRELEASED; urgency=low too many or too big patches (Closes: #554349) * debian/control: - let all packages depend on ${misc:Depends} + * share/*-archive.gpg: + - remove the horrible outdated files. We already depend on + the keyring so we don't need to ship our own version -- Michael Vogt Thu, 10 Dec 2009 22:02:38 +0100 diff --git a/debian/rules b/debian/rules index d01b57cd..37c96ef2 100755 --- a/debian/rules +++ b/debian/rules @@ -213,7 +213,6 @@ apt: build build-doc debian/shlibs.local cp debian/bugscript debian/$@/usr/share/bug/apt/script cp debian/apt.logrotate debian/$@/etc/logrotate.d/apt - cp share/debian-archive.gpg debian/$@/usr/share/$@ cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove # head -n 500 ChangeLog > debian/ChangeLog diff --git a/share/debian-archive.gpg b/share/debian-archive.gpg deleted file mode 100644 index da1aa5e971ed4d32495627aa430a7b40bd974ec8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2280 zcmb7^_cz@68pppg!!UZEEE#55(FIY0$SN~>iL4+K!9+_$84^K|gh6IVtQsYH zkc<*Sltfv*trA_v6{0UW_ny0F&$&O`Kj8Cv-sgGVuTKUjmrm=5>d8q5G_prE__O!0 zsP~Py9d|7p1}zzWQmKfRZkko>QSPmEjzVA*{NfX>C)7iCnrsQ3uNC!d_(E5vr?-hK z$<(d!iYdp^1h=CAL1_1hD&&BNOdb+`?tp6yU0J5RvD_RKbR_VrYCBk?r9FBU%8+T~ z=HOdaX7!H=tWwe-YY7NIp)%v3v!Jw5YSCjwv3_%YZT*l}kP|zW0rSeTeK&k;3UIosC6W%J)%CPESH6i_UB8ItwiKvtZYCNsd`4; z8WDD23|~7?S3a+q?n57lF_&td6rDIBJi{`Pmc|D51!x)i=vf!sA6Zy&3XH_yd{r_r z+q=_5w#Dm62D@YkwV#|L;_m9Ij~)bNp6pYIJ6bhU-BsEscNZ^b98$~Q)zd4;9jO(F z_w{kcd$}Sly|6eh92RNheg`S8ASb6JfxO~@zwP53fOq%Tbo=p4*4H0(hTj92U>vj|jRZ60M-Bz*0HxTT^jYhh$S~ii ziQ$l1x5*|OTmm3pO9x(m88;MDnpM*_Dz8X6H1R}~g8@if799r&1VGP5w1l3qeD@Rg z5EVQ#U&|oJqO{KnSDMO$B(i@kN-F#|_Asxtde!!6{AY2CkVXg!RnjU&xKCS{cNTM5qRGhW<#X`(p_|61HxiB~*tu;w4S5 z7O4aPl+3*xqRzWyKPD=gqbdlsxzK-S4IrDV8k!$}Cen%8RxS*#jAmh{= zoi`ZnQ*&ZIEYT_*=TpKFWJPy5`S(}`X1&{rZ9p0G)Ev&O?9ILj{wm1rNpZaTHqk_k}C@Szde^LDyw>YhAl8)`=PBZzEelPqo6CK-(Sf`nTs%DcK0aQ@l}Y?4J6N}p)7P0xa))0 zMi5-mhz9bl-c(-LYIO4;S z_4374H#JA8ezPlEn_#{O)Mj`jF+@CUZXd*%Y)bipqJJP+3G465IR0E1OyiRk3t|Aqr8j=i_;c6 zKz5;CzYTh4A-0GQ* zK%6e!e_8Q=SG%+qAX~ZMJ`$9oYwb#FGNTIxrm0LyO#oRFxhsR5l?cb$N{F?RnqdvJ z7LR}AYS6fT#uA?@y(^I}YscFMP&)d*!?^8k{^o7YCVV+sUPx0ZBNZTrHR!clT@U{9 zS*)|hY&a}WmEHLAKXNsohR#?jzm4}Dd7z8qM*+%F@=J06nwK%6$}^U>?r>9DvFIK^ z8Tfr2we0qGkq;*Cs!^&dhR85cJY&U!g-`z+Fu-!Uum(+2`Y144!22`ga4Su|Sn~0= zTlMV65>W1rfP?^3*dtO3M39I652?77pM7TN+w0R`-Et;9dp^F0BX)d^?Cj&POgtzo zi?Bnz=u|b1(2-)Tba+#AE+y8eX~IJ&@j6AkG*x&?ll@S&-uQMf^1es+nh^=`7j^Eb zx5=eCCD@n5409XNhZLMtd@qzSS9;+xt`TgyJZQSqMwL7o_~4|r8=uecHaIx^W?YM` z0|?E6ntRas+1~=f@2yt96`7V~e|Kz6&1KLmAi=xq9d4}_u{+%$;G1lzrQB$WNi4JT z4I7oYV7WWr{QOhBQ_^=!3co|Z$5bK>8#*q9D!JARHB70<@wE|fHq3%)b#k-n#O!mM zW{j_0J|x9NF)Qo}=WfecxPYXdMDELr_=#5-7-|8z$Qyo z7+8cbZ@uci_!o^z1}#uahfDkw^QF1VBmebjJ(gSPDG%s=?xS{klZMg)Qa4*#PEX%V zV~HYS?w5W9UO6kiePCdpx~wnNAB0)o#rYwEICc*Q)18KLOG1hwq9zZ^Q+a)-FP0w+ z*8X&tWdHlQ>uF;*tqj`yBH?6dNPen%e`{Mp`=5$2oPl~KT0p7TOBM?x{1{?&R+PU0 D9bxxj diff --git a/share/ubuntu-archive.gpg b/share/ubuntu-archive.gpg deleted file mode 100644 index 2ce60d454f64a3f977b5e4a94f4d02948b355666..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1724 zcmV;t21EIo0ipy!M4vwq1OU4(%SN!E`!U7Yf!=(e-n=TSfJCrm>bSt#_hG_b`zk}v zI=#+ey24)!+mkjc&VL6U4eoT6xN7HPgO7tT^q4;3q38Aak&uZv)-8$N z7GfY{zzL7Vu_;ljP$2|;uw-pzLylJdp8Emd5k=@&D3kpikF|&UqK5#Wtx+~tFajjI znOJtiu=)vT)FX&j1OTSg7h259H+965J8hSjZqFS0h*YEeut<;2BEKg&^(@0JJhs57 ze^QjtkVY&Jr_xctVn6_KD)yxhr2dC+bhHwV3BM)98;faW*QK)Vp<7S|3Fi~Oi2k*_ zz4PLdMsTfZFn**2us8_tT!fWBh8^GT`&Zh5U0V+=TC3)p^}7TBgzgQ22_pb}IYy<0JQn2&3Ir!hbs5j6v^NUJ zZIs6cEhMoV6ZSXzsUQR>Lv|1>U%?(?)zv;?E-1oEhCUR_0lXw()>$#ipBe<$ZY4Oo zF9XcM|5h50=L}uJv^!N|b#8QZAVG3tXlZt3AVGC>Z*5_8X=5N$X=iR}Zf77%WqBYx zW^{0EVRLk4azJ%rb#8QZE@N+PK8Rif6A=Oc9t8qHM4vwb8v_Ol2?z%R0s|ES0|OQU z0RkQY0vCV)3JDNEmu{~^eFe27%>bWM!4OFI_g5aPGRKnSTC?%U?T7CGpIkOO?0N7= zt?f>ta|?;OD&XBl7l{HK1QP)Q00spDK~ZPl0162Z*TeBKt16N8eZmj`kDC(BF~cF& z0-3g4x@5Ny7HK7)-4zr>upBZ>BsUI4k_v8*qToZ6!_uNht_A zfyE%93R;M*wt%s@wlz*c6j~D-z7*1h_Dj-WR>Z=Y^f*MUMEL7s0;;@2*bdll+ekt7GSKdd}b<^QKoB8D=CT z!(gBCUWO%`i!;zoR{+}G!qoXfBht2T1nqwo6>l(3b zwX_sHy&PX9;Ywp#xf3FZf90+^qoV0O4Sxd3R0jTJ;EuA30Ki!|pU9hV_uey|5n>u? zP!&33o{x0Avwib%U=(4xYJ=@`i*vY1^;jRzEtpB>UwNuyZ9(n%2OQ;B7ydu6EZ?`G zBd=^ zetQS%?r$9=X`4;`HogcH)I^b~q+VTy2=>6PMo5yUMs~IJ5%sYB`zLgIhbs!t7^-P0r7GWn6^M}B-knHW*L!Dr1DD~4wTx8TG}L1oZs`?9xi;C}QPsw!->xGm`#wYL1I?zFk_qJlC@3mhh$6-AZ`?=m1s!&;F9K5Diij&!XaX<>VnR! z2b8RYMv4Gt2#9^16B*e*s!(JPdRB2u+M9s#lM0lhtVql0|p2H!t)G( zvewrSk22l(?&SP*9XCC5D7@-$ zU41&t$R8U4deJs)n0l_C@i%}@I$|RP+p6YKeo9Ex=Jef&WDg_H`vqS;h)Dz(5dr`S z1p+}tpGN{43;+rV5I~o1uS0zWwcJ<$n+1(ev2E;of$Q=a4ZoTiqI5*KGXS81q%x!I SHBStB45G#Rdd22<^%rz^e;}X$ -- 2.20.1