Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/net
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25149

Modified Files:
        unison.info unison.patch 
Log Message:
OK for 10.3


Index: unison.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/net/unison.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- unison.patch        6 Sep 2005 17:49:51 -0000       1.3
+++ unison.patch        8 Sep 2005 19:49:03 -0000       1.4
@@ -1,6 +1,6 @@
 diff -u -aruN unison.orig/unison-2.10.2/Makefile.OCaml 
unison/unison-2.10.2/Makefile.OCaml
 --- unison.orig/unison-2.10.2/Makefile.OCaml   2004-09-06 12:15:46.000000000 
-0700
-+++ unison/unison-2.10.2/Makefile.OCaml        2005-08-29 20:28:48.000000000 
-0700
++++ unison/unison-2.10.2/Makefile.OCaml        2005-09-06 09:00:16.000000000 
-0700
 @@ -25,7 +25,7 @@
  
  ifeq (${OSCOMP},cygwingnuc) # Define this if compiling with Cygwin GNU C
@@ -106,7 +106,7 @@
  
 diff -u -aruN unison.orig/unison-2.10.2/copy.ml unison/unison-2.10.2/copy.ml
 --- unison.orig/unison-2.10.2/copy.ml  2004-09-06 12:15:47.000000000 -0700
-+++ unison/unison-2.10.2/copy.ml       2005-08-29 20:27:41.000000000 -0700
++++ unison/unison-2.10.2/copy.ml       2005-09-06 09:00:16.000000000 -0700
 @@ -10,14 +10,16 @@
  
  let openFileIn fspath path kind =
@@ -187,7 +187,7 @@
  
 diff -u -aruN unison.orig/unison-2.10.2/files.ml unison/unison-2.10.2/files.ml
 --- unison.orig/unison-2.10.2/files.ml 2004-09-06 12:15:46.000000000 -0700
-+++ unison/unison-2.10.2/files.ml      2005-08-29 20:27:41.000000000 -0700
++++ unison/unison-2.10.2/files.ml      2005-09-06 09:00:16.000000000 -0700
 @@ -356,18 +356,20 @@
            debug (fun() -> Util.msg "Creating directory %s/%s\n"
              (root2string rootTo) (Path.toString pTo));
@@ -254,7 +254,7 @@
             (Fspath.concat workingDir realPath);
 diff -u -aruN unison.orig/unison-2.10.2/fingerprint.ml 
unison/unison-2.10.2/fingerprint.ml
 --- unison.orig/unison-2.10.2/fingerprint.ml   2004-09-06 12:15:47.000000000 
-0700
-+++ unison/unison-2.10.2/fingerprint.ml        2005-08-29 20:27:41.000000000 
-0700
++++ unison/unison-2.10.2/fingerprint.ml        2005-09-06 09:00:16.000000000 
-0700
 @@ -22,7 +22,7 @@
    Util.convertUnixErrorsToTransient
      "digesting subfile"
@@ -266,7 +266,7 @@
           let res = Digest.channel inch (Uutil.Filesize.toInt len) in
 diff -u -aruN unison.orig/unison-2.10.2/os.ml unison/unison-2.10.2/os.ml
 --- unison.orig/unison-2.10.2/os.ml    2004-09-06 12:15:46.000000000 -0700
-+++ unison/unison-2.10.2/os.ml 2005-08-29 20:27:41.000000000 -0700
++++ unison/unison-2.10.2/os.ml 2005-09-06 09:00:16.000000000 -0700
 @@ -150,10 +150,23 @@
          loop newChildren directory
        in
@@ -320,7 +320,7 @@
               let pathDouble = Osx.appleDoubleFile fspath path in
 diff -u -aruN unison.orig/unison-2.10.2/osxsupport.c 
unison/unison-2.10.2/osxsupport.c
 --- unison.orig/unison-2.10.2/osxsupport.c     2004-09-06 12:15:47.000000000 
-0700
-+++ unison/unison-2.10.2/osxsupport.c  2005-08-29 20:28:48.000000000 -0700
++++ unison/unison-2.10.2/osxsupport.c  2005-09-06 09:00:16.000000000 -0700
 @@ -6,6 +6,8 @@
  #include <caml/alloc.h>
  #include <caml/memory.h>
@@ -353,7 +353,7 @@
    CAMLreturn (Val_unit);
 diff -u -aruN unison.orig/unison-2.10.2/props.ml unison/unison-2.10.2/props.ml
 --- unison.orig/unison-2.10.2/props.ml 2004-09-06 12:15:46.000000000 -0700
-+++ unison/unison-2.10.2/props.ml      2005-08-29 20:27:41.000000000 -0700
++++ unison/unison-2.10.2/props.ml      2005-09-06 09:00:16.000000000 -0700
 @@ -421,7 +421,7 @@
  
  let iCanWrite p =
@@ -377,7 +377,7 @@
    Perm.init someHostIsRunningWindows;
 diff -u -aruN unison.orig/unison-2.10.2/recon.ml unison/unison-2.10.2/recon.ml
 --- unison.orig/unison-2.10.2/recon.ml 2004-09-06 12:15:46.000000000 -0700
-+++ unison/unison-2.10.2/recon.ml      2005-08-29 20:27:41.000000000 -0700
++++ unison/unison-2.10.2/recon.ml      2005-09-06 09:00:16.000000000 -0700
 @@ -30,6 +30,10 @@
              d := Replica1ToReplica2
            else
@@ -391,7 +391,7 @@
        ()
 diff -u -aruN unison.orig/unison-2.10.2/transport.ml 
unison/unison-2.10.2/transport.ml
 --- unison.orig/unison-2.10.2/transport.ml     2004-09-06 12:15:46.000000000 
-0700
-+++ unison/unison-2.10.2/transport.ml  2005-08-29 20:27:41.000000000 -0700
++++ unison/unison-2.10.2/transport.ml  2005-09-06 09:00:16.000000000 -0700
 @@ -15,7 +15,8 @@
    match uiFrom, uiTo with
      _, Updates (File (props, ContentsUpdated (_, _, ress)), _) ->
@@ -404,7 +404,7 @@
        assert false
 diff -u -aruN unison.orig/unison-2.10.2/ubase/util.ml 
unison/unison-2.10.2/ubase/util.ml
 --- unison.orig/unison-2.10.2/ubase/util.ml    2004-09-06 12:15:47.000000000 
-0700
-+++ unison/unison-2.10.2/ubase/util.ml 2005-08-29 20:27:41.000000000 -0700
++++ unison/unison-2.10.2/ubase/util.ml 2005-09-06 09:00:16.000000000 -0700
 @@ -244,14 +244,18 @@
    convertUnixErrorsToTransient "time" Unix.time
  
@@ -468,7 +468,7 @@
  (*           "Upcall" for building pathnames in the .unison dir              
*)
 diff -u -aruN unison.orig/unison-2.10.2/uicommon.ml 
unison/unison-2.10.2/uicommon.ml
 --- unison.orig/unison-2.10.2/uicommon.ml      2004-09-06 12:15:46.000000000 
-0700
-+++ unison/unison-2.10.2/uicommon.ml   2005-08-29 20:27:41.000000000 -0700
++++ unison/unison-2.10.2/uicommon.ml   2005-09-06 09:00:16.000000000 -0700
 @@ -268,26 +268,28 @@
      | c ->
          buf.[!pos] <- c; pos := !pos + 1
@@ -508,7 +508,7 @@
    if theRegExp = "Path " then
 diff -u -aruN unison.orig/unison-2.10.2/uigtk.ml unison/unison-2.10.2/uigtk.ml
 --- unison.orig/unison-2.10.2/uigtk.ml 2004-09-06 12:15:46.000000000 -0700
-+++ unison/unison-2.10.2/uigtk.ml      2005-08-29 20:27:41.000000000 -0700
++++ unison/unison-2.10.2/uigtk.ml      2005-09-06 09:00:16.000000000 -0700
 @@ -1606,7 +1606,7 @@
                    catch (fun () ->
                             Transport.transportItem
@@ -537,7 +537,7 @@
     *********************************************************************)
 diff -u -aruN unison.orig/unison-2.10.2/uigtk2.ml 
unison/unison-2.10.2/uigtk2.ml
 --- unison.orig/unison-2.10.2/uigtk2.ml        2004-09-06 12:15:46.000000000 
-0700
-+++ unison/unison-2.10.2/uigtk2.ml     2005-08-29 20:27:41.000000000 -0700
++++ unison/unison-2.10.2/uigtk2.ml     2005-09-06 09:00:16.000000000 -0700
 @@ -745,8 +745,7 @@
      match Uicommon.sshParse s with
        Uicommon.Password account -> getPassword account
@@ -550,7 +550,7 @@
  
 diff -u -aruN unison.orig/unison-2.10.2/uitext.ml 
unison/unison-2.10.2/uitext.ml
 --- unison.orig/unison-2.10.2/uitext.ml        2004-09-06 12:15:46.000000000 
