Hello community, here is the log from the commit of package unison for openSUSE:Factory checked in at 2013-01-14 12:04:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/unison (Old) and /work/SRC/openSUSE:Factory/.unison.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "unison", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/unison/unison.changes 2012-02-16 15:02:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.unison.new/unison.changes 2013-01-14 12:04:04.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Jan 14 08:05:03 UTC 2013 - [email protected] + +- Update to version 2.40.102: + + Upstream provides no changelog +- Uppercase name and a comment in unison.desktop + +------------------------------------------------------------------- Old: ---- unison-2.40.63-manual.html unison-2.40.63.tar.gz New: ---- unison-2.40.102-manual.html unison-2.40.102.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ unison.spec ++++++ --- /var/tmp/diff_new_pack.IMLRya/_old 2013-01-14 12:04:05.000000000 +0100 +++ /var/tmp/diff_new_pack.IMLRya/_new 2013-01-14 12:04:05.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package unison # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,9 +17,9 @@ Name: unison -Version: 2.40.63 +Version: 2.40.102 Release: 0 -Summary: A file synchronization tool +Summary: File synchronization tool License: GPL-3.0+ Group: Productivity/Networking/Other Url: http://www.cis.upenn.edu/~bcpierce/unison @@ -28,15 +28,11 @@ Source2: %{name}.desktop Source3: %{name}.png Patch0: build-fix-EG11.1.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gtk2-devel +BuildRequires: lablgtk2-devel BuildRequires: ncurses-devel BuildRequires: update-desktop-files -%if 0%{?suse_version} > 1020 -BuildRequires: lablgtk2-devel -%else -BuildRequires: lablgtk2 -%endif +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Unison is a file synchronization tool for Unix and Windows. It allows @@ -73,12 +69,9 @@ export NO_BRP_STRIP_DEBUG=true %endif -%clean -rm -rf %{buildroot} - %files %defattr(-,root,root) -%doc BUGS.txt CONTRIB COPYING NEWS README ROADMAP.txt TODO.txt unison-manual.html +%doc BUGS.txt CONTRIB COPYING NEWS README ROADMAP.txt unison-manual.html %{_datadir}/applications/* %{_datadir}/pixmaps/unison.png %{_bindir}/%{name} ++++++ unison-2.40.63-manual.html -> unison-2.40.102-manual.html ++++++ --- /work/SRC/openSUSE:Factory/unison/unison-2.40.63-manual.html 2011-09-23 12:49:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.unison.new/unison-2.40.102-manual.html 2013-01-14 12:04:04.000000000 +0100 @@ -36,7 +36,7 @@ <BR> <div id="manualheader"><DIV CLASS="center"><FONT SIZE=7><FONT COLOR=black>Unison File Synchronizer</FONT><BR> <FONT SIZE=6><FONT COLOR=black>User Manual and Reference Guide</FONT><BR> -<FONT SIZE=5>Version 2.40.61<BR> +<FONT SIZE=5>Version 2.40.65<BR> <FONT SIZE=4>Copyright 1998-2009, Benjamin C. Pierce </FONT></FONT></FONT></FONT></DIV></div><BR> <BR> @@ -105,7 +105,7 @@ <A HREF="#ssh"><FONT SIZE=4><B>Installing Ssh</B></FONT></A><BR> •<A HREF="#ssh-unix">Unix</A><BR> •<A HREF="#ssh-win">Windows</A><BR> -<A HREF="#news"><FONT SIZE=4><B>Changes in Version 2.40.61</B></FONT></A><BR> +<A HREF="#news"><FONT SIZE=4><B>Changes in Version 2.40.65</B></FONT></A><BR> </BLOCKQUOTE> @@ -399,7 +399,9 @@ <BR> You'll also need the GNU <TT>make</TT> utility, standard on many Unix systems. (Type <FONT SIZE=4><TT>make –version</TT></FONT> to check that you've got the -GNU version.)<BR> +GNU version.) Unison's build system is +not parallelizable, so don't use make flags which cause it to start +processes in parallel, e.g. -j for GNU make.<BR> <BR> Once you've got OCaml installed, grab a copy of the Unison sources, unzip and untar them, change to the new <FONT SIZE=4><TT>unison</TT></FONT> directory, and @@ -703,9 +705,7 @@ The standard remote shell facility on Unix systems is <CODE>ssh</CODE>, which provides the same functionality as the older <CODE>rsh</CODE> but much better security. Ssh is available from -<A HREF="ftp://ftp.cs.hut.fi/pub/ssh/";><TT>ftp://ftp.cs.hut.fi/pub/ssh/</TT></A>; up-to-date binaries for some -architectures can also be found at -<A HREF="ftp://ftp.faqs.org/ssh/contrib";><TT>ftp://ftp.faqs.org/ssh/contrib</TT></A>. See section <A HREF="#ssh-win">A.2</A> +<A HREF="http://www.openssh.org";><TT>http://www.openssh.org</TT></A>. See section <A HREF="#ssh-win">A.2</A> for installation instructions for the Windows version.<BR> <BR> Running @@ -2144,7 +2144,7 @@ state” of the replicas. (These three options are provided for later compatibility with the Harmony data synchronizer.) </UL> -To accomodate the wide variety of programs that users might want to use for +To accommodate the wide variety of programs that users might want to use for merging, Unison checks for several possible situations when the merge program exits: <UL CLASS="itemize"><LI CLASS="li-itemize"> @@ -2707,9 +2707,9 @@ <LI CLASS="li-enumerate">You can now delete the directory <CODE>Foo</CODE> and its contents. </OL> Some people have reported problems using Cygwin's ssh with Unison. If -you have trouble, you might try this one instead: +you have trouble, you might try other ones instead: <PRE CLASS="verbatim"> - http://opensores.thebunker.net/pub/mirrors/ssh/contrib/ssh-1.2.14-win32bin.zip + http://linuxmafia.com/ssh/win32.html </PRE><BR> <BR> <LI CLASS="li-enumerate">You must set the environment variables HOME and PATH. @@ -2753,9 +2753,9 @@ hosts, provide your remote user name when providing the remote root (i.e., <CODE>//username@host/path...</CODE>). </OL> -<hr><!--TOC section Changes in Version 2.40.61--> +<hr><!--TOC section Changes in Version 2.40.65--> -<H2 CLASS="section"><A NAME="news"></A>Changes in Version 2.40.61</H2><!--SEC END --> +<H2 CLASS="section"><A NAME="news"></A>Changes in Version 2.40.65</H2><!--SEC END --> Changes since 2.40.1: <UL CLASS="itemize"><LI CLASS="li-itemize"> @@ -4497,7 +4497,7 @@ (We used to change the link itself, which doesn't fit our assertion that 'follow' means the link is completely invisible) <LI CLASS="li-itemize">When one root did not exist, propagating the other root on top of it - used to fail, becuase unison could not calculate the working directory + used to fail, because unison could not calculate the working directory into which to write changes. This should be fixed. </UL> </UL><BR> @@ -4594,7 +4594,7 @@ ignore = <regexp> </PRE>in your profile (<TT>.unison/default.prf</TT>), you should put: <PRE CLASS="verbatim"> - ignore = Regexp <regexp> + ignore = Regex <regexp> </PRE>Moreover, two other styles of pattern are also recognized: <PRE CLASS="verbatim"> ignore = Name <name> ++++++ unison-2.40.63.tar.gz -> unison-2.40.102.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unison-2.40.63/Makefile.OCaml new/unison-2.40.102/Makefile.OCaml --- old/unison-2.40.63/Makefile.OCaml 2011-04-16 22:35:38.000000000 +0200 +++ new/unison-2.40.102/Makefile.OCaml 2012-09-17 16:09:03.000000000 +0200 @@ -217,7 +217,7 @@ lwt/pqueue.cmo lwt/lwt.cmo lwt/lwt_util.cmo \ lwt/$(SYSTEM)/lwt_unix_impl.cmo lwt/lwt_unix.cmo \ \ - case.cmo pred.cmo uutil.cmo \ + uutil.cmo case.cmo pred.cmo \ fileutil.cmo name.cmo path.cmo fspath.cmo fs.cmo fingerprint.cmo \ abort.cmo osx.cmo external.cmo \ props.cmo fileinfo.cmo os.cmo lock.cmo clroot.cmo common.cmo \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unison-2.40.63/case.ml new/unison-2.40.102/case.ml --- old/unison-2.40.63/case.ml 2010-04-15 19:29:31.000000000 +0200 +++ new/unison-2.40.102/case.ml 2012-09-17 16:09:03.000000000 +0200 @@ -140,7 +140,7 @@ method mode = Sensitive method modeDesc = "case sensitive" method compare s s' = compare (s : string) s' - method hash s = Hashtbl.hash s + method hash s = Uutil.hash s method normalizePattern s = s method caseInsensitiveMatch = false method normalizeMatchedString s = s @@ -152,7 +152,7 @@ method mode = Insensitive method modeDesc = "Latin-1 case insensitive" method compare s s' = Util.nocase_cmp s s' - method hash s = Hashtbl.hash (String.lowercase s) + method hash s = Uutil.hash (String.lowercase s) method normalizePattern s = s method caseInsensitiveMatch = true method normalizeMatchedString s = s @@ -164,7 +164,7 @@ method mode = UnicodeSensitive method modeDesc = "Unicode case sensitive" method compare s s' = Unicode.case_sensitive_compare s s' - method hash s = Hashtbl.hash (Unicode.decompose s) + method hash s = Uutil.hash (Unicode.decompose s) method normalizePattern p = Unicode.decompose p method caseInsensitiveMatch = false method normalizeMatchedString s = Unicode.decompose s @@ -176,7 +176,7 @@ method mode = UnicodeInsensitive method modeDesc = "Unicode case insensitive" method compare s s' = Unicode.case_insensitive_compare s s' - method hash s = Hashtbl.hash (Unicode.normalize s) + method hash s = Uutil.hash (Unicode.normalize s) method normalizePattern p = Unicode.normalize p method caseInsensitiveMatch = false method normalizeMatchedString s = Unicode.normalize s diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unison-2.40.63/fspath.ml new/unison-2.40.102/fspath.ml --- old/unison-2.40.63/fspath.ml 2010-04-15 19:29:31.000000000 +0200 +++ new/unison-2.40.102/fspath.ml 2012-09-17 16:09:03.000000000 +0200 @@ -335,4 +335,3 @@ let quotes (Fspath f) = Uutil.quotes f let compare (Fspath f1) (Fspath f2) = compare f1 f2 -let hash (Fspath f) = Hashtbl.hash f diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unison-2.40.63/fspath.mli new/unison-2.40.102/fspath.mli --- old/unison-2.40.63/fspath.mli 2010-04-15 19:29:31.000000000 +0200 +++ new/unison-2.40.102/fspath.mli 2012-09-17 16:09:03.000000000 +0200 @@ -33,5 +33,3 @@ (* CASE-SENSITIVE comparison between fspaths *) val compare : t -> t -> int -(* CASE-SENSITIVE hash of a fspath *) -val hash : t -> int diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unison-2.40.63/mkProjectInfo.ml new/unison-2.40.102/mkProjectInfo.ml --- old/unison-2.40.63/mkProjectInfo.ml 2011-04-16 22:35:38.000000000 +0200 +++ new/unison-2.40.102/mkProjectInfo.ml 2012-09-17 16:09:03.000000000 +0200 @@ -42,7 +42,7 @@ (* ---------------------------------------------------------------------- *) (* You shouldn't need to edit below. *) -let revisionString = "$Rev: 472 $";; +let revisionString = "$Rev: 511 $";; (* BCP (1/10): This bit was added to help with getting Unison via bazaar, but it was never used much and I'm not confident it's working. I'll comment it out @@ -97,3 +97,6 @@ Printf.printf "VERSION=%d.%d.%d\n" majorVersion minorVersion pointVersion;; Printf.printf "NAME=%s\n" projectName;; + + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unison-2.40.63/path.ml new/unison-2.40.102/path.ml --- old/unison-2.40.63/path.ml 2010-04-15 19:29:31.000000000 +0200 +++ new/unison-2.40.102/path.ml 2012-09-17 16:09:03.000000000 +0200 @@ -202,10 +202,6 @@ assert (not (isEmpty path)); prefix ^ path -(* No need to perform case normalization on local paths *) -let hash p = Hashtbl.hash p -let equal (p1 : local) (p2 : local) = p1 = p2 - (* Pref controlling whether symlinks are followed. *) let followPred = Pred.create ~advanced:true "follow" ("Including the preference \\texttt{-follow \\ARG{pathspec}} causes Unison to \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unison-2.40.63/path.mli new/unison-2.40.102/path.mli --- old/unison-2.40.63/path.mli 2010-04-15 19:29:31.000000000 +0200 +++ new/unison-2.40.102/path.mli 2012-09-17 16:09:03.000000000 +0200 @@ -31,8 +31,6 @@ val addPrefixToFinalName : local -> string -> local val compare : t -> t -> int -val equal : local -> local -> bool -val hash : local -> int val followLink : local -> bool val followPred : Pred.t diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unison-2.40.63/props.ml new/unison-2.40.102/props.ml --- old/unison-2.40.63/props.ml 2010-04-15 19:29:31.000000000 +0200 +++ new/unison-2.40.102/props.ml 2012-09-17 16:09:03.000000000 +0200 @@ -305,7 +305,7 @@ (match id with IdIgnored -> -1 | IdNumeric i -> i - | IdNamed nm -> Hashtbl.hash nm) + | IdNamed nm -> Uutil.hash nm) h let similar id id' = @@ -609,7 +609,7 @@ let dummy = None -let hash t h = Uutil.hash2 (Hashtbl.hash t) h +let hash t h = Uutil.hash2 (Uutil.hash t) h let similar t t' = not (Prefs.read Osx.rsrc) || t = t' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unison-2.40.63/uimacnew09/English.lproj/MainMenu.xib new/unison-2.40.102/uimacnew09/English.lproj/MainMenu.xib --- old/unison-2.40.63/uimacnew09/English.lproj/MainMenu.xib 2010-04-15 19:29:31.000000000 +0200 +++ new/unison-2.40.102/uimacnew09/English.lproj/MainMenu.xib 2011-07-19 16:47:51.000000000 +0200 @@ -2,10 +2,10 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">10C540</string> - <string key="IBDocument.InterfaceBuilderVersion">740</string> - <string key="IBDocument.AppKitVersion">1038.25</string> - <string key="IBDocument.HIToolboxVersion">458.00</string> + <string key="IBDocument.SystemVersion">10K540</string> + <string key="IBDocument.InterfaceBuilderVersion">823</string> + <string key="IBDocument.AppKitVersion">1038.36</string> + <string key="IBDocument.HIToolboxVersion">461.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray" key="dict.sortedKeys"> @@ -15,14 +15,14 @@ </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> - <string>740</string> - <string>1.2.2</string> + <string>823</string> + <string>1.2.5</string> </object> </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="590"/> <integer value="29"/> + <integer value="589"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -30,13 +30,8 @@ <string>com.brandonwalkin.BWToolkit</string> </object> <object class="NSMutableDictionary" key="IBDocument.Metadata"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys" id="0"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <string key="NS.key.0">PluginDependencyRecalculationVersion</string> + <integer value="1" key="NS.object.0"/> </object> <object class="NSMutableArray" key="IBDocument.RootObjects" id="892182555"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -720,7 +715,6 @@ <reference key="NSHScroller" ref="370050818"/> <reference key="NSContentView" ref="629016622"/> <reference key="NSHeaderClipView" ref="214885356"/> - <reference key="NSCornerView" ref="626227720"/> <bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes> </object> </object> @@ -751,7 +745,7 @@ <object class="NSTableView" id="809169243"> <reference key="NSNextResponder" ref="674056095"/> <int key="NSvFlags">256</int> - <string key="NSFrameSize">{730, 410}</string> + <string key="NSFrameSize">{730, 411}</string> <reference key="NSSuperview" ref="674056095"/> <bool key="NSEnabled">YES</bool> <object class="NSTableHeaderView" key="NSHeaderView" id="285438200"> @@ -941,7 +935,7 @@ <int key="NSTableViewDraggingDestinationStyle">0</int> </object> </object> - <string key="NSFrame">{{0, 17}, {730, 410}}</string> + <string key="NSFrame">{{0, 17}, {730, 411}}</string> <reference key="NSSuperview" ref="319719388"/> <reference key="NSNextKeyView" ref="809169243"/> <reference key="NSDocView" ref="809169243"/> @@ -983,7 +977,7 @@ </object> <reference ref="971941000"/> </object> - <string key="NSFrameSize">{730, 427}</string> + <string key="NSFrameSize">{730, 428}</string> <reference key="NSSuperview" ref="398078791"/> <reference key="NSNextKeyView" ref="674056095"/> <int key="NSsFlags">528</int> @@ -1006,7 +1000,7 @@ <reference key="NSSuperview" ref="700068909"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="900780132"> - <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags">69336577</int> <int key="NSCellFlags2">272760832</int> <string key="NSContents">Label</string> <reference key="NSSupport" ref="26"/> @@ -1041,6 +1035,7 @@ <bool key="BWGBHasTopBorder">NO</bool> <bool key="BWGBHasBottomBorder">YES</bool> <bool key="BWGBHasGradient">YES</bool> + <bool key="BWGBHasFillColor">NO</bool> <float key="BWGBTopInsetAlpha">0.30000001192092896</float> <float key="BWGBBottomInsetAlpha">0.0</float> </object> @@ -1051,7 +1046,9 @@ <bool key="BWSVColorIsEnabled">NO</bool> <object class="NSMutableDictionary" key="BWSVMinValues"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference key="dict.sortedKeys" ref="0"/> + <object class="NSArray" key="dict.sortedKeys" id="0"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> </object> @@ -1522,6 +1519,7 @@ <bool key="BWGBHasTopBorder">NO</bool> <bool key="BWGBHasBottomBorder">NO</bool> <bool key="BWGBHasGradient">YES</bool> + <bool key="BWGBHasFillColor">NO</bool> <float key="BWGBTopInsetAlpha">0.30000001192092896</float> <float key="BWGBBottomInsetAlpha">0.0</float> </object> @@ -5144,7 +5142,7 @@ <string>{{345, 795}, {363, 281}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <boolean value="YES"/> - <string>{{357, 361}, {730, 546}}</string> + <string>{{289, 361}, {730, 546}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <boolean value="YES"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -5501,6 +5499,75 @@ <string>id</string> </object> </object> + <object class="NSMutableDictionary" key="actionInfosByName"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>copyLR:</string> + <string>copyRL:</string> + <string>forceNewer:</string> + <string>forceOlder:</string> + <string>ignoreExt:</string> + <string>ignoreName:</string> + <string>ignorePath:</string> + <string>leaveAlone:</string> + <string>merge:</string> + <string>revert:</string> + <string>selectConflicts:</string> + <string>showDiff:</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBActionInfo"> + <string key="name">copyLR:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">copyRL:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">forceNewer:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">forceOlder:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">ignoreExt:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">ignoreName:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">ignorePath:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">leaveAlone:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">merge:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">revert:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">selectConflicts:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">showDiff:</string> + <string key="candidateClassName">id</string> + </object> + </object> + </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBUserSource</string> <string key="minorKey"/> @@ -5556,6 +5623,110 @@ <string>id</string> </object> </object> + <object class="NSMutableDictionary" key="actionInfosByName"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>cancelProfileButton:</string> + <string>checkOpenProfileChanged:</string> + <string>chooseFont:</string> + <string>cltoolNoButton:</string> + <string>cltoolYesButton:</string> + <string>createButton:</string> + <string>endPasswordWindow:</string> + <string>installCommandLineTool:</string> + <string>onlineHelp:</string> + <string>openButton:</string> + <string>raiseAboutWindow:</string> + <string>raiseCltoolWindow:</string> + <string>raiseWindow:</string> + <string>rescan:</string> + <string>restartButton:</string> + <string>saveProfileButton:</string> + <string>showPreferences:</string> + <string>syncButton:</string> + <string>tableModeChanged:</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBActionInfo"> + <string key="name">cancelProfileButton:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">checkOpenProfileChanged:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">chooseFont:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">cltoolNoButton:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">cltoolYesButton:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">createButton:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">endPasswordWindow:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">installCommandLineTool:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">onlineHelp:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">openButton:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">raiseAboutWindow:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">raiseCltoolWindow:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">raiseWindow:</string> + <string key="candidateClassName">NSWindow</string> + </object> + <object class="IBActionInfo"> + <string key="name">rescan:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">restartButton:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">saveProfileButton:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">showPreferences:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">syncButton:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">tableModeChanged:</string> + <string key="candidateClassName">id</string> + </object> + </object> + </object> <object class="NSMutableDictionary" key="outlets"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray" key="dict.sortedKeys"> @@ -5633,6 +5804,185 @@ <string>NSTextField</string> </object> </object> + <object class="NSMutableDictionary" key="toOneOutletInfosByName"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>ConnectingView</string> + <string>aboutWindow</string> + <string>checkOpenProfile</string> + <string>chooseDetailsFont</string> + <string>chooseDiffFont</string> + <string>chooseProfileView</string> + <string>cltoolPref</string> + <string>cltoolWindow</string> + <string>connectingAnimation</string> + <string>detailsFontLabel</string> + <string>detailsTextView</string> + <string>diffFontLabel</string> + <string>diffView</string> + <string>diffWindow</string> + <string>fontChangeTarget</string> + <string>mainWindow</string> + <string>notificationController</string> + <string>passwordCancelButton</string> + <string>passwordPrompt</string> + <string>passwordText</string> + <string>passwordWindow</string> + <string>preferencesController</string> + <string>preferencesView</string> + <string>preferencesWindow</string> + <string>profileBox</string> + <string>profileController</string> + <string>progressBar</string> + <string>splitView</string> + <string>statusText</string> + <string>tableModeSelector</string> + <string>tableView</string> + <string>updatesText</string> + <string>updatesView</string> + <string>versionText</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBToOneOutletInfo"> + <string key="name">ConnectingView</string> + <string key="candidateClassName">NSView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">aboutWindow</string> + <string key="candidateClassName">NSWindow</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">checkOpenProfile</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">chooseDetailsFont</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">chooseDiffFont</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">chooseProfileView</string> + <string key="candidateClassName">NSView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">cltoolPref</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">cltoolWindow</string> + <string key="candidateClassName">NSWindow</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">connectingAnimation</string> + <string key="candidateClassName">NSProgressIndicator</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">detailsFontLabel</string> + <string key="candidateClassName">NSTextField</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">detailsTextView</string> + <string key="candidateClassName">NSTextField</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">diffFontLabel</string> + <string key="candidateClassName">NSTextField</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">diffView</string> + <string key="candidateClassName">NSTextView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">diffWindow</string> + <string key="candidateClassName">NSWindow</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">fontChangeTarget</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">mainWindow</string> + <string key="candidateClassName">NSWindow</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">notificationController</string> + <string key="candidateClassName">NotificationController</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">passwordCancelButton</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">passwordPrompt</string> + <string key="candidateClassName">NSTextField</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">passwordText</string> + <string key="candidateClassName">NSTextField</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">passwordWindow</string> + <string key="candidateClassName">NSWindow</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">preferencesController</string> + <string key="candidateClassName">PreferencesController</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">preferencesView</string> + <string key="candidateClassName">NSView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">preferencesWindow</string> + <string key="candidateClassName">NSWindow</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">profileBox</string> + <string key="candidateClassName">NSComboBox</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">profileController</string> + <string key="candidateClassName">ProfileController</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">progressBar</string> + <string key="candidateClassName">NSProgressIndicator</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">splitView</string> + <string key="candidateClassName">NSSplitView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">statusText</string> + <string key="candidateClassName">NSTextField</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">tableModeSelector</string> + <string key="candidateClassName">NSSegmentedControl</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">tableView</string> + <string key="candidateClassName">ReconTableView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">updatesText</string> + <string key="candidateClassName">NSTextField</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">updatesView</string> + <string key="candidateClassName">NSView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">versionText</string> + <string key="candidateClassName">NSTextField</string> + </object> + </object> + </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> <string key="minorKey">MyController.h</string> @@ -5703,6 +6053,30 @@ <string>id</string> </object> </object> + <object class="NSMutableDictionary" key="actionInfosByName"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>anyEnter:</string> + <string>localClick:</string> + <string>remoteClick:</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBActionInfo"> + <string key="name">anyEnter:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">localClick:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">remoteClick:</string> + <string key="candidateClassName">id</string> + </object> + </object> + </object> <object class="NSMutableDictionary" key="outlets"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray" key="dict.sortedKeys"> @@ -5726,6 +6100,50 @@ <string>NSTextField</string> </object> </object> + <object class="NSMutableDictionary" key="toOneOutletInfosByName"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>firstRootText</string> + <string>localButtonCell</string> + <string>profileNameText</string> + <string>remoteButtonCell</string> + <string>secondRootHost</string> + <string>secondRootText</string> + <string>secondRootUser</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBToOneOutletInfo"> + <string key="name">firstRootText</string> + <string key="candidateClassName">NSTextField</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">localButtonCell</string> + <string key="candidateClassName">NSButtonCell</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">profileNameText</string> + <string key="candidateClassName">NSTextField</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">remoteButtonCell</string> + <string key="candidateClassName">NSButtonCell</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">secondRootHost</string> + <string key="candidateClassName">NSTextField</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">secondRootText</string> + <string key="candidateClassName">NSTextField</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">secondRootUser</string> + <string key="candidateClassName">NSTextField</string> + </object> + </object> + </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> <string key="minorKey">PreferencesController.h</string> @@ -5746,6 +6164,13 @@ <string key="NS.key.0">tableView</string> <string key="NS.object.0">NSTableView</string> </object> + <object class="NSMutableDictionary" key="toOneOutletInfosByName"> + <string key="NS.key.0">tableView</string> + <object class="IBToOneOutletInfo" key="NS.object.0"> + <string key="name">tableView</string> + <string key="candidateClassName">NSTableView</string> + </object> + </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> <string key="minorKey">ProfileController.h</string> @@ -5766,6 +6191,13 @@ <string key="NS.key.0">myController</string> <string key="NS.object.0">MyController</string> </object> + <object class="NSMutableDictionary" key="toOneOutletInfosByName"> + <string key="NS.key.0">myController</string> + <object class="IBToOneOutletInfo" key="NS.object.0"> + <string key="name">myController</string> + <string key="candidateClassName">MyController</string> + </object> + </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> <string key="minorKey">ProfileTableView.h</string> @@ -5815,6 +6247,75 @@ <string>id</string> </object> </object> + <object class="NSMutableDictionary" key="actionInfosByName"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>copyLR:</string> + <string>copyRL:</string> + <string>forceNewer:</string> + <string>forceOlder:</string> + <string>ignoreExt:</string> + <string>ignoreName:</string> + <string>ignorePath:</string> + <string>leaveAlone:</string> + <string>merge:</string> + <string>revert:</string> + <string>selectConflicts:</string> + <string>showDiff:</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBActionInfo"> + <string key="name">copyLR:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">copyRL:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">forceNewer:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">forceOlder:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">ignoreExt:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">ignoreName:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">ignorePath:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">leaveAlone:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">merge:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">revert:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">selectConflicts:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">showDiff:</string> + <string key="candidateClassName">id</string> + </object> + </object> + </object> <reference key="sourceIdentifier" ref="716125380"/> </object> <object class="IBPartialClassDescription"> @@ -5859,6 +6360,13 @@ <string key="NS.key.0">toggleCollapse:</string> <string key="NS.object.0">id</string> </object> + <object class="NSMutableDictionary" key="actionInfosByName"> + <string key="NS.key.0">toggleCollapse:</string> + <object class="IBActionInfo" key="NS.object.0"> + <string key="name">toggleCollapse:</string> + <string key="candidateClassName">id</string> + </object> + </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBFrameworkSource</string> <string key="minorKey">BWToolkitFramework.framework/Headers/BWSplitView.h</string> @@ -5910,6 +6418,7 @@ </object> </object> <int key="IBDocument.localizationMode">0</int> + <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string> <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string> <integer value="1050" key="NS.object.0"/> @@ -5925,5 +6434,30 @@ <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> <string key="IBDocument.LastKnownRelativeProjectPath">../uimacnew.xcodeproj</string> <int key="IBDocument.defaultPropertyAccessControl">3</int> + <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>NSMenuCheckmark</string> + <string>NSMenuMixedState</string> + <string>NSPreferencesGeneral</string> + <string>NSSwitch</string> + <string>Outline-Deep</string> + <string>Outline-Flat</string> + <string>Outline-Flattened</string> + <string>Unison</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>{9, 8}</string> + <string>{7, 2}</string> + <string>{32, 32}</string> + <string>{15, 15}</string> + <string>{24, 16}</string> + <string>{24, 16}</string> + <string>{24, 16}</string> + <string>{128, 128}</string> + </object> + </object> </data> </archive> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unison-2.40.63/uimacnew09/uimacnew.xcodeproj/project.pbxproj new/unison-2.40.102/uimacnew09/uimacnew.xcodeproj/project.pbxproj --- old/unison-2.40.63/uimacnew09/uimacnew.xcodeproj/project.pbxproj 2010-04-15 19:29:31.000000000 +0200 +++ new/unison-2.40.102/uimacnew09/uimacnew.xcodeproj/project.pbxproj 2011-07-19 16:47:51.000000000 +0200 @@ -400,7 +400,14 @@ isa = PBXProject; buildConfigurationList = 2A3C3F2C0992245300E404E9 /* Build configuration list for PBXProject "uimacnew" */; compatibilityVersion = "Xcode 3.1"; + developmentRegion = English; hasScannedForEncodings = 1; + knownRegions = ( + English, + Japanese, + French, + German, + ); mainGroup = 29B97314FDCFA39411CA2CEA /* uimac */; projectDirPath = ""; projectRoot = ""; @@ -697,6 +704,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2E282CCC0D9AE2E800439D01 /* ExternalSettings.xcconfig */; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; FRAMEWORK_SEARCH_PATHS = "Frameworks/**"; LIBRARY_SEARCH_PATHS = ""; SDKROOT = macosx10.5; @@ -708,6 +716,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2E282CCC0D9AE2E800439D01 /* ExternalSettings.xcconfig */; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; FRAMEWORK_SEARCH_PATHS = "Frameworks/**"; LIBRARY_SEARCH_PATHS = ""; SDKROOT = macosx10.5; @@ -719,6 +728,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2E282CCC0D9AE2E800439D01 /* ExternalSettings.xcconfig */; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; FRAMEWORK_SEARCH_PATHS = "Frameworks/**"; LIBRARY_SEARCH_PATHS = ""; SDKROOT = macosx10.5; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unison-2.40.63/update.ml new/unison-2.40.102/update.ml --- old/unison-2.40.63/update.ml 2010-04-15 19:29:31.000000000 +0200 +++ new/unison-2.40.102/update.ml 2012-09-17 16:09:03.000000000 +0200 @@ -248,9 +248,9 @@ (checkArchive false (n :: path) a h)) children (Props.hash desc h) | ArchiveFile (desc, dig, _, ress) -> - Uutil.hash2 (Hashtbl.hash dig) (Props.hash desc h) + Uutil.hash2 (Uutil.hash dig) (Props.hash desc h) | ArchiveSymlink content -> - Uutil.hash2 (Hashtbl.hash content) h + Uutil.hash2 (Uutil.hash content) h | NoArchive -> 135 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unison-2.40.63/uutil.ml new/unison-2.40.102/uutil.ml --- old/unison-2.40.63/uutil.ml 2010-04-15 19:29:31.000000000 +0200 +++ new/unison-2.40.102/uutil.ml 2012-09-17 16:09:03.000000000 +0200 @@ -34,6 +34,10 @@ let hash2 x y = (17 * x + 257 * y) land 0x3FFFFFFF +external hash_param : int -> int -> 'a -> int = "caml_hash_univ_param" "noalloc" + +let hash x = hash_param 10 100 x + (*****************************************************************************) (* File sizes *) (*****************************************************************************) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unison-2.40.63/uutil.mli new/unison-2.40.102/uutil.mli --- old/unison-2.40.63/uutil.mli 2010-04-15 19:29:31.000000000 +0200 +++ new/unison-2.40.102/uutil.mli 2012-09-17 16:09:03.000000000 +0200 @@ -13,6 +13,8 @@ (* Hashing *) val hash2 : int -> int -> int +(* Hash function (OCaml 3.x version) *) +val hash : 'a -> int module type FILESIZE = sig type t ++++++ unison.desktop ++++++ --- /var/tmp/diff_new_pack.IMLRya/_old 2013-01-14 12:04:06.000000000 +0100 +++ /var/tmp/diff_new_pack.IMLRya/_new 2013-01-14 12:04:06.000000000 +0100 @@ -1,5 +1,6 @@ [Desktop Entry] Type=Application Exec=unison -Name=unison +Name=Unison +Comment=File synchronization tool Icon=unison -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
