r13400 - in /packages/unstable/tsclient/debian: ./ patches/
kilian at users.alioth.debian.org
kilian at users.alioth.debian.org
Mon Nov 5 22:21:35 UTC 2007
Author: kilian
Date: Mon Nov 5 22:21:35 2007
New Revision: 13400
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13400
Log:
* New upstream release.
* Remove obsoletes patches. Included upstream.
* Add remote disk mapping support.
[debian/patches/10_remote_disk_mapping.patch] (Closes: #449144)
* Add Clément Hermann to Uploaders.
Added:
packages/unstable/tsclient/debian/harddrive.png.uue
packages/unstable/tsclient/debian/patches/10_remote_disk_mapping.patch
packages/unstable/tsclient/debian/tsclient.install
Removed:
packages/unstable/tsclient/debian/patches/14_spanish-translation-encoding.patch
packages/unstable/tsclient/debian/patches/15_missing-include.patch
packages/unstable/tsclient/debian/patches/99_autogen.patch
Modified:
packages/unstable/tsclient/debian/changelog
packages/unstable/tsclient/debian/control
packages/unstable/tsclient/debian/control.in
packages/unstable/tsclient/debian/menu
packages/unstable/tsclient/debian/rules
Modified: packages/unstable/tsclient/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/tsclient/debian/changelog?rev=13400&op=diff
==============================================================================
--- packages/unstable/tsclient/debian/changelog (original)
+++ packages/unstable/tsclient/debian/changelog Mon Nov 5 22:21:35 2007
@@ -1,4 +1,13 @@
-tsclient (0.148-4) UNRELEASED; urgency=low
+tsclient (0.150-1) UNRELEASED; urgency=low
+
+ [ Clément Hermann ]
+ * New upstream release.
+ * Remove obsoletes patches. Included upstream.
+ [debian/patches/15_missing-include.patch]
+ [debian/patches/14_spanish-translation-encoding.patch]
+ [debian/patches/99_autogen.patch]
+ * Add remote disk mapping support.
+ [debian/patches/10_remote_disk_mapping.patch] (Closes: #449144)
[ Loic Minier ]
* Add a get-orig-source target to retrieve the upstream tarball.
@@ -8,7 +17,10 @@
[ Josselin Mouette ]
* Remove generated files in the clean target. Closes: #442751.
- -- Josselin Mouette <joss at debian.org> Thu, 11 Oct 2007 23:38:54 +0200
+ [ Kilian Krause ]
+ * Add Clément Hermann to Uploaders.
+
+ -- Kilian Krause <kilian at debian.org> Mon, 5 Nov 2007 23:21:04 +0100
tsclient (0.148-3) unstable; urgency=low
Modified: packages/unstable/tsclient/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/tsclient/debian/control?rev=13400&op=diff
==============================================================================
--- packages/unstable/tsclient/debian/control (original)
+++ packages/unstable/tsclient/debian/control Mon Nov 5 22:21:35 2007
@@ -9,7 +9,7 @@
libpanel-applet2-dev (>= 2.0),
sharutils,
libxml-parser-perl
-Uploaders: Andrew Lau <netsnipe at users.sourceforge.net>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>
+Uploaders: Andrew Lau <netsnipe at users.sourceforge.net>, Josselin Mouette <joss at debian.org>, Kilian Krause <kilian at debian.org>, Loic Minier <lool at dooz.org>, Clement 'nodens' Hermann <clement.hermann at free.fr>
Standards-Version: 3.7.2
Package: tsclient
Modified: packages/unstable/tsclient/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/tsclient/debian/control.in?rev=13400&op=diff
==============================================================================
--- packages/unstable/tsclient/debian/control.in (original)
+++ packages/unstable/tsclient/debian/control.in Mon Nov 5 22:21:35 2007
@@ -9,7 +9,7 @@
libpanel-applet2-dev (>= 2.0),
sharutils,
libxml-parser-perl
-Uploaders: @GNOME_TEAM@
+Uploaders: @GNOME_TEAM@, Clement 'nodens' Hermann <clement.hermann at free.fr>
Standards-Version: 3.7.2
Package: tsclient
Added: packages/unstable/tsclient/debian/harddrive.png.uue
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/tsclient/debian/harddrive.png.uue?rev=13400&op=file
==============================================================================
--- packages/unstable/tsclient/debian/harddrive.png.uue (added)
+++ packages/unstable/tsclient/debian/harddrive.png.uue Mon Nov 5 22:21:35 2007
@@ -1,0 +1,88 @@
+begin 644 harddrive.png
+MB5!.1PT*&@H````-24A$4@```#`````O"`8```"E at DG)````!F)+1T0`_P#_
+M`/^@O:>3```.DDE$051XVKV::8R=U7G'?^?=[W[O7,^^V7B\`L8FF.`2H`E;
+M,";&5%5;`4WXF$BE05TBBHB:ME+45O13D1*1JJ)\H*`D*@X%VQ#LXGKWV-C&
+MV!Y[F'VQ9[_[?9=S^N'>N1I;CFWPT",=O;IS=<_[_,__V9\1?'5+N^*SJNY%
+M7>(K.$>K;K'@[PJ0U;VH0&X(P+__XE65+^2_T,&!'_#!!SMY]_T]]57!/<"O
+M[N`Z(&X8H'&-[QS at Q\"+32WM[-SQ+LE$G(N7)FEL6')#STL34P`37^)B?P3\
+M', at O8.RJS%T+P(];6UM?7+]^/8'O,SP\ANNZ3$_/D,_G*9==\OD\$Q/3"`'3
+MTS.7/8>&1Y!2\L at CCY!.IS$,`],T,0P#3=-0JB*+E)(@")!2XOL^GN=Q_/CQ
+M?^SIZ6D&?K*`M:LR=RT54ENV;.%'/_U+\FZ>F=DI;-/&-AQR^2S3L],42 at 4"
+M%2"$0$J)IFGH0D<3.EZYC.=[N+['V.@(IP^=8V7[&FS;1M=UA!`HI5!*T=#0
+M0&MK*^?.G6-P<!"`M]YZ"V`U4`(*U5V^$L2U&,"R+$*.Q?L'WD%*A0PD2BID
+M$!`$BI;E[5SL'T51$48&$M_S\/T`E$((0>`%?':PAX[Z914+US0,PT#7=:24
+M;-RXD1T[=G#BQ`E"H1!U=74,#P_/B[`4R`)3U<\+'<%57=UES%B61<DMT]6Y
+MDK_YT[_C@[=WLW+#&I[?^@(_>/P'/-KY,&8^PK_\\%]YSGJ=IWKF>/7%7Q")
+MQVGKZD0I1<\GO3A$&!H:0 at A1`V":)ILW;V;W[H]X^>67>?#!!]F]>S?1:)1,
+M)C,O1PO0"*2!</7"M86:<TT&#,- at -CO+K4MOH_=O_X)X*L;@N<]1K8I#!_?C
+MN65V?KB3/_RS;?QPSQ3%[`4>_N-O,G-Q at L!SZ?ML"#FK\?WGO\^Q8\?H[NYF
+M[=JUF*;)MJV;*9>+7!P?(0A\SIPY0[E<YMUWWR46B\V+D*S>=K[J5/0O8L1H
+MFD8A7V12F\3ZSE/D7S[*TC5=%(M%-$TP-34!4M&QHI769<V7.<"3!TXS.YBA
+MI:&55UYYA9=>>HD3)TY0EXKSQ.9OT=34P)$#[Y'-3/'L,T\S,CI6,^X@".9%
+M"%=UW[K:[5\+@)@'H.F"D8D1WORW_V3IZG:&/Q_D/P;Z>._]]Y!>@&9I7!R:
+M8&XJ4_$H7D!F.HL[[=/:V(9E6=BVC1""QH8TWWUZ&X8>,#-QCG1=G/ON6<EO
+M]_:02"30=8-2J82FU33;K-ZZMD#=KPM`S%,EA$#3-09&^KCO\4T(0T>@8;3X
+MK+_O=J9&I\G/%!DX/D)8CV`8!H8P:71BZ.UZ3?A"H<"Q[L/\_4_^&IT20Q?V
+M$DB+<Y_N9V1TBE at TPM1T!L_S<!R'<#@\+XM_A=#B1E5(!U!*T;W_.*=Z/D/3
+M=0Q=IY`ODIG.X4Y[A*T(EF43L at PLR\(TS9JOMRRKXL5"(>Z_=P,//_0`(LAP
+M<>0$LU-C'#AREH'1,A<&<V2R!1S'J>A,.$QC8^-"`.J+1&*Q0-=02M%W8A"M
+M8%,L%BD6,P1!P/>^]QQOO/$&NEZYY;:V-IYXX at DZ.CJ(1,(5/X]``5YQ at F2J
+MCKFI7D8^/\C00"]'3DWS^5">\8ELS5G,>ZA$(D%#0\/"E$)\T53B,A7:O'DS
+M+2TM[-JUBP,'#B"$(!:+81@&:]>NY>FGGZ:YN1G/\Q@:'.#"A3G*Y1*>Z].\
+M1&/=AGL8[>^F]^P^#G;W,SXM^.S<&$$07";XZM6K6;]^/7OV["&93/)E<R&Q
+M$("F:=37UW/@P`'V[=N';=L8AH'KNCS__//<>>>=%',%CG<?8V9F!J$)A`:Y
+M7(Z5'6%N6[>)LY_\-T<.[Z-O5#(^*?!]24M+*X5"GFPVBV%41$BE4O3V]C(T
+M-,2F39M8C&0.3=-XYYUWZ.GIH;Z^'L_S`-BP80.M+:V</]?#^?/G\7P/I13E
+M4HG9N5FV/'0KIA7A?W_[.GOWG^+2G$FQI&&9!N&(A>,XW'77UR at 4"IP\>1+?
+M]SETZ!">Y]':VEJSAYL!(.<CL>=YM+6UX?L^4DI>>.$%EBU;QD#O`#,S,]BV
+MC4*1S^>9G)KBC[9TD)TYR:]V='.VWV4NKPB'39:D$S0U-9&J2[-B11>=G9WH
+MNHYA&)PY<X:NKB[:VMJ(1J,((6X*P'R^45,9TS112K%MVS:6=BZE__-^1*!H
+MJ&^HY#NS$J5R?.>;=8R<>HUW]NF<ZC4)A1S:VIKH[%C&K6O6T+EL.8V-]<3C
+M<71=9W)RDH<??HBQL3%"H1"ZKJ/K^A?*NXW?4?9)H$:EE)*FIB:ZEG?1<_8<
+MQ6*1^B7U1,-AW$0"URUCZ8(]_[.?B>P=E+2`KN6*='V:N^_^&EVWK**YN1E1
+M]3)""((@(!Z/T=G9R3//_`EOO_TKRN4RIFD2"H5N"L!\]81IFK7P?M\WOD$V
+MDZ&OOY]H)()E6I!($@J%B,5B9&0#K2N>I-XO5]R`$C2U-+&\JXM8)(92 at F0R
+MP;Q[%D)4`Y9B1==R+$NG6"QBVS:69=V4"M48,$T37==))I.$0F'.?/89GNM2
+MU`0SFD"J@$0T25-C"ZEX"E\$M+0T$XO'`4FQ6,3W/.9F9VEJ;JX)+Z6LU0(R
+M*(/0N/_^!]BUZT/"X?!-&W&M=)NOGM:L64,^GR.;R2"$P'4]%'E08!@FB52"
+MYK8F(M$PFJ;SVFL_X^MW;V35RM5HAL&G)S]A<'"0]1ON`*4(I"((7'3=P@\T
+ME-)H;6UC=G:6=#I--!J]:2^DY@/9O"V,C8Y68WJ%(-_S*)5+^)Z'5))()(00
+ME63Q@?ON!Z&8GIGB9S_[.??>^WMT'SW*Y-0EVMM:B41C1*-Q="-`!@&>YU7R
+M*,. at 4"C at NNY-`Q`+Z09%T2VAFWI%O0$E*VEOOI at G$@N3S69Y_?77N>NN.WGS
+MS;>9GIR at K;V-6V];2RZ;I:&AGNW;?\.SSWX7W;`)@CE,TP`$4@:8EHEE5]RV
+M[_N+`T!*6:UW`WS/8]X]"T`8&D('H8-EF\3B"?[@J:WLV+F#3T^?1JF`WOX^
+M&AJ7<.DB1*-AQL?&R63F$$(13\31](KKK-A#@&-;!%5&%@7`/`M*@A`:NJY=
+MIF4"@0Q`R0`0-#4V`H)BL4`T',*V'3)S.8YV=W/++<OP/)=L+HL3<B at 6B[5D
+M4"J)4F#9-F[9J[+^Y=I_ERW?]ROM#U&Q!],TL&T+)V03#H<)14*$H at Y#0T-,
+M3X[Q#S_])PP-[EAW.Z9EL;2S at V0BQD/?^GT:ZI=@:!J^5\9SW<JY2J%41=AR
+MN8QM.S76;[3Q9ERO,R:EQ+(M(M$H0H`0H&DZMF-A6A:Z)NCKZT/Z/@WI).DE
+M2_CVHP]QZM1I]NS92W-S(RU-C5SH[26>2N*Z'H52@;`;HE at VD$H"@GPN1ZE8
+MK+GN14GFE%+XOH_O!T1C86S'P=!U$`(92#0TG)"-F_+9^<$'K%]W&Z52B7PN
+M3RJ58,6*6T at EXO2</\_(Z"CWWGL?KN]68DFIA&$8R*"B?I<F)LAD,R03J9L.
+M9#4&Y at OLZ:EI&IOKT82.:5I$PF%T7</W`S*9'!WM'?3UM?'6+W]).E6'89 at 8
+MND;(L=BS=R^NZ[&\JPNA"X02(!3%0AZ0F*:%KNL,#0]Q<?P2=:GT0A52-P5`
+MTS2$$)PX<8*GNK:1B"=()"J=CG+98WIJBO:V5K*Y//?<<P^I9(R//OJ0H\=.
+M4,SG,`R+YI8F;K]].:95"8H2B5MV,4T;WP\(_"*Y7)Z!_G[2Z?3BJM!\M93)
+M9)B=F:6UN;62/BM%*!0FD8B3S^=1*,KE`O7U2WCTVX]S]]?O)9/+XI7+N)Z+
+MD@&:8:!I$,@`S_?Q/)<@\+%MA\'!0<Z>[6'EBE58EE4K<FX:P/Q-2"G9M>M#
+M;KEE!89IXCA.C6;;MO%]#]/0B4;C(`R4`MW402G*Y3*E<@G+LE"J8D]2!11+
+M!1S+87ABF%.?GB:5K,.V;1S'P33-Q7&C4DIT7<>V;?+Y'+MV[:@U9:64U1T0
+M!#Z:+HA$HT2C49*I)$O22T at D$Z12*>I2*4*.33@<)1P*8QH&ON]S:7*"X\>.
+M,SYZD60R230:)10*+>P++8X*"2%P'(=CQXX!L'7KUDH`D@&NZ^+[+H9A`4$E
+MDQ2BVKSU*9=<3,N at D"^@Z5K%NC1!-CO)L:/'N'#^<U:M6ET#X#A.K?5^TP""
+M(*BTS*LL!$'`X<.'F9R<Y+'''J.^/HWO>WBN!YJ&89AXGH^N"^R0C>]6DCLE
+M*NFSY[K8MLVEH4L<V'>(@8$A5JY<12J5(IE,$HO%:L7.HJA0$`1T='2P<>-&
+M9F=G"8?#1*-1^OO[>?755]G^SF\8'QM%:`(J at 14A1(4YH55:DYI`$Y7:-Y\O
+ML'__`7[]Z_]B<G**M6O7DDZG:6AH()U.LVK5*OK[^Q<EF:L!F&^K'#QXD"U;
+MMA"-1C%-DUPNQ\=[]W+XR&$Z.]M9M^X.ZM)IPJ$04LG*#@(*A2+#P\.</'62
+M[B/=2*EH;^\@G4X3B\4(A\/$8C&6+EW*P8,'V;=O'T\^^>3B`)B8F+BLK;*P
+MS#0, at V@T2CZ?Y^S9\YP^?1;+JK06/<_%#P)*Q3*%8@&W7$;3=-K;.XG%8L3C
+M<2*1")%(!,=QT'6=[=NWU]XS/CY^PP._:P'XYY,G3_[5NG7KV+1I$X9AU+II
+MIFE6C5ABVS;1:)1BL8CKND at I<9Q057VTFK=22N$X#I%(A%`H5.NESC.]:M4J
+MEB]?SOCX.!]__#'`WJN`4#<Z9A7`.N`YX,_Y_U_[@2/`")"I/ON`L>K(J=;T
+MO18`'8A61SR=U7%/HCILT'[';\050PAUE6;!C?I(";C`'#`*#``7@=S"0=_U
+M8G90G1+FJ@<!V%<`$(M\^VH!@'+UO;D%$\H;3N9DE:K"@BEA_BH,?)4`W*KP
+MT]5W^U>R:%SG(*\*@"H3SL+YP5>\YB]PX9S8^R*#[H6V8"S8VE?T#R-7<YOR
+9>I/Z_P.)[*QRC,]%IP````!)14Y$KD)@@@``
+`
+end
Modified: packages/unstable/tsclient/debian/menu
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/tsclient/debian/menu?rev=13400&op=diff
==============================================================================
--- packages/unstable/tsclient/debian/menu (original)
+++ packages/unstable/tsclient/debian/menu Mon Nov 5 22:21:35 2007
@@ -1,9 +1,9 @@
-?package(tsclient): \
- needs="X11" \
- section="Apps/Net" \
- title="Terminal Server Client" \
- command="/usr/bin/tsclient -f" \
- hints="Remote Desktop" \
- icon="/usr/share/pixmaps/tsclient.xpm" \
- longtitle="Terminal Server Client" \
+?package(tsclient): \
+ needs="X11" \
+ section="Applications/Network/Communication" \
+ title="Terminal Server Client" \
+ command="/usr/bin/tsclient -f" \
+ hints="Remote Desktop" \
+ icon="/usr/share/pixmaps/tsclient.xpm" \
+ longtitle="Terminal Server Client" \
description="Connect to a remote computer"
Added: packages/unstable/tsclient/debian/patches/10_remote_disk_mapping.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/tsclient/debian/patches/10_remote_disk_mapping.patch?rev=13400&op=file
==============================================================================
--- packages/unstable/tsclient/debian/patches/10_remote_disk_mapping.patch (added)
+++ packages/unstable/tsclient/debian/patches/10_remote_disk_mapping.patch Mon Nov 5 22:21:35 2007
@@ -1,0 +1,265 @@
+diff -Nur tsclient-0.150/src/connect.c tsclient-0.150.new/src/connect.c
+--- tsclient-0.150/src/connect.c 2007-04-11 20:15:35.000000000 +0200
++++ tsclient-0.150.new/src/connect.c 2007-11-05 12:34:23.135581391 +0100
+@@ -175,6 +175,16 @@
+ GtkWidget *cboKeyboardLang;
+ GtkWidget *txtKeyboardLang;
+
++ // Drive mapping
++ GtkWidget *chkDiskMapping;
++
++ // Drive mapping Widgets
++ GtkWidget *frameDrive;
++ GtkWidget *lblDriveFrame;
++ GtkWidget *tblDrive;
++ GtkWidget *imgDrive;
++ GtkWidget *vbxDrive;
++
+ // Program Tab Widgets
+ GtkWidget *lblProgramsTab1;
+
+@@ -191,6 +201,7 @@
+
+ // Performance Tab Widgets
+ GtkWidget *lblPerformanceTab1;
++ GtkWidget *vbxPerformanceTab1;
+
+ // Performance Frame Widgets
+ GtkWidget *framePerform;
+@@ -689,7 +700,6 @@
+
+ gtk_option_menu_set_menu (GTK_OPTION_MENU (optKeyboard), mnuKeyboard);
+
+-
+ lblKeyboardLang = gtk_label_new (_("Use the following keyboard language\n(2 char keycode)"));
+ gtk_table_attach (GTK_TABLE (tblKeyboard), lblKeyboardLang, 1, 2, 2, 3,
+ (GtkAttachOptions) (GTK_FILL),
+@@ -777,9 +787,15 @@
+ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+ (GtkAttachOptions) (GTK_FILL), 0, 0);
+
++ // Last tab (Performance)
++ vbxPerformanceTab1 = gtk_vbox_new (FALSE, 0);
++ gtk_container_add (GTK_CONTAINER (nbkComplete), vbxPerformanceTab1);
++ gtk_notebook_set_tab_label_packing (GTK_NOTEBOOK (nbkComplete), vbxPerformanceTab1,
++ TRUE, TRUE, GTK_PACK_START);
++
+
+ framePerform = gtk_frame_new (NULL);
+- gtk_container_add (GTK_CONTAINER (nbkComplete), framePerform);
++ gtk_container_add (GTK_CONTAINER (vbxPerformanceTab1), framePerform);
+ gtk_notebook_set_tab_label_packing (GTK_NOTEBOOK (nbkComplete), framePerform,
+ TRUE, TRUE, GTK_PACK_START);
+ gtk_container_set_border_width (GTK_CONTAINER (framePerform), 3);
+@@ -840,6 +856,37 @@
+ gtk_label_set_line_wrap (GTK_LABEL (lblPerformanceOptions), TRUE);
+ gtk_misc_set_alignment (GTK_MISC (lblPerformanceOptions), 0, 0.5);
+
++
++ frameDrive = gtk_frame_new (NULL);
++ // Add the new frame to the Local ressource tab
++ gtk_box_pack_start (GTK_BOX (vbxLocalTab1), frameDrive, TRUE, TRUE, 0);
++ gtk_container_set_border_width (GTK_CONTAINER (frameDrive), 3);
++ gtk_frame_set_shadow_type (GTK_FRAME (frameDrive), GTK_SHADOW_NONE);
++
++ lblDriveFrame = gtk_label_new_with_mnemonic (_("Remotely map your disk drive"));
++ gtk_label_set_markup (GTK_LABEL (lblDriveFrame), g_strconcat ("<span weight=\"bold\">", _("Remotely map your disk drive"), "</span>", NULL));
++ gtk_frame_set_label_widget (GTK_FRAME (frameDrive), lblDriveFrame);
++ gtk_label_set_justify (GTK_LABEL (lblDriveFrame), GTK_JUSTIFY_LEFT);
++
++ tblDrive = gtk_table_new (1, 2, FALSE);
++ gtk_container_add (GTK_CONTAINER (frameDrive), tblDrive);
++ gtk_table_set_col_spacings (GTK_TABLE (tblDrive), 6);
++
++ imgDrive = create_pixmap (frmConnect, "harddrive.png");
++ gtk_misc_set_padding (GTK_MISC (imgDrive), 3, 3);
++ gtk_table_attach (GTK_TABLE (tblDrive), imgDrive, 0, 1, 0, 1,
++ (GtkAttachOptions) (GTK_FILL),
++ (GtkAttachOptions) 0, 0, 0);
++
++ vbxDrive = gtk_vbox_new (FALSE, 0);
++ gtk_table_attach (GTK_TABLE (tblDrive), vbxDrive, 1, 2, 0, 2,
++ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
++ (GtkAttachOptions) (0), 0, 0);
++
++ chkDiskMapping = gtk_check_button_new_with_mnemonic (_("Add my local drive to the remote computer"));
++ gtk_box_pack_start (GTK_BOX (vbxDrive), chkDiskMapping, FALSE, FALSE, 0);
++
++
+ /*
+ These are the labels for the notebook control
+ */
+@@ -1090,6 +1137,8 @@
+ HOOKUP_OBJECT (frmConnect, txtKeyboardLang, "txtKeyboardLang");
+ HOOKUP_OBJECT (frmConnect, imgKeyboard, "imgKeyboard");
+
++ // Drive mapping
++ HOOKUP_OBJECT (frmConnect, chkDiskMapping, "chkDiskMapping");
+
+ // Program Tab Widgets
+ HOOKUP_OBJECT (frmConnect, lblProgramsTab1, "lblProgramsTab1");
+diff -Nur tsclient-0.150/src/rdpfile.c tsclient-0.150.new/src/rdpfile.c
+--- tsclient-0.150/src/rdpfile.c 2007-04-11 17:41:39.000000000 +0200
++++ tsclient-0.150.new/src/rdpfile.c 2007-11-05 12:34:23.135581391 +0100
+@@ -39,6 +39,7 @@
+ rdp->attach_to_console = 0;
+ rdp->audiomode = 0;
+ rdp->auto_connect = 0;
++ rdp->diskmapping = 0;
+ rdp->bitmapcachepersistenable = 0;
+ rdp->client_hostname = "";
+ rdp->compression = 0;
+@@ -195,6 +196,7 @@
+ buffer = g_strconcat (buffer, "attach to console:i:", g_strdup_printf("%d",rdp->attach_to_console), "\r\n", NULL);
+ buffer = g_strconcat (buffer, "audiomode:i:", g_strdup_printf("%d",rdp->audiomode), "\r\n", NULL);
+ buffer = g_strconcat (buffer, "auto connect:i:", g_strdup_printf("%d",rdp->auto_connect), "\r\n", NULL);
++ buffer = g_strconcat (buffer, "diskmapping:i:", g_strdup_printf("%d",rdp->diskmapping), "\r\n", NULL);
+ buffer = g_strconcat (buffer, "bitmapcachepersistenable:i:", g_strdup_printf("%d",rdp->bitmapcachepersistenable), "\r\n", NULL);
+ buffer = g_strconcat (buffer, "client hostname:s:", rdp->client_hostname, "\r\n", NULL);
+ buffer = g_strconcat (buffer, "compression:i:", g_strdup_printf("%d",rdp->compression), "\r\n", NULL);
+@@ -395,7 +397,6 @@
+ gtk_editable_delete_text ((GtkEditable*) widget, 0, -1);
+ gtk_editable_insert_text((GtkEditable*) widget, (gchar *)rdp->keyboard_language, strlen(rdp->keyboard_language), &pos);
+
+-
+ widget = lookup_widget (main_window, "chkStartProgram");
+ if (rdp->enable_alternate_shell == 1)
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
+@@ -421,6 +422,7 @@
+ }
+
+ // the checkboxes on the performance frame
++
+ widget = lookup_widget (main_window, "chkBitmapCache");
+ if (rdp->bitmapcachepersistenable == 1)
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
+@@ -509,6 +511,12 @@
+ gtk_option_menu_set_history (GTK_OPTION_MENU(widget), 0);
+ break;
+ } */
++
++ widget = lookup_widget (main_window, "chkDiskMapping");
++ if (rdp->diskmapping == 1)
++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
++ else
++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE);
+
+ tsc_set_protocol_widgets (main_window, rdp->protocol);
+
+@@ -700,6 +708,11 @@
+ value = gtk_editable_get_chars ((GtkEditable*) widget, 0, -1);
+ if (value) rdp->shell_working_directory = value;
+
++ widget = lookup_widget (main_window, "chkDiskMapping");
++ if (gtk_toggle_button_get_active ((GtkToggleButton*)widget))
++ rdp->diskmapping = 1;
++ else
++ rdp->diskmapping = 0;
+
+ widget = lookup_widget (main_window, "chkBitmapCache");
+ if (!gtk_toggle_button_get_active ((GtkToggleButton*)widget))
+@@ -707,7 +720,6 @@
+ else
+ rdp->bitmapcachepersistenable = 0;
+
+-
+ widget = lookup_widget (main_window, "chkDesktopBackground");
+ if (!gtk_toggle_button_get_active ((GtkToggleButton*)widget))
+ rdp->disable_wallpaper = 1;
+@@ -814,6 +826,11 @@
+ if (strcmp(key, "auto connect") == 0) {
+ rdp->auto_connect = atoi(value);
+ }
++
++ if (strcmp(key, "diskmapping") == 0) {
++ rdp->diskmapping = atoi(value);
++ }
++
+ if (strcmp(key, "bitmapcachepersistenable") == 0) {
+ rdp->bitmapcachepersistenable = atoi(value);
+ }
+diff -Nur tsclient-0.150/src/rdpfile.h tsclient-0.150.new/src/rdpfile.h
+--- tsclient-0.150/src/rdpfile.h 2007-04-11 17:19:49.000000000 +0200
++++ tsclient-0.150.new/src/rdpfile.h 2007-11-05 12:34:23.135581391 +0100
+@@ -23,6 +23,7 @@
+ int attach_to_console;
+ int audiomode;
+ int auto_connect;
++ int diskmapping;
+ int bitmapcachepersistenable;
+ char *client_hostname;
+ int compression;
+diff -Nur tsclient-0.150/src/support.c tsclient-0.150.new/src/support.c
+--- tsclient-0.150/src/support.c 2007-04-19 22:49:22.000000000 +0200
++++ tsclient-0.150.new/src/support.c 2007-11-05 12:34:23.135581391 +0100
+@@ -376,7 +376,7 @@
+ sprintf(buffer, cmd);
+ c_argv[c_argc++] = g_strdup (buffer);
+
+- sprintf(buffer, "-T%s - %s", rdp->full_address, _("Terminal Server Client"));
++ sprintf(buffer, "-T\'%s - %s\'", rdp->full_address, _("Terminal Server Client"));
+ c_argv[c_argc++] = g_strdup (buffer);
+
+ // full window mode - use all opts
+@@ -459,20 +459,26 @@
+
+ // Extra Options
+ if (rdp->audiomode == 0) {
+- sprintf(buffer, "-rsound:local");
++ sprintf(buffer, "-rsound:local");
++ c_argv[c_argc++] = g_strdup (buffer);
++ } else if (rdp->audiomode == 1) {
++ sprintf(buffer, "-rsound:remote");
++ c_argv[c_argc++] = g_strdup (buffer);
++ } else {
++ sprintf(buffer, "-rsound:off");
+ c_argv[c_argc++] = g_strdup (buffer);
+- } else if (rdp->audiomode == 1) {
+- sprintf(buffer, "-rsound:remote");
+- c_argv[c_argc++] = g_strdup (buffer);
+- } else {
+- sprintf(buffer, "-rsound:off");
+- c_argv[c_argc++] = g_strdup (buffer);
+ }
+
+ /* clipboard feature, rdesktop 1.5 */
+ sprintf(buffer, "-rclipboard:PRIMARYCLIPBOARD");
+ c_argv[c_argc++] = g_strdup (buffer);
+
++ // disk mapping
++ if (rdp->diskmapping == 1) {
++ sprintf(buffer, "-rdisk:Local=/");
++ c_argv[c_argc++] = g_strdup (buffer);
++ }
++
+ if (rdp->bitmapcachepersistenable == 1) {
+ sprintf(buffer, "-b");
+ c_argv[c_argc++] = g_strdup (buffer);
+@@ -517,11 +523,17 @@
+ c_argv[c_argc++] = g_strdup (rdp->shell_working_directory);
+ }
+ }
+-
+- if (rdp->protocol == 0) {
++
++ // If RDP protocol is asked without disk mapping => protocol 4
++ if (rdp->protocol == 0 && rdp->diskmapping == 0) {
+ sprintf (buffer, "-4");
+ c_argv[c_argc++] = g_strdup (buffer);
+ }
++ // but if disk mapping is asked => protocol 5
++ else {
++ sprintf (buffer, "-5");
++ c_argv[c_argc++] = g_strdup (buffer);
++ }
+
+ // do this shit for all modes
+ sprintf(buffer, "%s", (char*)g_strescape(rdp->full_address, NULL));
+@@ -1024,6 +1036,7 @@
+ "Erick Woods <erick at gnomepro.com>",
+ "Kyle Davis <kyle at gnomeuser.org>",
+ "Jonh Wendell <wendell at bani.com.br>",
++ "Benoit Poulet <discom at nebuleuse.org>",
+ NULL };
+
+ const gchar *artists[] = {
Modified: packages/unstable/tsclient/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/tsclient/debian/rules?rev=13400&op=diff
==============================================================================
--- packages/unstable/tsclient/debian/rules (original)
+++ packages/unstable/tsclient/debian/rules Mon Nov 5 22:21:35 2007
@@ -8,20 +8,22 @@
# $Id$
# ====================================================================
-GNOME_DOWNLOAD_URL = http://www.gnomepro.com/tsclient/$(GNOME_TARBALL)
-
# CDBS Classes & Rules
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
--include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-
-# Debhelper Arguments
-DEB_DH_INSTALL_ARGS := debian/tsclient.xpm usr/share/pixmaps/
+-include /usr/share/gnome-pkg-tools/1/rules/sf-get-source.mk
# Compilation options
DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-O1 -Wl,--as-needed"
+build/tsclient::
+ uudecode -o debian/harddrive.png debian/harddrive.png.uue
+
+# clean .png
+cleanbuilddir/tsclient::
+ rm -f debian/harddrive.png
+
clean::
rm -f po/*.gmo po/stamp-it
Added: packages/unstable/tsclient/debian/tsclient.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/tsclient/debian/tsclient.install?rev=13400&op=file
==============================================================================
--- packages/unstable/tsclient/debian/tsclient.install (added)
+++ packages/unstable/tsclient/debian/tsclient.install Mon Nov 5 22:21:35 2007
@@ -1,0 +1,2 @@
+debian/harddrive.png usr/share/pixmaps/tsclient/
+debian/tsclient.xpm usr/share/pixmaps/
More information about the pkg-gnome-commits
mailing list