-0700
-+++ unison/unison-2.10.2/uitext.ml     2005-08-29 20:27:41.000000000 -0700
++++ unison/unison-2.10.2/uitext.ml     2005-09-06 09:00:16.000000000 -0700
 @@ -423,6 +423,8 @@
                   (["n";"q";"x"],
                      ("Exit"),
@@ -562,7 +562,7 @@
                  (fun()-> display  "Press return to continue.")
 diff -u -aruN unison.orig/unison-2.10.2/update.ml 
unison/unison-2.10.2/update.ml
 --- unison.orig/unison-2.10.2/update.ml        2004-09-06 12:15:46.000000000 
-0700
-+++ unison/unison-2.10.2/update.ml     2005-08-29 20:27:41.000000000 -0700
++++ unison/unison-2.10.2/update.ml     2005-09-06 09:00:16.000000000 -0700
 @@ -347,13 +347,25 @@
       let fto = Fspath.toString (Os.fileInUnisonDir toname) in
       debug (fun() -> Util.msg "Copying archive %s to %s\n" ffrom fto);
@@ -643,7 +643,7 @@
  (* for the given path, find the archive and compute the list of update
 diff -u -aruN unison.orig/unison-2.10.2/uutil.ml unison/unison-2.10.2/uutil.ml
 --- unison.orig/unison-2.10.2/uutil.ml 2004-09-06 12:15:47.000000000 -0700
-+++ unison/unison-2.10.2/uutil.ml      2005-08-29 20:27:41.000000000 -0700
++++ unison/unison-2.10.2/uutil.ml      2005-09-06 09:00:16.000000000 -0700
 @@ -83,7 +83,7 @@
  (*               Copy bytes from one file_desc to another                    
*)
  
(*****************************************************************************)
@@ -655,7 +655,7 @@
  
 diff -u -aruN unison.orig/unison-2.13.16/Makefile.OCaml 
unison/unison-2.13.16/Makefile.OCaml
 --- unison.orig/unison-2.13.16/Makefile.OCaml  2005-06-27 10:38:25.000000000 
-0700
-+++ unison/unison-2.13.16/Makefile.OCaml       2005-08-29 20:28:48.000000000 
-0700
++++ unison/unison-2.13.16/Makefile.OCaml       2005-09-06 09:00:16.000000000 
-0700
 @@ -143,7 +143,7 @@
  # NOTE: the OCAMLLIBDIR is not getting passed correctly?
  macexecutable: $(NAME)-blob.o
@@ -667,7 +667,7 @@
  # File extensions will be substituted for the native code version
 diff -u -aruN 
unison.orig/unison-2.13.16/uimac/English.lproj/MainMenu.nib/classes.nib 
unison/unison-2.13.16/uimac/English.lproj/MainMenu.nib/classes.nib
 --- unison.orig/unison-2.13.16/uimac/English.lproj/MainMenu.nib/classes.nib    
2005-03-18 15:33:18.000000000 -0800
-+++ unison/unison-2.13.16/uimac/English.lproj/MainMenu.nib/classes.nib 
2005-08-31 16:46:32.000000000 -0700
++++ unison/unison-2.13.16/uimac/English.lproj/MainMenu.nib/classes.nib 
2005-09-06 09:01:00.000000000 -0700
 @@ -45,7 +45,11 @@
                  preferencesController = PreferencesController; 
                  preferencesView = NSView; 
@@ -682,7 +682,7 @@
                  updatesView = NSView; 
 diff -u -aruN 
unison.orig/unison-2.13.16/uimac/English.lproj/MainMenu.nib/info.nib 
unison/unison-2.13.16/uimac/English.lproj/MainMenu.nib/info.nib
 --- unison.orig/unison-2.13.16/uimac/English.lproj/MainMenu.nib/info.nib       
2005-03-21 12:22:18.000000000 -0800
-+++ unison/unison-2.13.16/uimac/English.lproj/MainMenu.nib/info.nib    
2005-08-31 16:46:32.000000000 -0700
++++ unison/unison-2.13.16/uimac/English.lproj/MainMenu.nib/info.nib    
2005-09-06 09:01:00.000000000 -0700
 @@ -3,34 +3,34 @@
  <plist version="1.0">
  <dict>
@@ -696,7 +696,7 @@
 +              <string>320 335 383 326 0 0 1024 746 </string>
                <key>198</key>
 -              <string>307 297 669 515 0 0 1280 832 </string>
-+              <string>423 231 669 515 0 0 1024 746 </string>
++              <string>177 221 669 515 0 0 1024 746 </string>
                <key>29</key>
 -              <string>72 209 280 44 0 0 1280 832 </string>
 +              <string>-23 199 294 44 0 0 1024 746 </string>
@@ -713,17 +713,17 @@
        <key>IBOpenObjects</key>
        <array>
 -              <integer>423</integer>
-               <integer>198</integer>
-               <integer>29</integer>
--              <integer>402</integer>
+-              <integer>198</integer>
+-              <integer>29</integer>
+               <integer>402</integer>
 -              <integer>234</integer>
++              <integer>29</integer>
++              <integer>198</integer>
                <integer>21</integer>
--              <integer>307</integer>
-+              <integer>423</integer>
-+              <integer>234</integer>
-+              <integer>402</integer>
+               <integer>307</integer>
                <integer>197</integer>
-+              <integer>307</integer>
++              <integer>234</integer>
++              <integer>423</integer>
        </array>
        <key>IBSystem Version</key>
 -      <string>7U16</string>
@@ -732,21 +732,19 @@
  </plist>
 diff -u -aruN 
unison.orig/unison-2.13.16/uimac/English.lproj/MainMenu.nib/objects.nib 
unison/unison-2.13.16/uimac/English.lproj/MainMenu.nib/objects.nib
 --- unison.orig/unison-2.13.16/uimac/English.lproj/MainMenu.nib/objects.nib    
2005-03-21 12:22:18.000000000 -0800
-+++ unison/unison-2.13.16/uimac/English.lproj/MainMenu.nib/objects.nib 
2005-08-31 16:46:32.000000000 -0700
-@@ -1,49 +1,45 @@
++++ unison/unison-2.13.16/uimac/English.lproj/MainMenu.nib/objects.nib 
2005-09-06 09:01:00.000000000 -0700
+@@ -1,49 +1,53 @@
 [EMAIL PROTECTED])”„@@„„„NSMutableString„„NSString”„+
NSApplication†…†„if–„„„
NSTableColumn)[EMAIL 
PROTECTED]@@cc„™™profiles†ƒC—½ƒB=ès脄„NSTableHeaderCell„„NSTextFieldCell>„„

NSActionCell„„NSCellA”„ii‚þ„@@@@„™™Profiles†„„„NSFont”š$„[36c]þÿLucidaGrande„f„c¦¦¦
†……„i:…’…’…„c@@„„„NSColor”¦„ffƒ>ªªŸ†„¦¦„@@@[EMAIL PROTECTED]
[EMAIL PROTECTED]       NSControl)„„NSView)„„NSResponder”’„„„
 -NSClipView:²’„„„NSScrollViewâ²’„„„NSCustomView)²’…š„
@@@@ffffffff„„„NSMutableArray„„NSArray”š’„„„NSTextField±’¸š‚
 -µ…………#Ü#,#,[EMAIL PROTECTED]@¢„™™?Welcome to Unison!
[EMAIL PROTECTED])”„@@„„„NSMutableString„„NSString”„+
NSApplication†…†„if–„„„NSTextField„„ 
NSControl)„„NSView)„„NSResponder”’„’„„„NSBox*’„„„NSCustomView)’…š„
@@@@ffffffff„„„NSMutableArray„„NSArray”š’ ’„¡’¢š‚¡„¥š’„’§š¡„¥š’„„„NSMatrix>œ’©š‚€¡…………
'F&F&[EMAIL PROTECTED]:::ffffi@@@@@„„
NSActionCell„„NSCellA”………F‚D(„¥š’„„„
NSButtonCell?­„ii‚„þ„@@@@„™™Remote†„„„NSFont”š$„[36c]þÿLucidaGrande„f
„c¯¯¯†……„i:…’…’«„        
ssii@@@@@È‚H<Qÿ„˜™†µ…„„„NSButtonImageSource”’„™™
NSRadioButton††…†’„±ª‚þ«„™™Local†³……°…’…’«±È‚H<Qÿµµ…¶…††„„„NSColor”¯„@@@„™™System†„™™

controlColor†„¼¯„ffƒ?*ª«††„¼¯µ†³„±ª‚þ«„™™Radio†³……°…’…’…±K‚H8Qÿ…„™™†…¶…†’…’…’°†’„›’©š‚€¡…………j:%%’©’…’…’…¥„„„NSTextFieldCell>[EMAIL
 PROTECTED]:†³……°…’…’Ä„c@@»„¼¯´½„™™controlTextColor†„¼¯µ†††’…„:[EMAIL 
PROTECTED]    textColor†Ê††’…¸…†’„›’©š‚€¡…………ö:&&[EMAIL 
PROTECTED]:[EMAIL PROTECTED]@«„™™File:[EMAIL 
PROTECTED]<·j·j’¢’…’…’…„ff@@ccc„ƪ‚þ«„™™Second 
root†³……°…’…’…·Í„¼¯µƒ?LÌ͆†©’…†’„„„NSButtonœ’¢š‚!€¡…………}T T 
[EMAIL PROTECTED]
 ˜™†„˜™†…„´š„[28c]þÿHelvetica®
