From 8c985ebc1eb06b3724bccc54d6505ba6c418b13e Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 1 Mar 2010 14:39:18 +0000 Subject: Include debian/ssh-askpass-gnome.png in the Debian tarball now that we're using a source format that permits this, rather than messing around with uudecode. --- debian/changelog | 3 + debian/clean | 1 - debian/control | 2 +- debian/rules | 2 +- debian/source/include-binaries | 1 + debian/ssh-askpass-gnome.png | Bin 0 -> 6949 bytes debian/ssh-askpass-gnome.png.uue | 158 --------------------------------------- 7 files changed, 6 insertions(+), 161 deletions(-) create mode 100644 debian/source/include-binaries create mode 100644 debian/ssh-askpass-gnome.png delete mode 100644 debian/ssh-askpass-gnome.png.uue diff --git a/debian/changelog b/debian/changelog index c9916fb7b..2b75de5a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ openssh (1:5.3p1-4) UNRELEASED; urgency=low * Fix 'debian/rules quilt-setup' to avoid writing .orig files if some patches apply with offsets. + * Include debian/ssh-askpass-gnome.png in the Debian tarball now that + we're using a source format that permits this, rather than messing + around with uudecode. -- Colin Watson Mon, 01 Mar 2010 12:24:41 +0000 diff --git a/debian/clean b/debian/clean index 2a412a1ce..5da17f8eb 100644 --- a/debian/clean +++ b/debian/clean @@ -1,2 +1 @@ config.log -debian/ssh-askpass-gnome.png diff --git a/debian/control b/debian/control index 18b55e9f7..9b49d46e4 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: openssh Section: net Priority: standard Maintainer: Debian OpenSSH Maintainers -Build-Depends: libwrap0-dev | libwrap-dev, zlib1g-dev (>= 1:1.2.3-1), libssl-dev (>= 0.9.8-1), libpam0g-dev | libpam-dev, libgtk2.0-dev, libedit-dev, debhelper (>= 7.0.1), sharutils, libselinux1-dev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m68k mips mipsel powerpc ppc64 s390 sh4 sparc], libkrb5-dev | heimdal-dev, hardening-includes +Build-Depends: libwrap0-dev | libwrap-dev, zlib1g-dev (>= 1:1.2.3-1), libssl-dev (>= 0.9.8-1), libpam0g-dev | libpam-dev, libgtk2.0-dev, libedit-dev, debhelper (>= 7.0.1), libselinux1-dev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m68k mips mipsel powerpc ppc64 s390 sh4 sparc], libkrb5-dev | heimdal-dev, hardening-includes Standards-Version: 3.7.3 Uploaders: Colin Watson , Matthew Vernon Vcs-Bzr: http://bzr.debian.org/pkg-ssh/openssh/trunk diff --git a/debian/rules b/debian/rules index c855dc6c2..7537dcd2e 100755 --- a/debian/rules +++ b/debian/rules @@ -187,7 +187,7 @@ install: build install -s -o root -g root -m 755 contrib/gnome-ssh-askpass2 debian/ssh-askpass-gnome/usr/lib/openssh/gnome-ssh-askpass install -m 644 debian/gnome-ssh-askpass.1 debian/ssh-askpass-gnome/usr/share/man/man1/gnome-ssh-askpass.1 - uudecode -o debian/ssh-askpass-gnome/usr/share/pixmaps/ssh-askpass-gnome.png debian/ssh-askpass-gnome.png.uue + install -m 644 debian/ssh-askpass-gnome.png debian/ssh-askpass-gnome/usr/share/pixmaps/ssh-askpass-gnome.png install -m 755 debian/ssh-argv0 debian/openssh-client/usr/bin/ssh-argv0 install -m 644 debian/ssh-argv0.1 debian/openssh-client/usr/share/man/man1/ssh-argv0.1 diff --git a/debian/source/include-binaries b/debian/source/include-binaries new file mode 100644 index 000000000..df5790e2e --- /dev/null +++ b/debian/source/include-binaries @@ -0,0 +1 @@ +debian/ssh-askpass-gnome.png diff --git a/debian/ssh-askpass-gnome.png b/debian/ssh-askpass-gnome.png new file mode 100644 index 000000000..06f75764e Binary files /dev/null and b/debian/ssh-askpass-gnome.png differ diff --git a/debian/ssh-askpass-gnome.png.uue b/debian/ssh-askpass-gnome.png.uue deleted file mode 100644 index 2c6895530..000000000 --- a/debian/ssh-askpass-gnome.png.uue +++ /dev/null @@ -1,158 +0,0 @@ -begin 644 ssh-askpass-gnome.png -MB5!.1PT*&@H````-24A$4@```(0```!S"`,```!N#5HT```#`%!,5$7_____ -M__\("`@0$!`8&!@A(2$Y.3E"0D)*2DI24E):6EIC8V-K:VMSWN$A(2, -MC(R4E)2QH3OUHSGSH2,>TI".2&M -MC#%*.0A",0!:0@!:4CE22C&QGNEE%HQ*1",M0#GO0#W -MQ@#_S@#_[YQ[SH36QGMS:T+GUH1K8SE:4BES8QAK6@@Q*0!:2@!C -M4@!K6@",P"]G`#&I0#OQ@#WS@#_U@",A%)*0A!S8P@Y,0!S8P#GQ@#O -MS@#_YTI:4AA22A#_W@#.QH3W[YS6SH3_YP"4E(P8&!#__Z4I*1@A(1`0$``8 -M&``A(0`I*0!SA!!SA`![C"%[C#%SC!![E#E[E$I[G%(Q.2F$G&N$I7.$I7M* -M4DHI,2F$K92,K9R$K9R,M:6$C(SO__]C:VM26EI:8V-"2DJ$E)0Q0D(0&!@` -M"`B, -MQM[6Y^^]SM:4I:TY2E)KC)QCA)2EWO>4QMXQ0DI"8W/&UMZ,O=9:>XQ2 -M[_\Y -M0DH8(2D8*3FMM;VEK;6,E)QKY_<0(4((&#D`"!@($"$0&#&,C)1SMW3W6K)&[BUO#N[??L\,6"-)D;^]V;V9<+^TF -M6X"5K-OU7_^H_K1VV]`_#"F&8""`)(`N(,D1!(%R#$.R4P-M0K=%:3E.X"22 -M4/&F[\SN'6F)LDA:18H.0-[R;F_WF7?>]WF?]YUEK?;_;;SSRP8@!G]C<^?_ -MVL>O_\25!W%\4Z=__.IMSRUON\(8#O'%39T_<>UW_^LWEW]EJW=;^\>)\=%Q -M_OZF+C/\NQ]^]Y7KG]DBB.4C:_[@RZ.CO>JQ35UFXM]^]K-7]E^]11`O\H-K -M0$R,CMZ=?;+6R^T?`PCX^\`0"1![($3F^5JW.?G2)2ZSN,RW -MA.&P],,#Q5_*UZ5]M=J/&N?!)Y<%,ER\6=MWS8NUUZ_.U_(6OQ2(+8Z#?+Z\ -M;BR7_]C)6NU[L_>\#%YR\O!P*I@]5UL$(YP,]9/BY/([^R -M3H:H^/G!V@)__Z5CMWK#I3,\G/*"@+8:X>#,VT-G(``LR6^\JQS\L`MN9;SV -MN'887@XIR.VLG!UR?J8P2*[V^QZE`0DH\=PDXGX.2W!P`CRF]G*:7FD,M1.[ -MK1!>#BH^)I[5;-JNJ;&NRG!0#4I9+R0Y/[>XO[BG'CW"3C:8>33%/LUA`W1:L1T"P']IS2H-Z!A].\#:.@;QJAQ;6 -MO?">9__^I\\<6?>C"\>^^2KJCP/%OG'&C3GO`08B;AG0-,%!PP@H-KO2%#AN -MH$R9I0%#/R*^'UKWRGO_\X0__8V)CCKO(3Y8'RS"A -MM,`![G<2S`Q-@B(-!S-U5K@'9I@DV[\-3'&P=GA=$-?]])5_FECWHXO'.Q6* -MDWSOX6T%F/>IC`F($8J=0G$$58!A"-.> -MQ@%U4@?^H)G?N69;_OH5`'%8,?5SI]_37,9Z;4+]R,%D.Z^348S`ZAB:6!D1 -M(0&;[=``I6$9M!@IG=T?Y>9\VUOEP3G+:W2:/GAA`K?&R/*SV8(G5(8(_,K2 -M;EMGI$1!?2^@==[-Q)^8I`WS%Q#H^U_8*@@S*N72BP.,"8.I84\3MZ&(346Z -M-C(%I?E4GQ,:E&]@2BV>`WN`:Z*TYX<[3N_=MF7]T?^1<)Q2X>G7DCD -MG;"M-15+SAQ,X_(^'L3"!RKCY+GN@=V8I<:TE;=T7@H8OA4=LQ`B]]%30DG` -M)2F&'^*7D\>^YG8&(Y?H:0B;83;B,*8J5@'G]XV>%Y">-F;\)D(B/Q!(930;O -MP%!ZR6`+&&HGSJ4^LW-%\$'0YA:M(@"2A)%@3XDQ]6SJ6_)SR"`IK`FS>1Q$ -MMV:5F5#J@@6M-(H)FMA"X;?G2.W$V=3#I*VT/4)=G<>DQ"`LT0+_]('`X2:T -MC!)L*3;#KN%BU.FRRF:^,B=9'&.:7[\50^SGBR\,4X\RTL@;"8;DU?:K\/=Z -M,H,'%.;-2O-07\W[,&L((PE"#H)2>40)[FU*;R[S/179+XJU-("16>:Z`8XX -M5UL$BUCTW:+[]%6?5NSOGNS87'6R$089(0QEA&TJB* -M3:!`00P!B5*MW1>P?`A`QZT(&SBRM!EEJ*'$2R]]6"87[HX$S(J5RM0SI/<1#7D.D4=;B -MC]T^/?/@-E/HP&CBADVA.+'`)[B(<*"Z$13LZH57L@.VFE@FU4+-@BIY`M)F -M8?1+TV!'!6>$]'KO[=.3D],/[A`&M/G5F^3M$]<(;4]]34U(97#6XXI-1JLO -MWC5[,=``]5QIBEA%,LD)K["-+*!(^=KT].`,[]UY[\9TS7'.;Q$]F2,&*\4T[BKA=GV@#-ID -M+M)8YH^#(9!I@<6)[X[-(^5?J7BGBCNF)Z?EF+EMV"1!>._,?8]L",1+\[>V -MM0<67AZV"5"5"*W,Y':&?*!(["M^@-<&I80R9\6>3,]-WWG'' -M']QQQYTSNT()8F:#IJB]&\:)J>E:IV.:T@-`&3E,,E(&]449(./;TG%GH'P/ -M2@(=DBFA5+_WP?N_^A1;:\ -M(>OFK/0WR\6ER*.LI&CJ.X15@*@`RLPH$GF5HN+F;?S\?\OQ[/N@[L`2.V]ZE@G/4^JPPRI-APZ[$ -M?R=NE7;HZTW!IY@BZ9F$V,KR",15-^@DT/GYO_E"?@F?V'?HT*'Q=D79%C[X -M/%>K=9?$C$#$@7"C*.P@Z8QVY)K!*IX/ -M@#*5:V\$QSQK!>2>YZZZ\3-AOKI!(0428DK7T$<@#9V+XOF_Y -MZ4"-H;KPIXK<&EU^='UJ"_&$^U+]@[A_'[%+-6WJ!T#*-B=!DPL=08 -M?B[R)H0M-0NV=HTP4I]]E@M%UAJ^'P+/L)YR<7]SD?N99%X(`KV,XB/_U^7X;]K<^?.C74P!(4>YVP -MDO`CER1RUI0V(U0B0FL^)=C.(<$7=NZ@BG77 -MVSQ<4DG5HL;$#-/VDX7'@C@MRN(*'+/DP("Y/3EO,W5`+U"WX^+2#C)<6*]P -ML<_[:^-4KF0O];+9':!P(*OO_`SH&YPO70RB]EY];#WL(9PUG)[*E9AELG_O -M12489J>)7&]D)7+M'&$%UG2J)%Y/$3C`JO(M^S8"!&KQ/P($=SVX<^?#WP+? -MBBX.$.&<4%M5:D3$G6\6J:H6H2S#LZ@B!!;GAM3\E,D\&:I]P)3I[3)BB*$1 -M%NL?8$XQLD;DY%\%?777%W???=N=#X&_===Q"E'L.&ZR^G7JN^"ICB'4+DRN -MDHZ4N#9X)*V$)/$<47O2_BB-:`:`&*S&1?F;TD[!OW;G],R?[BKL>Q[YRJ-@ -M"7/XG75`[#NK.8Y#5_&+7BE%+H+0&J35U4IU3UI)Y7I5<(QT)6OK/FYQ%'P0 -M!O72W[]M??/KCW$')-U9$-6`-UVV[GQSTG`2-OSVF:%!(.BH#TR]#PE-M -MO.8VX\@!XL\31J"(_P!-@,+(AW=_\9;?_JT;5$9OOP&Q9*"Q1T&" -MAADC&85ABBHGU[J5M*N<1Y[I)8A6KDA]O0V5>TK70H"W&\///3:X_L:;%`=C -M1TE]DLPJG*^[1_?ZT!E/@%D-(.(."`@_#)$/BJUK85OKXU6?HTBJ&FQ)RL!& -M#S(QZH`Y&SS&JRE&5,(Z!W%Y_^`9G4#YT#9RR-$6B=9'\;;Z1#`B.P)E0AN< -M,BG@6UP9Y)KI:_%HRT?&72<%!S2E&H^8`G=(US!3W.OW;[Y,R= -MO*/U?+7#>D9@Z0$Q^'JMYN\,03Z6N9!2C?@JQF[!\T+K]7&6T4[JM-S5'$T* -MV[;&7$DS['F^AUB6L?ZM8/=@W.ASP[IV]UU0"^Z`1)Q8AC\7/XTU"V)N>1T0 -MM;=3UW/+]@H*O:B/L:VV$Y9),K4&>@':3E9>6#17HU2+1U'2;[9$]8'+OD@V -MR_V17U#2T>;BIWYG>OIV'F=!7[6@G,G=GL56PGEG9'2=DA@`W -M>:0:'4%[?KCN,M@:B -MN4L]1RHP%@^_-#E]&R]Z),.^*XHCA@I^B0?$]G,?M6`UGJG53H5BUR^WF>A3 -MP91SM9)Q)-7U=)2\^P"2(&Q)9;@=!UD]44./"9B&.^ZE*J))&Q2:7.;8'\EI-E6E..JK/-4=/6D8G0XSN8:J:,GJ -M/$KYW5^Z;_)+MVP7G1_.)S[DX3`.^<)63HO#?;RN<,42P4@3(.0\)M+`IF0. -M9CBF5^V,H8%5S1A0*#R''P7.+X3O^APXS(]U/Q8'8-.MS -MBV%;"!7"?-O"U+SLAO%1KJ=\:5]Y"*,M=Y%8J#J5#J9618HL]L`NKNF+O([+ -M$L6'J4/RR`3/0P$-Z@QAHJ4,.Z(FJ4,%Q=S.\/1E,.R#4OA<%3CS?/GTKEAT -MZ@AVF-0XJQ9^9G -M+O>@X(F]RWM&SQ+L7X%$>QCH1UXN,*TR3S"AJA@;JY\>!*34F8Y:1^W9T4Y4 -MJ<2($^F=?A/RB$AN;2?6^?R)#T4@EV!\M+@LNIE'Y]ME'Y%T1B5=#NHHCD6%F;K-C9\;PI3<6 -MEB]OB@O&J[J62TGGB,)#;&P@C@P-,>DI,@NEJXK2$?6!;.EV&VQ$9`%JB*V/ -M)SNY6A<%S^*1#P_/B\?QZ`FC@+3+5.$263_!MF+H3V"YX#*#$3MFHQT9XKB8 -M=45Y$'AVH<)LCA,Q(9SV;ZF01X+ -M12J5>-G1Q;)B''1P8.M9E31,09IFC+,F!^;9E$=4X_L%:>E+"[RO%>#@5N'@ -M3!550TD43076I"U:BTPT?JDOB0VCL(.]`:MJC[XIO0-[ROK/&%U^[-_N++TA -MVC:\C:F5BW[JP)1[3M+UE23P):7B1'&#P)9]"8+]P2R2TDF:0I?((#*V^F!- -M;OY(OAX`W6IQD'24@+Y&U18T,]K4?%JVFS-P3U(7:T"D6ND9-B-2$P<1N`X( -MHD>_/-BL0Y9CD8^>0"J8S77)6T(;JG)?FN(X)7HI=,!I$A+5LXI+((N;6=*P -MA?=8!JQ,G?_>7WW]_)9`3(Q*I+>FW)RG3Y8,14A7[CQ[@LP(:[71 -M$UR/L%L&AL==U99-/>J;@<6!/7#65A-,&HWV\)V#>\_=_/5+R;D/!?%J=?#B -M/9T?@.@ZEUM4N"12>Z"!C3YE.>_[#2E`$=,[H=<7U3IMZ9B$N?#,.2V'&H?/ -M?U]IGYWE8B#W(G4KJ,M=NP]F&.D>DP4$[;?7.0^WY'B'I7 -MHT&BB$?TL,,ARVJC=O714Q_AV;.5JK5SB',]=C.+-S)/@WC%YA0+K(X(&N[Y -M//=9K'J4Q758H+8D;@:*,G97!>WQS?W7P=JQ4'WUS6\U"Z6H#WACKBT>E(#B -M`"8K>K1)@7`.*T`[4Q14A/A(1.:KI&LHZ71+88I,TTTS:4@4XYAK*M@/B:XOA]HN;R%L>;YE)+N;TM\V& -MJ&(2H2ZIEPZ2N:))RBT7%NN>T-<@M%;[00OI/2]>.1!3LBBJ/14_\&+MA16N -M1%!XN2$42;D;5&3I@+CF<0313RG+&_I7AXV,?]3+[?9=4S\1+]N$ -M'$\UA7<]W07MCPA"Q%(,G`]7GE?B.7/0!A^??@@Y6WK([3+CQ-65?U55Y`_"S..0#UX.9V\^ -M=>H,+_2-VX)K"%H\E>?TIZ# -MWQ"A20$$_58GEA[YK]_S;U@'+B0[E:H(?:)CAZ1_S9PC94E\I^/)EJE -MI=Y\8->5!W'1.$,462J=EO])]/$B.A0````!)14Y$KD)@@@`` -` -end -- cgit v1.2.3