# HG changeset patch
# User Goffi <goffi@goffi.org>
# Date 1282123653 -28800
# Node ID 22cbd3837233bee3b9289005c8abc903c0c82c66
# Parent  12544ea2951fe84bcc7faad76cbc751f2f4bac37
updated INSTALL instruction (wokkel MUC branch merge)

diff -r 12544ea2951f -r 22cbd3837233 INSTALL
--- a/INSTALL	Wed Aug 18 17:27:15 2010 +0800
+++ b/INSTALL	Wed Aug 18 17:27:33 2010 +0800
@@ -8,7 +8,7 @@
 To use SàT, you will need to install:
 - twisted (http://twistedmatrix.com/trac/) which is found in most distributions, at least core, web and words must be installed
 - progressbar (http://pypi.python.org/pypi/progressbar/2.2) which can be installed with easy_install
-- wokkel (http://wokkel.ik.nu/), please read instructions on website to download/install. You must apply the patch found at http://wokkel.ik.nu/ticket/56
+- wokkel (http://wokkel.ik.nu/). /!\ the MUC branch (http://hg.ik.nu/ralphm/wokkel-muc-client-support-24-2) must be merged, please read instructions below
 - wxWidgets (www.wxwidgets.org) which is found in most distributions. The more recent the version is, the better.
 
 ** PATHS:
@@ -34,25 +34,26 @@
 progressbar can be installed with easy_install:
 > sudo easy_install progressbar
 
-Wokkel is a bit more complicated to install as we need to patch it:
+Wokkel is a bit more complicated to install as we need to merge two branches:
 
 First be sure that mercurial is installed
 > sudo aptitude install mercurial
 
-then we go to a directory where we can clone the repository and patch the sources. If you don't want to code on wokkel, you can do it in /tmp:
+then we go to a directory where we can clone the repositories and merge. If you don't want to code on wokkel, you can do it in /tmp:
 
 > cd /tmp
-> hg clone http://hg.ik.nu/wokkel
+> hg clone http://hg.ik.nu/wokkel wokkel
 
-now we need to download and use the patch:
+now we pull the other branch:
+> cd wokkel
+> hg pull -f http://hg.ik.nu/ralphm/wokkel-muc-client-support-24-2
 
-> cd wokkel/wokkel
-> wget http://wokkel.ik.nu/raw-attachment/ticket/56/patch
-> patch -p0 < patch
+time to merge and commit:
+> hg merge wokkel-muc-client-support-24
+> hg commit -m "Merged wokkel's MUC branch"
 
-now it's time to install:
+finally,we can install:
 
-> cd ..
 > sudo python setup.py install
 
 Everything is fine ? Ok let's add the paths.