¯¯¯¯†…††’„ß’¢š‚!€¡…………)T T [EMAIL PROTECTED][EMAIL PROTECTED]
Profile name:†³……°…’…’귻Ȇ’…¸…†’„›’¢š‚
[EMAIL PROTECTED]"߁"’…’…’…’…–„˜™NSView†„™™NSResponder††š‚
-+¡„¥š’Ÿ†………­·G·G’¢’…’…’…¹„ƪ‚þ«„™™
-+First [EMAIL PROTECTED]@«„™™File:
-+†³……°…’…’š·»È†’…¸…†Ÿ–„ß’„£’…š¡„¥š’„›’ûš‚
-+€¡…………#Ü#,#,[EMAIL PROTECTED] to Unison!
- Please choose a profile or create a new one
+-Please choose a profile or create a new one
 -†¬……§…’…’½¨„¦¦«¨„™™
controlColor†„¦¦ªƒ?*ª«††„¦¦«¨„™™controlTextColor†ª††’…„:…†’„„„NSButton±’¸š‚!µ…………
  T T ’¸’…’…’…¹„„„NSButtonCell? ¡‚þ‚8¢„™™Open†¬……§…’…’Æ„   
ssii@@@@@[EMAIL PROTECTED]
¦¦¦¦†…††’„Ç’¸šµ…………‹ý÷T T [EMAIL PROTECTED]C C [EMAIL PROTECTED]
 -NSScrollerÓ±’¶š‚€µ…………3††’¶’…’…’…¹…’¶„ff:ƒ?4Œ „
_doScroller:¦¦†’„Ü’¶š‚€µ…………œœqq’¶’…’…’…¹…’¶Àƒ?}ÙÁ¦¦†’„µ’¶š‚Àµ„»š’„„„NSTableHeaderView²’Þš‚€µ…………22’Þ’…’…’…’­††………22’¶’…’à’…’à„@@ccc„¦¦«¨„™™controlBackgroundColor†Ã†…†’„„„
_NSCornerView²’¶š‚€µ…………3’¶’…’…’…††………<C˜C˜’¸’…’´’…’Û’Ý’´’Þ’ä„ffffi
--
[EMAIL PROTECTED])”„@@„„„NSMutableString„„NSString”„+
NSApplication†…†„ie–„„„
++NSMenuItemŸ”’„„„NSMenuÌ”„i@@@‚€„™™Actions†„„„NSMutableArray„„NSArray”š
++’š’„›’œ„
i@@IIi@@@@:[EMAIL PROTECTED] Right to 
Left†„™™<†‚‚ÿÿÿ…„„„NSCustomResource)”–„™™NSImage†„™™NSMenuCheckmark††…„¦–§„™™NSMenuMixedState††……’…’…†’„›’œ „™™Propagate
 Newer to Older†„™™†‚‚ÿÿÿ…¥…©……’…’…†’„›’œ „™™Propagate Older to 
Newer†­‚‚ÿÿÿ…¥…©……’…’…†’„›’œ „™™Leave 
Alone†„™™/†‚‚ÿÿÿ…¥…©……’…’…†’„›’œ „™™!Revert to Unison's 
Recommendation†­‚‚ÿÿÿ…¥…©……’…’…†’„›’œ „™™Merge†­‚‚ÿÿÿ…¥…©……’…’…†’„›’œ ‚À­­‚‚ÿÿÿ…¥…©……’…’…†’„›’œ „™™Restart†„™™r†‚‚ÿÿÿ…¥…©……’…’…†’„›’œ „™™Synchronize
 all†„™™g†‚‚ÿÿÿ…¥…©……’…’…††…† „™™Propagate Left to 
Right†„™™>†‚‚ÿÿÿ…¥…©……’…’…†œ–„„„NSTextField„„    
NSControl)„„NSView)„„NSResponder”’„„„NSCustomView)҅š„@@@@[EMAIL 
PROTECTED]>„„[EMAIL PROTECTED]@„@@@@„™™
Connecting...†„„„NSFont”š$„[36c]þÿLucidaGrande„f„c±±±†……„i:…’…’À„c@@„„„NSColor”±„@@@„™™System†„™™textBackgroundColor†„Ò±„ff††„Ò±µÓ„™™
    textColor†„Ò±¶†††’…„:…†Å–„„„NSWindowTemplateø”„
iiffffi@@@@@cpʁ
[EMAIL PROTECTED]@­„™™Unison†„К,[EMAIL PROTECTED] Copyright 1999-2005.
+ 
 
-‚„†š‚Àµ„»š’­†………2†2†’¶’…’­’…’­Ãâ…†š‚µ…………2†2†’´’…’…’…¹…„
@@@ff@@f::ià䄻š’š†„¦¦ª†„¦¦«¨„™™   [EMAIL PROTECTED]
 [EMAIL PROTECTED]'s update some stuff!
 
-†¬……§…’…’ï¨Áƒ…º…†’„·’íš‚€µ„»š’„µ’òš‚Àµ„»š’„®­„™™ReconTableView†°’ôšµ…………PýPý’ô’…’…’…¹…Æ„á’„µ’òš‚Àµ„»š’ø†………PP’ò’…’ø’…’øÃâ…†š‚€µ…………PP’ù’…’…’…’ö†„å’òš‚€µ…………Q’ò’…’…’…†„»š’„›œ„™™left†___„ž¡‚þ¢„™™Left†£……§…’…’…¨„¦¦ªƒ>[EMAIL
 PROTECTED]      [EMAIL 
PROTECTED]@¢…„¤š$¤þÿLucidaGrande¥
¦¦¦¦†……§…’…’ö¨âĆ’ö†’„›œ„™™progress†<<<„ž¡‚þ‚¢„™™Progress†£……§…’…’…¨
[EMAIL PROTECTED])È脞¡‚þ¢„™™Path†£……§…’…’…¨[EMAIL 
PROTECTED]@’…’…’…††………PýPý’ò’…’ö’…’öÃâ…†’„Ü’òš‚€µ…………Qýý’ò’…’…’…¹…’òÀƒ?wêqÁ¦¦†’„Ü’òš‚€µ…………PP’ò’…’…’…¹…’òÀƒ?{¿]Á¦¦†’ù’û†………saa’í’…’ô’…’’’ô’ù’ûÅ
@@ -755,22 +753,27 @@
 
-NSImageRep”š„[1218c]MM*ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ
 ÿÿÿÿÿÿÿÿÿÿÿÿ
ª²º(R
 -ü€'
 
-ü€'†’„¦¦ª†’…†¦¦††’„Ü’š‚€µ…………œœDD’’…’…’…¹…’ÀÁ¦¦†’„Ü’š‚€µ…………œœWW’’…’…’…¹…’Àƒ?rCÁ¦¦††………<a/a/’í’…’’…’=’>’’…’…Å
-+†³……°…’…’ý·»È†’…¸…†’„ß’ûš‚!€¡…………       T T [EMAIL PROTECTED]
NSScrollViewâ’ûš‚€¡„¥š’„„„
-+NSClipView:[EMAIL PROTECTED]@@@ff@@f::i„„„NSTableHeaderView’„      
’š‚À¡„¥š’†………22’’…’’…’„@@ccc„¼¯´½„™™controlBackgroundColor†¿†…†š‚€¡…………22’’…’…’…’
†„„„
_NSCornerView’š‚€¡…………3’’…’…’…†„¥š’„„„
NSTableColumn)[EMAIL 
PROTECTED]@@cc„™™profiles†ƒC—½ƒB=ès脄„NSTableHeaderCellƪ‚þ«„™™Profiles†„´š$­þÿLucidaGrande®¯¯¯¯
†……°…’…’…·„¼¯µƒ>[EMAIL PROTECTED]        [EMAIL PROTECTED]
-+NSScrollerÓœ’š‚€¡…………3††’’…’…’…¥…’„ff:ƒ?4Œ „
_doScroller:¯¯†’„'’š‚€¡…………œœqq’’…’…’…¥…’Ƀ?}Ùʯ¯†’’†………<C˜C˜’û’…’’…’&’(’’’„ffffi
++This software is licensed under the GNU General Public 
License.†„К$¯þÿLucidaGrande°
++±±±±†……²…’…’ã³Ñֆ’…·…†’„„„NSImageView’ݚ‚€§………„„„
NSMutableSet„„NSSet”„I’„™™Apple PDF pasteboard type†’„™™1NeXT 
Encapsulated PostScript v1.2 pasteboard type†’„™™NeXT TIFF v4.0 pasteboard 
type†’„™™NSFilenamesPboardType†’„™™Apple PICT pasteboard type†’„™™Apple PNG 
pasteboard [EMAIL PROTECTED]@’Ý’…’…’…¨„„„NSImageCell)[EMAIL 
PROTECTED]@­„™™Sync you very 
much!†„К$¯þÿOptima-Italic°[EMAIL 
PROTECTED]@­„™™?.?.?†„К$¯þÿLucidaGrande°
±±±±†……²…’…’ú³Ñֆ’…·…††………     
++
++’…’…’…’…†…„ffffê±¶Õ’…±¶ƒÿîƒÿ–„„„NSBox*҄ƒ…š§„ š’„ÿ’š‚
[EMAIL PROTECTED]:
++†„К$¯þÿLucidaGrande°
±±±±†……²…’…’³„Ò±µÓ„™™[EMAIL PROTECTED] ……
²…’…’³Ñֆ’…·…††………³3³3’’…’…’…††………­·G·G’’…’…’…„ff@@ccc„ˬ‚þ­„™™
++First root†   ……
²…’…’…³Ñ„Ò±¶ƒ?LÌ͆†’…†’þ’„„„NSButton’š‚!€§…………}T T 
’’…’…’…¨„„„NSButtonCell?̬‚þ‚8­„™™Save†     ……²…’…’„      
ssii@@@@@[EMAIL PROTECTED]
±±±±†…††’„’š‚!€§…………)T T ’’…’…’…¨„¬‚þ‚8­„™™Cancel†     
[EMAIL PROTECTED][EMAIL PROTECTED]
Profile name:†  ……²…’…’!³
++
†’…·…†’„Á’š‚
[EMAIL PROTECTED]       ……
²…’…’$³Ñֆ’…·…††………߁"߁"’…’…’…’…
–„˜™NSView†„™™NSResponder††š‚§„ š’„Ã’þš§„ š’„„„NSMatrix>’)š‚€§…………

