From 0aab22722a2eb968010d3f7615f6d9001a11f408 Mon Sep 17 00:00:00 2001
From: yomguy <yomguy@parisson.com>
Date: Mon, 9 May 2011 12:26:02 +0200
Subject: [PATCH] update install procedure

---
 INSTALL                                   |  19 ++++++-------------
 telemeta/htdocs/images/adv_search_red.png | Bin 1326 -> 1375 bytes
 telemeta/templatetags/paginator.py        |   2 +-
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/INSTALL b/INSTALL
index bbe81eb6..38ddc927 100644
--- a/INSTALL
+++ b/INSTALL
@@ -23,8 +23,7 @@ Install the dependencies
 
     Install all dependencies like this::
 	
-        sudo aptitude install python python-xml python-mutagen python-django \
-                              python-imaging python-mysqldb mysql-server python-numpy python-scipy \
+        sudo aptitude install python python-django python-xml python-mysqldb mysql-server \
                               python-ctypes python-setuptools python-support python-docutils
 
     To get MP3 reading and writing, just add these lines to your /etc/apt/sources-list::
@@ -44,20 +43,14 @@ Install the dependencies
 Install TimeSide
 -----------------
 
-In order to get all the Web Audio Components from TimeSide,
-you have to download and install it from source.
+Telemeta needs the audio processing library named TimeSide.
+You have to download and install it from source.
 
-So, checkout the last archive at :
+So, download the last archive at :
 http://code.google.com/p/timeside/downloads/list
 
-Install it like in the following example::
-
-    tar xzf timeside-0.2.tar.gz
-    cd timeside-0.2
-
-Read the README and INSTALL file, install dependencies and then::
-
-    sudo python setup.py install
+Uncompress it and see README and INSTALL to install the dependencies 
+and then the module.
 
 
 Install JSON-RPC server