'F&F&’)’…’…’…¨…„#iiii:::ffffi@@@@@Ì………F‚D(„ š’„¬‚„þ­„™™Remote†
     ……²…’…’+ƁÈ‚H<Qÿ„˜™†0…„„„NSButtonImageSource”’„™™
NSRadioButton††…†’„¬‚þ­„™™Local†  ……²…’…’+ƁÈ‚H<Qÿ00…1…††
++Õ     „¬‚þ­„™™Radio†    ……
²…’…’…ƁK‚H8Qÿ…­…1…†’…’…’.†’„Á’)š‚€§…………j:%%’)[EMAIL PROTECTED]:†  ……
²…’…’8³
++
†’…·…†’„Á’)š‚€§…………”8NN’)[EMAIL PROTECTED]     ……
²…’…’;³Ñֆ’…·…†’„Á’)š‚€§…………ö:&&’)[EMAIL PROTECTED]:†      ……
²…’…’=³
++
†’…·…†’„Á’)š‚€§…………!8„„’)[EMAIL PROTECTED] [EMAIL 
PROTECTED])š‚€§…………’)[EMAIL PROTECTED]:†      ……²…’…’B³
++
†’…·…†’„Á’)š‚€§………….ww’)[EMAIL PROTECTED]   ……
²…’…’E³Ñֆ’…·…††………³V³V’þ’…’…’…††………<·j·j’’…’…’…Äˬ‚þ­„™™
Second root†       ……²…’…’…³Ñ„Ò±¶ƒ?LÌ͆†)’…†–„’„Æ’…š§„ š’„Á’Kš‚
[EMAIL PROTECTED]'s update some stuff!
++†     ……²…’…’M³
++
†’…·…†’„„„NSScrollViewâÒKš‚€§„ š’„„„
++NSClipView:[EMAIL 
PROTECTED]@@@ff@@f::i„„„NSTableHeaderView҄T’Pš‚À§„ š’Z†………PP’P’…’Z’…’Z„@@ccc„Ò±µÓ„™™controlBackgroundColor†
†…†š‚€§…………PP’\’…’…’…’V†„„„
_NSCornerViewÒPš‚€§…………Q’P’…’…’…†„ š’„„„
NSTableColumn)[EMAIL 
PROTECTED]@@cc„™™left†___„„„NSTableHeaderCellˬ‚þ­„™™Left†„К$¯þÿLucidaGrande°±±±±
†……²…’…’…³„Ò±¶ƒ>[EMAIL PROTECTED]  ……²…’…’V³Õ
†’V†’„dՄ™™   [EMAIL PROTECTED]       ……²…’…’V³Õ
[EMAIL PROTECTED]
†’V†’„dՄ™™progress†<<<[EMAIL PROTECTED]
†’V†’„dՄ™™path†ƒCŠŒ)[EMAIL PROTECTED]
†’V††ՄұµÓ„™™     [EMAIL PROTECTED]
++NSScrollerÓ’Pš‚€§…………Qýý’P’…’…’…¨…’P„ff:ƒ?wêq„
_doScroller:±±†’„ˆ’Pš‚€§…………PP’P’…’…’…¨…’P؃?{¿]Ù±±†’\’`†………saa’K’…’S’…’‡’‰’S’\’`„ffffi
 +
-+‚„†’„ß’ûš‚!€¡…………ÆC C 
’û’…’…’…¥„±ª‚þ‚8«„™™New†³……°…’…’)[EMAIL PROTECTED] T [EMAIL 
PROTECTED]
-+NSMenuItemŸ”’„„„NSMenuÌ”„i@@@‚€„™™Actions†„¥š
-+’„5’6„
i@@IIi@@@@:[EMAIL PROTECTED] Left to 
Right†„™™>†‚‚ÿÿÿ…„„„NSCustomResource)”–„™™NSImage†„™™NSMenuCheckmark††…„>–?„™™NSMenuMixedState††……’…’…†’„5’6τ™™Propagate
 Right to Left†„™™<†‚‚ÿÿÿ…=…A……’…’…†’„5’6τ™™Propagate Newer to 
Older†Ã‚‚ÿÿÿ…=…A……’…’…†’„5’6τ™™Propagate Older to 
Newer†Ã‚‚ÿÿÿ…=…A……’…’…†’„5’6τ™™Leave 
Alone†„™™/†‚‚ÿÿÿ…=…A……’…’…†’„5’6τ™™!Revert to Unison's [EMAIL 
PROTECTED] [EMAIL PROTECTED] Copyright 1999-2005.
++‚Ć’J’„Q’Kš‚€§„ š’„T’Šš‚À§„ š’„„„NSTextTemplateƄ„NSViewTemplate.ҁŒš‚€§………„ê¾
’„™™Apple HTML pasteboard type†’„™™Apple PICT pasteboard type†’„™™1NeXT 
Encapsulated PostScript v1.2 pasteboard type†’„™™*NeXT Rich Text Format v1.0 
pasteboard type†’„™™Apple PDF pasteboard 
type†’„™™NSFilenamesPboardType†’„™™NSStringPboardType†’„™™NeXT TIFF v4.0 
pasteboard type†’„™™NSColor pasteboard type†’„™™#CorePasteboardFlavorType 
0x6D6F6F76†’„™™NeXT RTFD pasteboard 
type††_-_-’Œ’…’…’…’„™™NSText†’…’Ö’„КÇþÿHelvetica°
±±±±†š’Õ¶-¶_‚˜–€’…±±±±±±±±±±±††………_-_-’Š’…’Ž’…’ŽÒՄ„„NSCursor”¶ÿ’…±±††’„ˆ’Šš‚€§…………œœDD’Š’…’…’…¨…’ŠØÙ±±†’„ˆ’Šš‚€§…………œœWW’Š’…’…’…¨…’ŠØƒ?rCÙ±±††………<a/a/’K’…’Œ’…’¡’¢’Œ’…’…Ú
  
-+This software is licensed under the GNU General Public 
License.†„´š$­þÿLucidaGrande®
-+¯¯¯¯†……°…’…’Z·Íφ’…¸…†’„„„NSImageViewœ’Xš‚€¡………„„„
NSMutableSet„„NSSet”„I’„™™Apple PDF pasteboard type†’„™™1NeXT 
Encapsulated PostScript v1.2 pasteboard type†’„™™NeXT TIFF v4.0 pasteboard 
type†’„™™NSFilenamesPboardType†’„™™Apple PICT pasteboard type†’„™™Apple PNG 
pasteboard [EMAIL PROTECTED]@’X’…’…’…¥„„„NSImageCell)®ª‚þ‚«„>[EMAIL 
PROTECTED]@«„™™Sync you very 
much!†„´š$­þÿOptima-Italic®[EMAIL 
PROTECTED]@«„™™?.?.?†„´š$­þÿLucidaGrande®
¯¯¯¯†……°…’…’q·Íφ’…¸…††………      
-+
[EMAIL 
PROTECTED]@«„™™Unison†„´š,„[44c]$þÿLucidaGrande-Bold®¯¯¯¯†……°…’…’W·Íφ’…¸…†X–qX–„5’„7΄™™Help†„¥š’x†…†Ï„™™Unison
 Online Help†„™™?†‚‚ÿÿÿ…=…A……’…’…†y–„ß’„’…š¡„¥š’„
¿„™™NSSecureTextField†›’š‚€¡…………<[EMAIL PROTECTED]b b [EMAIL 
PROTECTED]@«„™™Please enter your password
-+†³……°…’…’‰·»È†’…¸…††………  ã€ã€’…’…’…’…†š‚€¡…………T T 
[EMAIL PROTECTED]
-+’„5’‘Ï„™™About [EMAIL 
PROTECTED],†‚‚ÿÿÿ…=…A……’…’…†’„5’‘Ï„™™Install command-line [EMAIL 
PROTECTED] Unison†„™™h†‚‚ÿÿÿ…=…A……’…’…†’„5’‘Ï„™™Hide [EMAIL 
PROTECTED] Unison†„™™q†‚‚ÿÿÿ…=…A……’…’…††„™™_NSAppleMenu††Ï„™™Show 
All†Ã‚‚ÿÿÿ…=…A……’…’…†‘–ꢖ„Ƅ™™  
direction†222„ª‚þ‚«„™™Action†……°…’…’…·„¼¯µƒ>ªªŸ† [EMAIL 
PROTECTED]¿„™™ReconTableView†’„        ’„’„£’…š¡„¥š’„›’³š‚
[EMAIL PROTECTED]'s update some stuff!
-+†³……°…’…’µ·»È†’…¸…†’²’„ß’³š‚€¡…………u u [EMAIL PROTECTED]      
’¼š‚À¡„¥š’„„„NSTextTemplateƄ„NSViewTemplate.’¾š‚€¡………
„aÔ’„™™Apple HTML pasteboard type†’„™™Apple PICT pasteboard type†’„™™1NeXT 
Encapsulated PostScript v1.2 pasteboard type†’„™™*NeXT Rich Text Format v1.0 
pasteboard type†’„™™Apple PDF pasteboard 
type†’„™™NSFilenamesPboardType†’„™™NSStringPboardType†’„™™NeXT TIFF v4.0 
pasteboard type†’„™™NSColor pasteboard type†’„™™#CorePasteboardFlavorType 
0x6D6F6F76†’„™™NeXT RTFD pasteboard 
type††_-_-’¾’…’…’…’„™™NSText†’…’Ï’„´š»þÿHelvetica®
¯¯¯¯†š’Àµ-µ_‚˜–€’…¯¯¯¯¯¯¯¯¯¯¯††………_-_-’¼’…’À’…’ÀÃÀ„„„NSCursor”µÿ’…¯¯††’„'’¼š‚€¡…………œœDD’¼’…’…’…¥…’¼Éʯ¯†’„'’¼š‚€¡…………œœWW’¼’…’…’…¥…’¼Éƒ?rCʯ¯††………<a/a/’³’…’¾’…’Ó’Ô’¾’…’…Ë
  
  
 -‚†’„Ç’íš‚µ…………U U [EMAIL PROTECTED]
@@ -786,6 +789,17 @@
 -’„N’ÏՄ™™Propagate Left to 
Right†„™™>†‚‚ÿÿÿ…V…Z……’…’…†’„N’ÏՄ™™Propagate Right to 
Left†„™™<†‚‚ÿÿÿ…V…Z……’…’…†’Î’„N’ÏՄ™™Propagate Older to 
Newer†U‚‚ÿÿÿ…V…Z……’…’…†’„N’ÏՄ™™Leave 
Alone†„™™/†‚‚ÿÿÿ…V…Z……’…’…†’„N’ÏՄ™™!Revert to Unison's [EMAIL 
PROTECTED] all†„™™g†‚‚ÿÿÿ…V…Z……’…’…††…†Õ„™™Propagate Newer to 
Older†U‚‚ÿÿÿ…V…Z……’…’…†Ï–]O–jO–†„–?햄PԄ™™MainMenu†„»š’„N’éÕQU‚‚ÿÿÿ…V…Z„submenuAction:…’…’O†’„N’éՄ™™Edit†U‚‚ÿÿÿ…V…Z܅’…’„PԄ˜™Edit†„»š’„N’ïՄ™™Cut†„™™x†‚‚ÿÿÿ…V…Z……’…’…†’„N’ïՄ™™Copy†„™™c†‚‚ÿÿÿ…V…Z……’…’…†’„N’ïՄ™™Paste†„™™v†‚‚ÿÿÿ…V…Z……’…’…†’„N’ïՄ™™
 -Select All†„™™a†‚‚ÿÿÿ…V…Z……’…’…†’„N’ïՄ™™Select 
Conflicts†U‚‚ÿÿÿ…V…Z……’…’…††…††’„N’éՁÐU‚‚ÿÿÿ…V…Z܅’…’Ï†’„N’éՄ™™Ignore†U‚‚ÿÿÿ…V…Z܅’…’„Pԁ„»š’„N’Մ™™
Ignore Path†„™™i†‚‚ÿÿÿ…V…Z……’…’…†’„N’Մ™™Ignore 
Extension†„™™e†‚‚ÿÿÿ…V…Z……’…’…†’„N’Մ™™Ignore 
Name†„™™n†‚‚ÿÿÿ…V…Z……’…’…††…††’„N’éՄ™™Help†U‚‚ÿÿÿ…V…Z܅’…’„Pԁ„»š’„N’Մ™™Unison
 Online Help†„™™?†‚‚ÿÿÿ…V…Z……’…’…††…
†††„™™_NSMainMenu††•–„„„NSWindowTemplateø”„
iiffffi@@@@@cp 
 [EMAIL PROTECTED]@¢„™™Unison†„¤š,[EMAIL PROTECTED] Copyright 1999-2005.
++‚†’„’Kš‚€§…………U U ’K’…’…’…¨„¬‚þ‚8­„™™Restart†  [EMAIL 
PROTECTED]
[EMAIL PROTECTED]
++†i……²…’…’¨³
++
†’…·…††………‰ف‰ْ…’…’…’…–„˜™NSView†„™™NSResponder††š‚€§…………u 
u ’K’…’…’…¨„¬‚$þ‚­„™™Synchronize†  [EMAIL PROTECTED]       …
††K–„›’„„˜™Edit†„ š’„›’± „™™Cut†„™™x†‚‚ÿÿÿ…¥…©……’…’…†’°’„›’± „™™Paste†„™™v†‚‚ÿÿÿ…¥…©……’…’…†’„›’± „™™
++Select All†„™™a†‚‚ÿÿÿ…¥…©……’…’…†’„›’± „™™Select 
Conflicts†­‚‚ÿÿÿ…¥…©……’…’…††…† „™™Copy†„™™c†‚‚ÿÿÿ…¥…©……’…’…†±–„›’„„™™Ignore†„ š’„›’Â „™™
Ignore Path†„™™i†‚‚ÿÿÿ…¥…©……’…’…†’„›’Â „™™Ignore 
Extension†„™™e†‚‚ÿÿÿ…¥…©……’…’…†’Á†…† „™™Ignore 
Name†„™™n†‚‚ÿÿÿ…¥…©……’…’…†Â–„›’„„™™Unison†„ š   ’„›’Î „™™
About [EMAIL PROTECTED],[EMAIL PROTECTED] 
Unison†„™™h†‚‚ÿÿÿ…¥…©……’…’…†’„›’Î „™™Hide [EMAIL PROTECTED] 
Unison†„™™q†‚‚ÿÿÿ…¥…©……’…’…††„™™_NSAppleMenu†† „™™Show 
All†­‚‚ÿÿÿ…¥…©……’…’…†Î–¸œ–––B)–Î„›’„„™™MainMenu†„ š’ä’„›’å „™™Edit†­‚‚ÿÿÿ…¥…©„submenuAction:…’…’±†’„›’å ž­‚‚ÿÿÿ…¥…©Þ…’…’œ†’„›’å Ã­‚‚ÿÿÿ…¥…©Þ…’…’Â†’„›’å 
 „™™Help†­‚‚ÿÿÿ…¥…©Þ…’…’„í„ š’„›’î „™™Unison Online 
Help†„™™?†‚‚ÿÿÿ…¥…©……’…’…††…
†††„™™_NSMainMenu†† Ï­‚‚ÿÿÿ…¥…©Þ…’…’Î†–·±–„––„™™ProfileController†…†•––nV–ëå–êå–ÑÎ–PK–úݖ;)–„Á’„Ã’…š§„ š’„W΄™™NSSecureTextField†Á’÷š‚€§…………<[EMAIL
 PROTECTED]       ……²…’…’ù³Ñֆ’…·…†’„’÷š‚€§…………sb b 