diff --git a/telemeta/htdocs/images/adv_search_red.png b/telemeta/htdocs/images/adv_search_red.png
index 566e83a686b1ba1ebd735cb892b7d587a10655d8..c73983a2b1591a550150b3e4a253735bcdb0a963 100644
GIT binary patch
delta 1323
zcmV+`1=RYk3f~HlMSleZNkl<ZSi|j>UyNN<8O48VpL74sFx(m2DJ`9*B{nTI8i)mS
z#FC<73=gKv6JcsHqgG8DW55I+h!0rt!H7IGR$5<pu(UDyV2CY-SWAd4U?Mco#@aSW
zn*L#W!I`<8Klk2q_VQt-WTsN=49t_RmveT$Z)dN)zI^N3@PEG!eOU1RQmGHSKY@Ew
zsUrZHO%A6FzcuWP()r&v8rjE2;H$-=iuPwD?GW?|NC8V0NMJw)a+?S{bNjL9TCL&v
z5J+a-xL6dh3D_H?n+rgjL@5MPP{F1kDV0bi2N2R75jL(4;qb{AYafZgsw7#Dy|*AO
zDM>C$>gw+1o_{S{7}&9c{wJU0j=nxhl?oS5osuUeNF{)t7Tj`E2!A{s<Ji1Q@RdU0
za9QeYlbnLS@W2Cn=b2}&x_Q^&Ag}D(XM;v<*JIq?4B<yFHX8Yy75HMI&=;g1v;zf6
z8?HF~rQN?`?{~Lh%*yra0l0nBCWcO*)`d6UbP8(OOMjX%9{OjDLvvPOW1;Z7cB$`r
z$(`NZ+Ii;8ti*?_i)f6EQEG4J=OgdViaoSq1!J`uwHT?zxcQ|l+jFf1!sQ>sy%h<8
zHaz&?tfZ{fqA@mA+Q!%zS*tZG{@MP13=|~_(z-j-v@~Y|DRcy|fV(zt24Me>f5O9^
zi+QM{Yk$_J?^in5mX`U$<J$qatG^$n2_&$_&^8|h5J(a?u3ZbjTSs1|ap@8<`(U5h
zzx@dSmaSd;el0U7X13-`V9dr-JUDma#MI5c^-Vf^dak<pz8^jY!1)s=xNJ<BeYOFO
zIXlv=Y5My8#iBQt%l`Evk9a0p&8ELs>G0O1<bSP6$*pE{R($WHk9x3N_ScF<-<l-b
z=5p@)3S{=acVi^jKJx6dvy#$6fxOwAwVsK?d-h;p+<tEy-k2|eUkuxgaa)&aHGVlT
z@PTq){?0U`daXvw=0c1IChgbeHI-I}5Y{Bg*3YG>`%5Jcl*{qyfdPLQo*o$RH_Byi
zDSwy!`9i_BC&|&?Bw07FS@53i>!ssOSRU=$+9eGgJI29XyF4;9r0NYf(B9R>+2hAK
z@YGZ69vtNStFJnOj_0`(TWujsMEKLqNix<G!gX(7!(8}}c3BldXCiIymcG6ugleZm
zMe>YX8`K0wV&qJW=gY9H8iD~O@N(UbnSY&U(zlPaT7SRhX$UZEPj<o!qj0QlGXab1
zcE=@~@u|3KF>)@(f4rUNzp?$ZMInq%z@eh_=}G&OMOYzeWy`*Mne@sz`@+0lL@Pt+
zG~5C#Z<l&fSkkc1PQXdQ&@j9)8e<NG+md8myY$@hBw1Ag>bC2)>h{s5z2)^h|9|V8
z3CzSIDO9B5klkq7zB2x)B>7U8w10J)7AunLF{*AeYBLh!(Mf6WSeCu^UrTT`On^u2
z>}rF4$bRcOso8>!9a7R3f;DaLmX<c{-o;6B=;9Txri70X7wx~KP|D%Xs#K_ifIulY
zN=qB|-Jg)2ui3*3LSVX`4;rc&tbeacg=r;J0B5jt0`94XaNu9|$bt|67_nc-q0+K@
zt05%q(=A$(oWs&l*f4DGUN8bob-_W|jRt(V8iG2eNz`l$ZhXgneEJ=-a5!WCG|BVv
z%-*pkO?5Fw7eMKhv9X{ETt-p)TMifBiSfP`D3chspQzb?o|6xJ6s(j&4kYEpAt(n=
h+Rc+OX8a$(zX3q>k+Y8ocD4Wj002ovPDHLkV1meNr4IlA

delta 1273
zcmV<V1P1%x3a$!}MSld-Nkl<ZSi|j>-;Z5Y6~{l{z0Z$(XF8oio1xljF-(LuC`2Mj
zA4G5@QJ<6qjUh4dL1TR2AMiy38e)8F;K6r-Av|bEL_@{CC_xgjmT3r6Vu;d~PHm?%
zoge4kv-j7Bb1O3?h<9L~bR{R}oa}w}{;adUYpo6c>!$xS_<yy!egONS2=^D#Q~+9=
z1ZND-7@o+|xnDI+`=J4Rsj5`jpOJJ-a8y76Sh7F@12T|oGCYy&A3Qr8E^P-OZt=LP
z1bh{EDoD4LKrOkD6m6x!fC5y<NFh0ZkUpE?-q{fTxRCS34+L;?jCWx_RZ26p<VsSI
z6o5T5GkpD#M}J7eA?MGWA%vh(qL2U%4&m@8Lip_)Ij@cb5H`PL`&c2(^dy&{0;p_C
ziM==7#Frm_m`~5m(dG;i?mX~>L@nKC`2OeXI&KT#3uXBL($TtGR0U9sJS>5jb2o7~
zqynN%>_nszJO%2(gG%Y}wg56bRCb$M5@8gdAa(a^s(&557eKHHHh}65_Hcqb#sMg<
zJs9rqO9&*Js@J0|iq3nW?)N*<lqLOspK@a2--|S>t4N}fD5WEJ7e)Q2wr$2r!@08b
z-Vj`ZHkyVX9zV|Qb8}lJ=adNX-68&##IAmyt2XCTdS=P~?#pd^dE7tHc`s1_^T&_V
ztgd#O0)PG8yE!s9$GO*D<Ls-i5{mBA)HKwaLexUl+8R3qt2X;a996H!FCTl1JX$yc
zAD^A&CkqR_^yHH~{ph3gHi@V|F#$HornTQ{pcxxr15OU@J1U866YH9uL>Q^Po|*!n
z?Dd!&Y2qCPXC(Qmtz~=ubV{pZXF+TK;-5JaY=1{}MK{~zQNH^+;e^eX#L(87eQ6C&
zZ7U61`|%~aS+k{4ilKKxsnAUgF>ZkgHUci&oX`2W4f~aCHKW-OLXf_9qxASKF;Yq$
z!l)8rlbeR3EGdejs{tdx4VzObG06F^C4BS6lunP`3ohB-Eu9{~fo$J7DXEqS*ScT`
z#DAhdA#@veP+kSir{rjBB82q}zq>8Q)q^4Idh@^N3tN(U$sSHgC$7S-fqko>SAnW)
z5E4;x2Cds%$XTzabgqP{=@48>H%v;mZooG(Ja{0+7yt1-9r9gOWy#*y1J5tR{EE#w
z>|3#?uG*~GT(Y&8GiP&t{mqn~w*9lcA%85d!--1z)P{Xa1s{`iXlUQ_5$UC~_W5m{
zhz^CY$8Z=pFex1@V5YI(T89O}g(Wz(oO1%goiQGnl%72h<IOd&Vtd8bihXimf9EeL
zy*xI+X4@-;zEoYXn}O}?$8V2u?gr`Cvqe$$C9mYH6`N(7D><LskiI?Nwy(Tz2!Gzo
z*1^kmo8Dvmg8jE$(qIVpPDybh1Zz~@E$tuJNB6~eV(~gnL_S1YwEs{*o#5_isqBY<
zy0e9|w7;?Mxl#JfMSE#S07mKjf?>LayQZab^e0q;TiCx2_f3cJ+-3X9jsO5$v7b-S
zAKFK!Lx__hcywrSg8j?zxh4DOJ8}j<mjy4#ZW{RFbO@RnL0q&g_~_gAkG6Efov^>#
zKaDA^wf3=37KIjb?hd<>cT5A<TP6KD!Q$IFe`N@2CD!a8U$lQeRvq{tc1Q{ddiz39
j0&m!Zg`8XdZ@|9*h?YeSR3p2s00000NkvXXu0mjf2{m<6

diff --git a/telemeta/templatetags/paginator.py b/telemeta/templatetags/paginator.py
index 42e63526..53b9398f 100644
--- a/telemeta/templatetags/paginator.py
+++ b/telemeta/templatetags/paginator.py
@@ -25,7 +25,7 @@ def paginator(context, adjacent_pages=2):
     if context.has_key('criteria'):
         criteria = context['criteria']
     else:
-        criteria =''
+        criteria = ''
         
     return {
         'page_obj': page_obj,
-- 
2.39.5