’÷’…’…’…¨„¬‚þ‚8­„™™Continue†        [EMAIL PROTECTED]T T 
’÷’…’…’…¨„¬‚þ‚8­„™™Cancel† [EMAIL PROTECTED]       [EMAIL 
PROTECTED] enter your password
++†     ……²…’…’ö³
++
†’…·…†÷–÷„Ú¹¨Rã€‚px„™™PasswordWindow†„™™NSWindow†„˜™View†÷…Áê±¶Õ’…±¶ƒÿîƒÿVP–„’„Æ’…š§„ š’„Á’
š‚
++€§…………#Ü#,#,’
[EMAIL PROTECTED] to Unison!
++Please choose a profile or create a new one
++†     ……²…’…’³
++
†’…·…†’’„’
š‚€§…………‹ý÷T T ’
’…’…’…¨„¬‚þ‚8­„™™Quit†       [EMAIL PROTECTED]
š‚€§„ š’„T’š‚À§„ š’„W΄™™ProfileTableView†Y’š‚€§…………2†2†’’…’…’…¨…Є[’„T’š‚À§„ š’†………22’’…’’…’Ò^…†š‚€§…………22’’…’…’…’†„a’š‚€§…………3’’…’…’…†„ š’„dՄ™™profiles†ƒC—½ƒB=èsè„g¬‚þ­„™™Profiles†i……²…’…’…³„Ò±¶ƒ>[EMAIL
 PROTECTED]  ……²…’…’³Õ
[EMAIL PROTECTED] 
Ù±±†’„ˆ’š‚€§…………œœqq’’…’…’…¨…’؃?}ÙÙ±±†’’ 
†………<C˜C˜’
’…’’…’(’)’’’ Ú
  
 -This software is licensed under the GNU General Public 
License.†„¤š$¤þÿLucidaGrande¥
 -¦¦¦¦†……§…’…’ ¨~2†’…º…†’„„„NSImageView±’šµ………„$Ë’„™™Apple PDF 
pasteboard type†’„™™NeXT TIFF v4.0 pasteboard type†’„™™1NeXT Encapsulated 
PostScript v1.2 pasteboard type†’„™™NSFilenamesPboardType†’„™™Apple PICT 
pasteboard [EMAIL PROTECTED]@’’…’…’…¹„„„NSImageCell)[EMAIL 
PROTECTED]@¢„™™Sync you very 
much!†„¤š$¤þÿOptima-Italic¥[EMAIL 
PROTECTED]@¢„™™?.?.?†„¤š$¤þÿLucidaGrande¥
¦¦¦¦†……§…’…’4¨~2†’…º…††………   
@@ -805,29 +819,23 @@
 
-Ÿçöâ灉‹çÒçÎçàf灞Óçi•çoçå¤çnçƁ灖pçî{灬Üçþ‰çì8çbç–çԁç
 —灺òç
 çâu灠ÕçwBç]çӁÎçȁ灴îçƁÈçð|灮Ý灁‹çßçâ®çց2çû¬çqH筁ÍçtAçñ}ç>ê灘qçò ç¼óçoÑ灁¥çM–çäv灢ÖçO9çò~灁‘çÈ«çʁ灍’çß¡çóç°æ灁Œç$™çc†ç˜ç؁Lçr3灷ìç
çô€çù灾ûç:çÚçD0灁¦çgçýáçØç|kçæwçSžçõç8灤×ç́灑™çÕ
 -çïÐ灙µçõçö‚灲çš°š–­¯–·¸–ö÷’„˜™IBCocoaFramework††
 \ No newline at end of file
-+‚†’„ß’³š‚€¡…………U U [EMAIL PROTECTED]
[EMAIL PROTECTED]
-+†……°…’…’Ú·»È†’…¸…††………‰ف‰ْ…’…’…’…
–„˜™NSView†„™™NSResponder††š‚€¡„¥š’±’„'’²š‚€¡…………Qýý’²’…’…’…¥…’²Éƒ?wêqʯ¯†’„'’²š‚€¡…………PP’²’…’…’…¥…’²Éƒ?{¿]ʯ¯†’„
     
’²š‚À¡„¥š’„’âš‚€¡…………PP’â’…’…’…’¯††………PP’²’…’ä’…’äÃ…†’„’²š‚€¡…………Q’²’…’…’…††………saa’³’…’±’…’à’á’±’â’åË
-+
-+‚Ćš‚À¡„¥š’¯†………PýPý’²’…’¯’…’¯Ã…†š‚€¡…………PýPý’±’…’…’…¥…Áäå„¥š’„Ƅ™™left†___„ª‚þ«„™™Left†……°…’…’…·­
 [EMAIL PROTECTED] [EMAIL 
PROTECTED]<<<„ª‚þ‚«„™™Progress†……°…’…’…·ñ [EMAIL 
PROTECTED])Èè„ª‚þ«„™™Path†……°…’…’…·ñ [EMAIL 
PROTECTED]@’…’…’…†·ÀȆ’¯†¯–„5’„7΄™™MainMenu†„¥š’„5’ÿρ’‚ÿÿÿ…=…A„submenuAction:…’…’‘†’„5’ÿτ™™Edit†Ã‚‚ÿÿÿ…=…Aۅ’…’„7΄˜™Edit†„¥š’„5’τ™™Cut†„™™x†‚‚ÿÿÿ…=…A……’…’…†’„5’τ™™Copy†„™™c†‚‚ÿÿÿ…=…A……’…’…†’„5’τ™™Paste†„™™v†‚‚ÿÿÿ…=…A……’…’…†’„5’τ™™
-+Select All†„™™a†‚‚ÿÿÿ…=…A……’…’…†’„5’τ™™Select 
Conflicts†Ã‚‚ÿÿÿ…=…A……’…’…††…††’þ’„5’ÿτ™™Ignore†Ã‚‚ÿÿÿ…=…Aۅ’…’„7΁„¥š’„5’τ™™
Ignore Path†„™™i†‚‚ÿÿÿ…=…A……’…’…†’„5’τ™™Ignore 
Extension†„™™e†‚‚ÿÿÿ…=…A……’…’…†’„5’τ™™Ignore 
Name†„™™n†‚‚ÿÿÿ…=…A……’…’…††…††’„5’ÿÏz‚ÿÿÿ…=…Aۅ’…
’y††„™™_NSMainMenu††Ï8‚ÿÿÿ…=…Aۅ’…’6†ÿ–^X–ÿ–²³–¹«–œ‘–ZX–
–Ë©–„–«©–O6–ÿ–³•–ÿ•–Þ¢–‘–Õ³– 
–„„„NSWindowTemplateø”„
iiffffi@@@@@clàh‚px„™™Unison†„™™NSWindow†„˜™View†„’…š¡„¥š†……… 
àhàh’…’…’…’…†…„ffffê¯µÕ’…¯†•–”‘–Ô©–– ¢––ÿ––mX–‘–P6–„£’…š¡„¥š’„›’,š‚€¡…………‹CC’,[EMAIL
 PROTECTED]@«„™™
Connecting...†„´š$­þÿLucidaGrande®¯¯¯¯†……°…’…’.·Íφ’…¸…††………kk’…’…’…’…–„˜™NSView†„™™
NSResponder††•–Ù©–ýû–ô¯–.,––¼³–„––„™™PreferencesController†…†•–6þ–û–§¢–#ÿ–y#– ‘–S6–:6–„&݁¨Rã€‚px„™™PasswordWindow†„™™NSWindow†„˜™View†…ށê¯µÕ’…¯µƒÿîƒÿ–„––„™™

MyController†…†•–öŸ–µ³–í¯–墖¯²–6––Ä©––‘–J6–û–£‘–Ÿ –)û–°«–F6–è¯–X„&݁pʁ
-+‚pxę™NSWindow†„˜™View†X…ށê¯µÕ’…
¯µƒÿîƒÿѩ–C6––—‘–<•–í¢––¤‘–Ö©––©§–‰–M6–„––„™™ProfileController†…†•–*%–¸³–ù¯–H6–û•––¢•–À¼–Ú³–š‘––šD–°„™™
NSButtonCell†–ú„™™     NSButton1†–Õ„™™
-+NSButton21†–•„˜™File's Owner†–«„™™   NSMatrix1†–¸„™™       
NSButton1†–%„™™Window†–¼„™™
NSScrollView2†–„™™
[EMAIL PROTECTED])„™™   
NSButton2†–ö„™™NSTextField†–„™™NSMenuItem3†–©„™™NSTableColumn1†–µ„™™
NSTextField2†–#„˜™1†–ý„™™NSTextField2†–š„™™NSTextField2†–:;–²„™™
NSScrollView1†–„™™
-+NSMenuItem†–Ú„™™
NSTextField1†–„™™NSTextField†–¢„™™PreferencesView†–W„™™NSTextField†–¤„™™1111†–Ù„™™

NSTextField3†–û„™™chooseProfileView†–„™™NSMenuItem1†–„™™NSMenu†–©„™™NSView†–Ö„™™
NSTextField22†–y„˜™2†–<„™™AboutWindow†–ê„™™
NSTextField23†–í„™™NSTextField4†–Ô„™™
NSTextField1†–„„™™NSButton†–45–.„™™NSTextField†–Ñ„™™
NSTextField21†–„™™NSMenuItem9†–—„™™121†–„™™
NSScrollView1†–À„™™
-+NSTextView†–6„™™PasswordWindow†–Ë„™™NSTextField†–‰„™™
NSTextField2†–è„™™
NSTableColumn†–³„™™updatesView†–Ä„™™NSTextField2†–Ÿ„™™NSView†–x„˜™†–m„™™
NSTextField2†–,„™™ConnectingView†–~„™™        NSButton1†–§„™™NSBox1†–å„™™   
 NSButton1†–¹„™™
NSButtonCell1†–„™™NSTableView†–ÿ„˜™MainMenu†–„™™NSMenuItem10†–Z„™™
NSTextField1†–Þ„™™NSButton†–¯„™™NSTableView†– „™™NSBox†–q„™™
NSTextField3†’„aÔ’%†’„¥šN’„„„NSNibControlConnectorÏ„„NSNibConnector”´¤•„˜™
-+terminate:††’„…´ •„™™hideOtherApplications:††’„…´•„™™hide:††’„…´•„™™unhideAllApplications:††’„…´…„˜™cut:††’„…´…„˜™paste:††’„…´…„˜™
-+selectAll:††’„…´…
„˜™copy:††’„„„NSNibOutletConnectorÏ†´:³„™™updatesView††’„—´:û„™™chooseProfileView††’„…´):„™™
createButton:††’„…
´:„™™openButton:††’„…´Õ:„™™restartButton:††’„—´:%„™™
-+mainWindow††’„—´?„™™     tableView††’„—´?„™™
-+dataSource††’„—´:µ„™™updatesText††’„—´:?„™™profileController††’„—´:¯„™™
   tableView††’„—´¯:„™™
-+dataSource††’„…
´¸:„™™syncButton:††’„…´„:„™™endPasswordWindow:††’„—´:6„™™passwordWindow††’„—´:„™™

passwordText††’„…´~:„™™endPasswordWindow:††’„—´:À„™™detailsTextView††’„—´¯:„™™delegate††’„…´…„™™
ignorePath:††’„…´…„™™
-+ignoreExt:††’„…´ …
„™™ignoreName:††’„…´:…„™™copyLR:††’„…´C…„™™copyRL:††’„…´…„™™selectConflicts:††’„…´M…„™™revert:††’„…´F…„™™
forceNewer:††’„…´H…„™™forceOlder:††’„…´J…„™™leaveAlone:††’„—´:Ú„™™
-+statusText††’„—´4턙™profileNameText††’„—´4儙™
cancelButton††’„—´4ބ™™
-+saveButton††’„—´:4„™™preferencesController††’„—´:¢„™™preferencesView††’„—´4ö„™™
firstRootText††’„—´4˄™™secondRootUser††’„—´4Ԅ™™secondRootHost††’„—´4ل™™secondRootText††’„—´4°„™™remoteButtonCell††’„—´4¹„™™localButtonCell††’„—´íö„™™nextKeyView††’„—´ö«ꆒ„—´«Ëꆒ„—´Ëԁꆒ„—´Ôفꆒ„—´Ùށꆒ„—´Þíꆒ„…´°4„™™
remoteClick:††’„…
´¹4„™™localClick:††’„—´ꆒ„—´ꆒ„…´Þ:„™™saveProfileButton:††’„…´å:„™™cancelProfileButton:††’„—´:~„™™passwordCancelButton††’„—´:„™™delegate††’„—´
:„™™
myController††’„—´:<„™™aboutWindow††’„—´:q„™™versionText††’„…´”:„™™raiseAboutWindow:††’„…´x:„™™
onlineHelp:††’„…
´S:„™™syncButton:††’„…´4…„™™merge:††’„—´:,„™™ConnectingView††’„…´š:„™™installCommandLineTool:††’„…´P:„™™restartButton:††’„—´:¸„™™synchronizeButton††’„—´:Õ„™™
restartButton††’„—´:S„™™synchronizeMenuItem††’„—´:[EMAIL PROTECTED]
-+âÚ0âS¤â:ÑâՁQ⁖Ò⁁ âóƒâý⁁°â?Ù⁻ü⢁3âýÇ⁁âãx⁡Øâökâôõâ•⁚¬âɁâåyâ.«â¯é⁐°âW–âׁR⁵Ðââõ†â
       
¥âåH⁽âO£â¤ˆâˁp⫁l⁣Úâö‡âÿâ6ê⁑9âÕÏâˁâçzâêIâZ—â÷ˆâÊâ6⁖Ä⁁«â±ð⁈’⧁Câցs⁳Æ⩁Dâف^⁁¶â©ß⁁¦â”žâM

⁊˜â<’ⁿâùäâyjâX‘âíJ⁥Û⁁ âèáâ́⁒³â ‘âé{⁉ïâ
©â8⁳ñâ,§âþâ)Îâù‰âŒ™âہf⁙Óâxoâ:âíã⁎¯âq›âÁâHâ~îâÀúâ%⁁þ⁧ÜⰁmâP®â¸èâρâ*⁁œâë|⁁­âû‹âсq⁵ò⁜â݁u⁛Õâì}âmšâ
⁁ÿ⁗â¹nâÈâÁâفtâí~⁲àâË⁩Ý⁁£â^™âс2⚁j⁁âîââýŒâ
 
â·ó⁁·â¬â߁v⁝Öâï€â±â¯âÿâì⁣⁄íâúÉâðâ«æâށGâ4¡â#gâāoâӁL⁣•š¸š–
–¯°–‚’„˜™IBCocoaFramework††
++‚„†’„’
š‚!€§…………ÆC C ’
’…’…’…¨„¬‚þ‚8­„™™New†        [EMAIL PROTECTED]       T T ’
’…’…’…¨„¬‚þ‚8­„™™Open†       ……²…’…’[EMAIL PROTECTED]
––»œ–„––„™™PreferencesController†…†•–Âë–¨K–„––„™™
MyController†…†•––å•–
–K•–º±–«œ–ÅÂ–)þ––ìå–ÓÎ–$–E)–£K–öݖ¢œ–äå–×Î–ù÷–+)–ÛÎ–„Ú¹làh‚px„™™Unison†„™™NSWindow†„˜™View†„Ã’…š§„ š†………
  
àhàh’…’…’…’…†…Áê±¶Õ’…±†•–sV–cV–ÔÎ–½±–ÈÂ–4+–èå–ØÎ–=)–®œ–•–ŽŠ–ŠK–
–MK–Ýٖ
•–@)–•–ÞÎ––=9–³œ–±è–*
–
–°œ–!–zV–µœ–ßÎ–V–çݖ´±–"–ü÷–÷–œê–ãݖ.+–·œ–îì–Å•–ðî–8)–ßݚD–ß„™™1111†–„™™PreferencesView†–„™™
[EMAIL PROTECTED]NSTextField1†–Å„™™ConnectingView†–4„™™
NSButtonCell1†–Ô„™™121†–·„™™NSMenuItem9†–å„˜™MainMenu†–)„™™NSView†–
„™™NSButton†–.„™™NSButtonCell†–ì„˜™1†–!„™™
NSTextField23†–J„™™     NSButton1†–„™™ NSButton1†–9„™™Window†–ôõ–
„™™chooseProfileView†–n„™™NSTableColumn1†–±„™™NSMenu†–„™™NSView†–V„™™NSTableView†–=„™™
NSTextField21†–À„™™NSTextField†–M„™™NSTextField2†–56–*„™™       
NSButton2†–º„™™NSMenuItem10†–Š„™™
NSScrollView2†–78–$„™™NSTextField4†–"„™™
NSTableColumn†–„™™PasswordWindow†–ö„™™NSTextField2†–„™™       
NSButton1†–þ„™™NSBox1†–è„™™
++NSMenuItem†–„™™NSTextField2†–+„™™ NSMatrix1†–ù„™™NSTextField†–E„™™
NSTextField3†–´„™™NSMenuItem3†–c„™™
NSTableColumn†–ð„˜™†–P„™™
NSScrollView1†–„™™NSButton†–£„™™
++NSButton21†–ã„™™NSTextField1†–•„˜™File's Owner†–„™™      
NSButton1†–î„˜™2†–8„™™NSTextField2†–B„™™
NSTextField22†–ö„™™
NSTextField2†–;„™™NSTextField†–°„™™NSMenuItem1†–K„™™updatesView†–ú„™™
NSTextField3†–„™™NSTextField†–„™™NSBox†–ß„™™NSTextField†–„™™
NSScrollView1†–Ž„™™
++NSTextView†–„™™NSTableView†–¨„™™
NSTextField1†–ü„™™NSButton†’„ê¾’9†’„ šM’„„„NSNibControlConnectorÏ„„NSNibConnector”µß•„˜™
++terminate:††’„ƒµÛ•„™™hideOtherApplications:††’„ƒµØ•„™™hide:††’„ƒµÍ•„™™unhideAllApplications:††’„ƒµ´…„˜™cut:††’„ƒµ·…„˜™paste:††’„ƒµº…„˜™
++selectAll:††’„ƒµ°…
„˜™copy:††’„„„NSNibOutletConnectorÏ„µ7K„™™updatesView††’„•µ7
„™™chooseProfileView††’„ƒµ*7„™™
createButton:††’„ƒµ
7„™™openButton:††’„ƒµ£7„™™restartButton:††’„•µ79„™™
++mainWindow††’„•µô„™™   tableView††’„•µô„™™
++dataSource††’„•µ7M„™™updatesText††’„•µ7ô„™™profileController††’„•µ7V„™™
       tableView††’„•µV7„™™
++dataSource††’„ƒµJ7„™™syncButton:††’„ƒµü7„™™endPasswordWindow:††’„•µ7„™™passwordWindow††’„•µ7ù„™™

passwordText††’„ƒµ7„™™endPasswordWindow:††’„•µ7Ž„™™detailsTextView††’„•µV7„™™delegate††’„ƒµÅ…„™™
ignorePath:††’„ƒµÈ…„™™
++ignoreExt:††’„ƒµÁ…
„™™ignoreName:††’„ƒµš…„™™copyLR:††’„ƒµ¢…„™™copyRL:††’„ƒµ½…„™™selectConflicts:††’„ƒµ³…„™™revert:††’„ƒµ«…„™™
forceNewer:††’„ƒµ®…„™™forceOlder:††’„ƒµ°…„™™leaveAlone:††’„•µ7¨„™™
++statusText††’„•µ5$„™™profileNameText††’„•µ5„™™
cancelButton††’„•µ5„™™
++saveButton††’„•µ75„™™preferencesController††’„•µ7„™™preferencesView††’„•µ5„™™
firstRootText††’„•µ5;[EMAIL PROTECTED];膒„•µ;@[EMAIL PROTECTED]
remoteClick:††’„ƒµ45„™™localClick:††’„•µ膒„•µ
膒„ƒµ7„™™saveProfileButton:††’„ƒµ7„™™cancelProfileButton:††’„•µ7„™™passwordCancelButton††’„•µù7„™™delegate††’„•µ7„™™

myController††’„•µ7ل™™aboutWindow††’„•µ7ú„™™versionText††’„ƒµÑ7„™™raiseAboutWindow:††’„ƒµð7„™™onlineHelp:††’„ƒµ»7„™™syncButton:††’„ƒµµ…„™™merge:††’„•µ7ń™™ConnectingView††’„ƒµ¸7„™™restartButton:††’„•µ7J„™™synchronizeButton††’„•µ7£„™™
[EMAIL 
PROTECTED]"Êâë~â灙â=qâÁâ9â!Iâå⁐³â°â©æâìâAâKÆ⁂‹âûŒâ½
âÂþⷁ£âÁâсLⁱ©â·ûâ߁–âí€âŠù⁷«â+l⁠     
¦âB⁝×âzõ⣧â߁wâف’âîâŁâ’µâ±âÅÿ⫁çâ4nⰁâ݁‘âï‚âJè✁âýâ”Òâä8âäâӁQâ8oâ;p⁹üâ
[EMAIL PROTECTED]
ÈâÓÄ⁁¶â¨0â×â­é⁁êâöšâñƒâšâÿœâ¢
++⻁¤âBsâ)DâՁRâj⁻â†’⁡ÚâÛ‘⸁®â=⁴ âãy⁁ËâɁ⁈˜â·âþCâHðâÍ–â5Kâ
©âó†âsã⁁âÉâùìâGâׁ^âðo⁽⁎úâô‡â7ÑâôÙ⁊™âEt⁺¬â³

âè£â£Ûâåzâõˆâcáâöïâˁⁱñâ•âŸâêâ—ÓâØ†âÈânß⁁Í⮁⁁ÇâفfâÔâ¿âÎ9âú›âŒ¯â¥Ü⁣Ïâç{â÷ëâÀ«â÷‰â.m⁎°â́⁳òâMÐ⁁ âëý⁙ÕâہuâPà⁰âüíâÁⵁ¡âÑžâ
¯âk⁧Ýâìg⁁îâしâ3âé|âù‹âρ2âÞ•âµóâ*Îš¸š––VX–ùú’„˜™IBCocoaFramework††
 \ No newline at end of file
 diff -u -aruN unison.orig/unison-2.13.16/uimac/MyController.h 
unison/unison-2.13.16/uimac/MyController.h
 --- unison.orig/unison-2.13.16/uimac/MyController.h    2005-03-18 
15:33:18.000000000 -0800
-+++ unison/unison-2.13.16/uimac/MyController.h 2005-08-31 16:46:32.000000000 
-0700
++++ unison/unison-2.13.16/uimac/MyController.h 2005-09-06 09:00:16.000000000 
-0700
 @@ -12,6 +12,9 @@
  {
      IBOutlet NSWindow *mainWindow;
@@ -849,7 +857,7 @@
      IBOutlet NSTextField *passwordText;
 diff -u -aruN unison.orig/unison-2.13.16/uimac/MyController.m 
unison/unison-2.13.16/uimac/MyController.m
 --- unison.orig/unison-2.13.16/uimac/MyController.m    2005-03-20 
19:25:50.000000000 -0800
-+++ unison/unison-2.13.16/uimac/MyController.m 2005-08-31 16:46:32.000000000 
-0700
++++ unison/unison-2.13.16/uimac/MyController.m 2005-09-06 09:00:16.000000000 
-0700
 @@ -74,6 +74,8 @@
          [reconItems insertObject:[ReconItem 
initWithRi:Field(caml_reconItems,j)]
              atIndex:j];
@@ -890,7 +898,7 @@
          name:NSThreadWillExitNotification object:nil];
 diff -u -aruN unison.orig/unison-2.9.1/Makefile.OCaml 
unison/unison-2.9.1/Makefile.OCaml
 --- unison.orig/unison-2.9.1/Makefile.OCaml    2002-04-10 22:13:23.000000000 
-0700
-+++ unison/unison-2.9.1/Makefile.OCaml 2005-08-29 20:27:29.000000000 -0700
++++ unison/unison-2.9.1/Makefile.OCaml 2005-09-06 09:00:16.000000000 -0700
 @@ -25,7 +25,7 @@
  
  ifeq (${OSCOMP},cygwingnuc) # Define this if compiling with Cygwin GNU C
@@ -940,7 +948,7 @@
          STATICLIBS+=-cclib -llablgtk \
 diff -u -aruN unison.orig/unison-2.9.1/ubase/uprintf.ml 
unison/unison-2.9.1/ubase/uprintf.ml
 --- unison.orig/unison-2.9.1/ubase/uprintf.ml  2002-04-10 22:13:23.000000000 
-0700
-+++ unison/unison-2.9.1/ubase/uprintf.ml       2005-08-29 20:27:29.000000000 
-0700
++++ unison/unison-2.9.1/ubase/uprintf.ml       2005-09-06 09:00:16.000000000 
-0700
 @@ -10,8 +10,8 @@
  (*                                                                     *)
  (***********************************************************************)
@@ -954,7 +962,7 @@
    let format = (Obj.magic format : string) in
 diff -u -aruN unison.orig/unison-2.9.1/ubase/util.ml 
unison/unison-2.9.1/ubase/util.ml
 --- unison.orig/unison-2.9.1/ubase/util.ml     2002-04-10 22:13:23.000000000 
-0700
-+++ unison/unison-2.9.1/ubase/util.ml  2005-08-29 20:27:29.000000000 -0700
++++ unison/unison-2.9.1/ubase/util.ml  2005-09-06 09:00:16.000000000 -0700
 @@ -329,19 +329,20 @@
  
(*****************************************************************************)
  

Index: unison.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/net/unison.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- unison.info 6 Sep 2005 17:49:51 -0000       1.5
+++ unison.info 8 Sep 2005 19:49:03 -0000       1.6
@@ -1,7 +1,7 @@
 Info2: <<
 Package: unison%type_pkg[uitype]
 Version: 2.13.16
-Revision: 1
+Revision: 2
 Type: uitype (. -nox -aqua)
 Description: File synchronization tool
 DescDetail: <<
@@ -144,9 +144,6 @@
   done
 <<
 PostInstScript: <<
-  [ -e /Applications/Fink ] || install -d -m 0755 /Applications/Fink
-  /bin/ln -sfn %p/Applications/Unison-2.13.app 
/Applications/Fink/Unison-2.13.app
-
   for dir in unison-2.9.1 unison-2.10.2 unison-2.13.16; do
     maj=`expr "$dir" : "unison-2.\([0-9]*\)"`
     pri=`echo $dir | sed -e 's/unison-//g' | sed -e 's/\./ /g' | xargs printf 
%%02d`
@@ -167,14 +164,14 @@
       if [ `expr "$maj" \> 12` == 1 ]; then
         update-alternatives --install %p/bin/unison-${ver} unison-${ver} 
%p/bin/unison-${ver}-aqua ${pri}6
         update-alternatives --install %p/bin/unison unison 
%p/bin/unison-${ver}-aqua ${pri}6
+        [ -e /Applications/Fink ] || install -d -m 0755 /Applications/Fink
+        /bin/ln -sfn %p/Applications/Unison-2.13.app 
/Applications/Fink/Unison-2.13.app
       fi
     fi
 
   done
 <<
 Prermscript: <<
-  rm -f /Applications/Fink/Unison-2.13.app
-  
   if [ $1 != "upgrade" ]; then
 
     for dir in unison-2.9.1 unison-2.10.2 unison-2.13.16; do
@@ -196,6 +193,7 @@
         if [ `expr "$maj" \> 12` == 1 ]; then
           update-alternatives --remove unison-${ver} %p/bin/unison-${ver}-aqua
           update-alternatives --remove unison %p/bin/unison-${ver}-aqua
+          rm -f /Applications/Fink/Unison-2.13.app
         fi
       fi
 



-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to