From bc6b033ecf8eb456af936bfc58047b02ebe712e6 Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@webkeks.org>
Date: Mon, 15 Jun 2009 22:04:11 +0200
Subject: [PATCH] Forgot to remove some OS X stuff.

---
 data/nibs/Gajim.nib/classes.nib      |   4 -
 data/nibs/Gajim.nib/info.nib         |  24 ---
 data/nibs/Gajim.nib/keyedobjects.nib | Bin 7184 -> 0 bytes
 setup_osx.py                         | 223 ---------------------------
 4 files changed, 251 deletions(-)
 delete mode 100644 data/nibs/Gajim.nib/classes.nib
 delete mode 100644 data/nibs/Gajim.nib/info.nib
 delete mode 100644 data/nibs/Gajim.nib/keyedobjects.nib
 delete mode 100644 setup_osx.py

diff --git a/data/nibs/Gajim.nib/classes.nib b/data/nibs/Gajim.nib/classes.nib
deleted file mode 100644
index b9b4b09f6b..0000000000
--- a/data/nibs/Gajim.nib/classes.nib
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    IBClasses = ({CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }); 
-    IBVersion = 1; 
-}
\ No newline at end of file
diff --git a/data/nibs/Gajim.nib/info.nib b/data/nibs/Gajim.nib/info.nib
deleted file mode 100644
index 9cb6b534dc..0000000000
--- a/data/nibs/Gajim.nib/info.nib
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IBDocumentLocation</key>
-	<string>82 255 356 240 0 0 1280 832 </string>
-	<key>IBEditorPositions</key>
-	<dict>
-		<key>29</key>
-		<string>476 296 342 44 0 0 1280 832 </string>
-	</dict>
-	<key>IBFramework Version</key>
-	<string>446.1</string>
-	<key>IBOldestOS</key>
-	<integer>4</integer>
-	<key>IBOpenObjects</key>
-	<array>
-		<integer>289</integer>
-		<integer>29</integer>
-	</array>
-	<key>IBSystem Version</key>
-	<string>8S165</string>
-</dict>
-</plist>
diff --git a/data/nibs/Gajim.nib/keyedobjects.nib b/data/nibs/Gajim.nib/keyedobjects.nib
deleted file mode 100644
index f13f467bfe6fadf16da4c85320890c42da20822f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7184
zcmcgwd3+RAwm$b(?_J$pTeB|_!lDL9Lck=7m;?d=k{CK0Ng#BRB5Bg;4&5Dg;uVoy
z1Ox;`jKDAq<0vwS4#V&qL`76afpHr}MMOm0_my|5DjjecfA6o?{p+q<Rrj9tJKwog
zHO;|5G?tuv3J6f(zyxNnfE65*68(|dhQLfUQl5x^(Lgv<oEQr?mnVj6rmMBFXtm%e
z@QqjJsC8NG6D1&v+g=14*eB;@4>qRN`D1=Y9uocmPT(O0hCv401UZlk<DdX4U@A1j
zESL>*pcQTb28&=REQ6JBC)@>h!&bNt+F(2U3HHDvupb_U1Mola6g&;b;9u}EyaKPn
zYw#wVgZJP(d<b8_m+%#QM+l*WBR1k80ujm8<Qj4<8B9{hbtIkKKt_-o$w-n-a>y9c
zL}rr(q?O!4ZYRsgYO;phMYiDiy<{8NLH<Z~k%!1W@(6i?JV#EE*U4G(F8K)We@%h3
zQbNsS2p-*3rk!aoIsnH5=@6PhGieTvN6|c*Pm5^@Eu#zQVtOZCP1n%1bUocjH`9A*
z8-0NTj&PLYI1^{)ES#0IadytZIXRwlac<7T37p7DoXjblm+QoJ=DKiQxo%u{t_RnX
z>&5lv61c0lK3rcek?Y6x=LT>CxvRNrxNEs2ZV;Eu4dsTHB!*go!8Zj7T;K)|2q1z4
zGAQ7MPS6>;Kv(Dn-Ju8cgkI1a65uN61AQS8`aypf00ZG_xCX9;Bp3vPVF)DanJ+X@
zQ0fo1sECEG1-`7>S~VIC)C7Wo*qoejD1;~pM+}_g1pU#d8Z~BD6!;1Qby37lw6efg
z;BQj(@#F$u`!wy&uSIHW3;|V!fVgg<z*ibT#X+?!5ULB$ik2qUYWg&Rh8YN6?Mzo?
ztirQ)4-93Ue_{U>2IfZ4!dc-+Bd*B}hhq8ukiTAyOhS3;>=;fgE$~eYhhyv(_BXbS
zEoY1^Wq)TYn3Wx5c6KWp#||(H1CjJ&^aO@H6^23@daiq`*~H9@I|0M-)^(7MatB9a
zkwB;(^<_0<eb)M8=m0aFfK0d^Zh#TxhJR|b!We{5#&#G1H^N9gH~B3wKSsl+ODQk#
zbqoxb4LMnmy$!Nq<P<cdB^nDi#cyhMjDqxPLCDL_3D<`G9Rbix7=w4mLLTO@y~3ky
z%w|X&4->Y-1jvVxn4q`~YODkeP-Di*LYVX?xEYFIBKV*fN}v?Vpqx2a7uJ*YWdm3e
zOJ->-o#mZ`O4L*ZlVJ)}mlgOX_-oXl=1aIGQme8~tTS`I0)D80TBrjRra?W<Z-4+y
zheilO6NDg)naNi}Ef~oBklGXu1!^aRYpVrOC$7;mS^_ik!*%)oXd@~p4#a{g2EQ<r
z*M#{+2N4<i9L<}+Y_(3m&UopTOP4N5SVq8H%){JFX5Le1!wl3PfhfeF1!kgVEwh+q
z&49d^+7x9GHk0{StUNyu3N!`gszpsFVJ<F8g?TU^7GNSKs!`oN9TXyyn1F`qYK^?2
zsGJ71wz0_{X*6PfD=gd&3*j~`^H>K)CgWnz(|*6a7FT(@rjjX|4t=F&rtYOL=8vg{
z@a3>#8?1nl7>l?U22AhJ;2}4wk!j&blje>;))GOFGUFg!4QsZ;8d$5D<;740YOoSx
zk#Mks7tmYdszDR+bg#p7Z(uzzyIucVb~j;m@6oc$c-9RQ&|OPFwIF3{HItAP3?{_F
z3Aqu}ce7#b{hGBNe<b1$)vI|S{T5n!3U;((EE#s9+Fb~fQED_62pRQ8Ssyf`*RRdk
zt%K~(XvSZ3GkUWGG~=qD<KSV~i#XWFCbL>h`jm>ImOw0FjDLEdsc42_)?<)f5mO^g
znm#RZSK4zB?K#9K>yH*BzO2LiGRQUk|Lh1tZ`Lm!gvzX%a7()uL&s6g^`7BKof^^I
z#^i?T{E<3+;?4e$8vKRg=TPx+RD3Ne9{Ag?zX&H#`6<J73EKy-tI>jMH2*8d2I|y=
z!dL_D7>XLIg-#84uAg4PWYNqkU40!jo<@yBP~)KA);JyBzO0cAjw`FsmFY1p(e(UG
z>;)8i5ycKgu_^ye?8jF`F*P2=a$iGumWCrVza^vz#_`Y0kAwAV)bTC54mAw>wFZNV
ze(2D^v*B?K#TDUjQ&oHUXyeP46B9AR6k=sJu(2pN<JWR^^brRH3Ez&sOq6@Q7X2Vn
zYeeTlRX>K18&!xV^e;+!ok&C`3h|Ooq%-M4x{_|BJ9HvFNKev>^d<@9D$<AaC5faT
z=}!ibfjUbX{nQtm6I3;p)Je#=mhG=?#BxKv#PauH>0|L2cXS@@IMaI^5~y)+B5n!r
z#8(?p)sS|gt@qE?)_2S)4XCs5a#?Y1&|j}@5VQ-r7=aTg8_jNHBiRTxisiB_sd+Y{
zZw$MsTIe!wURqj4QbJlr+JdBnc|(UMCncn&B`;V|a&ttT7S+pvBtbe7s*Zb&sj$<L
zA&_3IX<(+4B$W(BIvz}hk>R?lT7O3_Z4QU9esH1Q2pO<!mQyV#^X8=_C8YdZna-Oe
zgJf<endEvHiETg=j$U-gK|-824~<LKR;Hw;<1l?_>VgFo^HNiWqQKOQ1=T{gc|!-M
zC8wsRs@D!pPfEDrWPzdLCX%&{WVN$?d*Ick<{(nZ<aS`?1jA7^)0jSrjNVR0lU%*s
zx3}gjB*Z!Bm44LQGZ{;Q4+(t{gX73}G6B9NR@e=vNfDU{he$CgA*G}Yjw3`WNF}Kv
zlgSilAXAB-)R0<IM^xBF>fs`6fNIi+2p-RhStT3BGFWdmh)rNMERj{QMmCGpvw<v&
zm9ZA)XN7DkGI<eeW^<X!s@Z(ji_KsutSfV}5NmzSX!0a<xy_R>DbhF?4T!|+i)f(n
zwbV3WAH!`zR;|8gnt;;t<7LMRF1P82$y{h5^O2qxAU)TW8S|r4qJ{+H6w9)XFoZ;e
zM94y%zewv^;jETeSPf}AES7J_)!1fmS40-Wr2ENKbR_Q=giR(xfUJlciWW_bTU4xV
z42%q|1^+hmbmVWki&@aztsooXQpi0R(=t{Pm&8iTeQIQ80Jq>BPLi$UJ~aA%R?aHW
z%t;2|w?KOPK92kWCbh9VgnG5MMKe}wjs91pLyC3%mwl+Z?8D_4?a^cOSJt2fWqOHD
z%tmPT!=yhWg6fEsOhIH-!D%=S7ZFvv5E0dgkEw_hKVoDc=Dh~<pZBVf^(%6I#0Ubm
z{`U4y79z{!MSW_sKjOzH4Gc*4csT6;r}h8uE2=QiS|?GpC>x<U2a|SU@r)y7SYGv{
z6iZ+{mPaF&z$}*cn`kh=kKuT@BNSg@b@fItx9^77wBK2Xg}kR@;U!#H#Tq&m28u`5
z1&qx)r5d0oU<Lo48KjZg;?k%KrG;3qLt0Y@IH*kn2bEY*14mf*ohq6FKNf!8uMyYy
z3&e#kBkp&6!v}z9hc*4t8XkAu@t{OY4WcxZUk#IXKs9n)C2lyK$WkrHIB`!k+|gv?
zp@JM~f2=^{p%ePnlPtu3l@}cqh-x%YhiVXdc4I4QpMqI7G)1*M|Bkt&hK}ekHyh2J
z%Vu|&JEwT88f?BC!4Y}{$FkX41m_t}jME~hB4z$Y1Z#c~!MT?sScw+q`vV~ZhWJ!T
zOG)lFtvwiG%k@40$%wSwSo;n5UyFE4#@}uPYLWKEk%^4g?~TK8J(6)F_6O~H4gT<m
z_ZmnE?!h!{R$+{KBe;9xd2jsI<5lh38~a4Des4UEXCOO<5ct~lx%ktLJboKlt6^Cy
z3GT!$V@2IXXkR6AMFvWkfKprHbC%#7x|A-X%jpWblHS1<vfJ1qb~{_lmax|16#V#7
zQd3IweSl7i^e#v*j|ZfEXFxYVdR1;9s1ArG6wV5%k@oBON-9pE^d1syi)-C_#rS?L
zeuJ>A`(d{<=^eC^jKjy>oAJSSH}c?kC?%@Kf5?SCWX8!*hRj%u9@Ucx_;`%HR_~(?
zP>u+liv84z?C;0;He&p1FpgQsl{e^JwFL<y2_K<*Vyvn$mdOYQjYIwTK%I#3Ohb09
z!uZU<O74P>*o}H`<?$hV7&a>>#;*)Za2CeB9%J4f=NEMk=m~m~o}&MzFVUCjEA&<R
z8vPG_oxVX&(>Li`^lf^EzC+K_cj-C$9z9Rrrx)l4^dkL`endZ}pU_X~XY_OW1^tqK
zMZc!s&~NE?^n3aP{gM8}R<b+TDt0GZ&DOBB>@K#Bt!Eq9-E1S<#5S{g*cNs#+sf`^
zZR~!wjcsQ;*dN$V_D8mh{fX^ne`XJ`zpw|{Lu?OwnC)eMW&7A8Y(IOHJ;qvvbdmHC
z)`;XPVX@Fts1k`RY!vzlD})T;qHvqANhH05^}<qNwXjOa6p12yBHSsG&H@o+k#rFT
z2x~>sRoEbyg)SmV6h0P-SLiI<Dl8O9caiiENjH&n5=l=TlH6duiyGsU%OK#=+Q(R4
z+;v>~HZEP?edT2vFIq<7n^CagySKiOgfB)j@y$sQlp^s=Bkz#+X&TL?H8e(VK@4xA
zkI=)Ih1W5@-{4Ea1bn%d$&KR1bNO5$SH$_a60VG!#8q;WxoXbO)p9CV&jq+fF2pr+
zbGX~NCEPM@Ew_c+%{{<9!X4tC;a=d*a364Aa6g);Ni=mc4KfWerJHh0qfEJ`LQ|=!
z))X*BOt+hsn3kDVnC>v$X<B2t%e3Bfw`r4Ur|Ch{qo%)^{%-n*>9pxx)8}TZ*<<c%
zPBf>OhnmyPBg`YsS>_z`X!96zxw+chXl^ox%`?nV^L%rwd4+kid5d|gxy`)Ge8BvK
z`Iz|)^QY#YEMTD)lclpI!P3u?Y{{?`T8b<c7QbbVWvOMo<!;L+%RQEZmP3}uEr%^f
zEKgaETHdgnw!CNg*7CiTw|2Aku=cVhSo>IWtfQ@Cta;Y))_iNBb*i<-T4$YRZLmhI
zE!I}+GV2QK7VB1Pn{}IYhxMP<C#+9epSC_@eb)NC^;PQ`8?~8iUR!5dS6g>mPuq>Q
zn{1<PV{Cc0@wR+hp{>$3**4R*#J0?~!gh!4PTL;aUfVv~e%oWV1Ga;<r)|&MPTStH
zow1#@owHl*cDvK=vU}{JUAFhI53^_6N7-}jW9<QZqrJ%<w$HFf?Jf4X_9ga>_RaP!
z_O13d`#<eZ*q^jNZGXo8to?cWIs17>SH~d7NJpNd%%M6Wj$0hd92*>Mjt3kMI`%mB
zI`%pCJ05c!a2#|Tay;R9(($z8jN`oHQ^&WC@0}*6-RX38abDw0b*4FoJJX$o&T?n9
zbDA^aT<%=&-0S?i^Ks`%=iAN;&QE#ZZM?`=@KyX2ekxzX*YVT%27Wpp<U@QjAK_#C
zOnx>$m!HqKA|)^67x9bvrTlV!CBKSa&9CLx@f-M!{APX&zm;#}xAD*N|K?BgZ}DgN
zv-~;!Jb!_|$bZCNauFBjGP|rUkE@q!i0ekzO|C3gj%&25z*Xe(xk_9SSIjljHQP1U
zHQ&|hy3MuHwZ?V8b<lOl^|<S>>xk<q*HPCo*Gbn|*E!dD*9F%_*O#uZ-QXr}&h2#%
zcc;5E-8Z;zbl>F8cKh5V?oxNTyTU!y9dI-ELiZx~V)s(_a`#I2D)(ylTK78l2KPqy
zKito{pLhSu{i6G%``_-D-LJTRbYJoi59cv^tRB0^;Thsd@eK70^IYf2@Lcb?!Q=PT
zdQ?xnC*W!HG<iavd7ed{HJ-aX>pgdSHhJ#x-0Qi|bJTOp^PK0n=LOFR&neGKo>!1z
zIAj&8U>BT%OYjJy&`Ibm^brz;{z9QpB>039p-h-0R0@;vwOq3h5u!qiFiT)aTek~K
zgk8dJ;Q`@6VUMs^*eARpyeYgbyd%6TyeGUbd?0)%d?EZOT11=Z5P8up3Sx$sD~=V%
zi4(+pu}~}$ePXd#E3On*iL1r6;yQ7IxKZ3JZV~Sn_lo<(N5n_Pzln#%C&j15XT%HQ
zMe!r?6Y(?g3-K$7N=`|Tx=J-toit5qkfuvPDI_&Z5h*6klx9nFrTJ2;#H5ANB5AR-
zR9Y^rlvYWrrM1#JX@j&;+AM96wn}Z%Hfe{nQ`#l%mi{U|E*+MRNKZ*erDM`_(sAi!
z>8x~4Ixk(2E=nIspGcocUrXQ1M0Uus?3H`T*UE$B;c~j1C1=Z{<b1h6zFD3m@0TBw
z56B1QL-OPDVfl#slzdb^CO;=1mtT-i$fx9&<X7a^<k#iX@>}v5`K)|SJ}+O8FUlXu
zpU9udU&vp{-^ky|Kgd5Rpisr6SQMM$P<X|y2#Tb1S7s}7mHA4m!jy%|B4x3%R9UX9
zR8}dgm9@$`WrMO&*{p0)wkmDPHf4vhQ`x2LRvu6uRQ4!)m3_*7<uT=ea!@&>Jgyv8
zjwnwlN0npBbINh$1?7ZtN_k0nRr!x{T6s%3qnuUVQ{GoTP(D;XRz6ieSH4ufQNB}t
zP=4})mwL@!tJm)3y>74ImAzhXXKy!e4{tATg14`?pLd}58gG(!us6k<=Dp6F=^f$C
l^^Wo8c_(^(-V*N=Z?)I&o$d{T{=u!i{^2r=WBlLS`oEoa5(xkR

diff --git a/setup_osx.py b/setup_osx.py
deleted file mode 100644
index 29dabd5229..0000000000
--- a/setup_osx.py
+++ /dev/null
@@ -1,223 +0,0 @@
-## setup_osx.py
-##
-## Copyright (C) 2007 James Newton <redshodan AT gmail.com>
-## Copyright (C) 2007-2008 Yann Leboulanger <asterix AT lagaule.org>
-## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org>
-##
-## This file is part of Gajim.
-##
-## Gajim is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published
-## by the Free Software Foundation; version 3 only.
-##
-## Gajim is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
-##
-
-"""
-Usage:
-    python setup_osx.py [build | dist]
-"""
-
-from setuptools import setup
-import sys, glob, os, commands, types
-from os import system, unlink, symlink, getcwd, mkdir, utime
-from shutil import move, copy, copytree, rmtree
-
-###
-### Globals
-###
-
-GTK_DIR="/Library/Frameworks/GTK+.framework/Versions/Current"
-NAME = 'Gajim'
-VERSION = '0.12.1'
-DESCRIPTION = 'A full featured Jabber client'
-AUTHOR = 'Gajim Development Team'
-URL = 'http://www.gajim.org/'
-DOWNLOAD_URL = 'http://www.gajim.org/downloads.php'
-LICENSE = 'GPL'
-PWD = getcwd()
-APP_RS = "dist/Gajim.app/Contents/Resources"
-
-GAJIM_SCRIPT = \
-'#!/bin/bash \n\
-export DYLD_LIBRARY_PATH=%s/lib \n\
-export PATH=%s/bin:$PATH \n\
-export PYTHONPATH=%s/lib/python2.5/site-packages:%s/lib/python2.5/site-packages/gtk-2.0 \n\
-exec ${0}.bin \n\
-' % (GTK_DIR, GTK_DIR, GTK_DIR, GTK_DIR)
-
-GAJIM_REMOTE_SCRIPT = \
-'#!/bin/bash \n\
-export DYLD_LIBRARY_PATH=%s/lib \n\
-TOPDIR=${0%%/MacOS/gajim-remote} \n\
-echo "${TOPDIR}" | grep -e "^/" \n\
-[ $? -ne 0 ] && TOPDIR=`pwd`/${TOPDIR} \n\
-export RESOURCEPATH=${TOPDIR}/Resources \n\
-export PYTHONHOME=${RESOURCEPATH}/lib/python2.5 \n\
-export PYTHONPATH=${RESOURCEPATH}/lib/python2.5/lib-dynload:${RESOURCEPATH}/lib/python2.5/site-packages.zip:${PYTHONPATH} \n\
-cd ${RESOURCEPATH} \n\
-exec ${TOPDIR}/MacOS/Python ${RESOURCEPATH}/gajim-remote.py $* \n\
-' % GTK_DIR
-
-###
-### Functions
-###
-
-def check(ret):
-	if isinstance(ret, list):
-		if ret[0] != 0:
-			raise Exception("Command failed: " + ret[1])
-	elif isinstance(ret, int):
-		if ret != 0:
-			raise Exception("Command failed")
-	return
-
-
-def force(func):
-	try:
-		func()
-	except Exception:
-		pass
-	return
-
-
-def writeScript(filename, contents):
-	script = open(filename, "w+")
-	script.write(contents)
-	script.close()
-	system("chmod +x %s" % filename)
-	return
-
-
-def cleanup():
-	force(lambda:rmtree("build"))
-	force(lambda:rmtree("dist"))
-
-def stageInstall():
-	check(system("make DATADIR=%s/build/inst LIBDIR=%s/build/inst prefix=%s/build/inst DOCDIR=%s/build/inst/share/doc install" % (PWD, PWD, PWD, PWD)))
-	force(lambda:unlink("src/osx/growl/_growl.so"))
-	force(lambda:unlink("src/osx/growl/_growlImage.so"))
-	force(lambda:unlink("src/osx/idle.so"))
-	force(lambda:unlink("src/osx/nsapp.so"))
-	force(lambda:unlink("src/osx/syncmenu.so"))
-	force(lambda:unlink("src/gtkspell.so"))
-	symlink("%s/build/inst/lib/gajim/_growl.so" % PWD, "src/osx/growl/_growl.so")
-	symlink("%s/build/inst/lib/gajim/_growlImage.so" % PWD,
-		 "src/osx/growl/_growlImage.so")
-	symlink("%s/build/inst/lib/gajim/idle.so" % PWD, "src/osx/idle.so")
-	symlink("%s/build/inst/lib/gajim/nsapp.so" % PWD, "src/osx/nsapp.so")
-	symlink("%s/build/inst/lib/gajim/syncmenu.so" % PWD, "src/osx/syncmenu.so")
-	if os.path.isfile("build/inst/lib/gajim/gtkspell.so"):
-		symlink("%s/build/inst/lib/gajim/gtkspell.so" % PWD, "src/gtkspell.so")
-	return
-
-
-def buildApp():
-	sys.path.append('src')
-	sys.path.append(GTK_DIR + "/lib/python2.5/site-packages")
-	sys.path.append(GTK_DIR + "/lib/python2.5/site-packages/gtk-2.0")
-	OPTIONS = {'argv_emulation':True,
-			   'excludes':'docutils,Crypto,dbus,OpenSSL,cairo,gtk,gobject,atk,pangocairo',
-			   'iconfile':'data/pixmaps/gajim.icns',
-			   'includes':'osx,ConfigParser,compiler,UserString,history_manager',
-			   'plist':{'LSMinimumSystemVersion':'10.4.0',
-						'NSHumanReadableCopyright':'GNU General Public License',
-						'CFBundleIdentifier':'org.gajim',
-						'NSMainNibFile':'Gajim',
-						},
-			   }
-	setup(
-		name = NAME, version = VERSION, description = DESCRIPTION,
-		author = AUTHOR, url = URL, download_url = DOWNLOAD_URL,
-		license = LICENSE,
-		app=['src/gajim.py'],
-		data_files=['data/nibs/Gajim.nib'],
-		options={'py2app': OPTIONS},
-		setup_requires=['py2app'],
-		)
-	return
-
-
-def setupPrep():
-	copy("src/osx/prep_py2app.py", APP_RS)
-	move("dist/Gajim.app/Contents/Resources/__boot__.py",
-		 "dist/Gajim.app/Contents/Resources/__boot__.py.org")
-	new = open("dist/Gajim.app/Contents/Resources/__boot__.py", "w+")
-	org = open("dist/Gajim.app/Contents/Resources/__boot__.py.org")
-	for line in org:
-		new.write(line)
-		if (('site.addsitedir' in line) and ('Python' in line)):
-			new.write("    import prep_py2app\n")
-	new.close()
-	org.close()
-	unlink("dist/Gajim.app/Contents/Resources/__boot__.py.org")
-	return
-
-
-def finishApp():
-	# setup gajim dirs
-	copytree("build/inst/share/gajim/data", APP_RS + "/data")
-	copy("data/pixmaps/gajim.icns", APP_RS + "/data/pixmaps")
-	copytree("build/inst/share/locale", APP_RS + "/locale")
-	copytree("build/inst/share/man", APP_RS + "/man")
-	force(lambda:unlink("dist/Gajim.app/Contents/data"))
-	symlink("Resources/data", "dist/Gajim.app/Contents/data")
-	copy("src/gajim-remote.py", "dist/Gajim.app/Contents/Resources")
-	# Nuke libs that are in the framework
-	move("dist/Gajim.app/Contents/Frameworks/Python.framework",
-		 "dist/Gajim.app/Contents/Python.framework")
-	rmtree("dist/Gajim.app/Contents/Frameworks")
-	mkdir("dist/Gajim.app/Contents/Frameworks")
-	move("dist/Gajim.app/Contents/Python.framework",
-		 "dist/Gajim.app/Contents/Frameworks/Python.framework")
-	# Adjust the running of the app
-	move("dist/Gajim.app/Contents/MacOS/Gajim",
-		 "dist/Gajim.app/Contents/MacOS/Gajim.bin")
-	writeScript("dist/Gajim.app/Contents/MacOS/Gajim", GAJIM_SCRIPT)
-	setupPrep()
-	# Setup the gajim-remote script
-	writeScript("dist/Gajim.app/Contents/MacOS/gajim-remote",
-				GAJIM_REMOTE_SCRIPT)
-	# Touch the top dir so Finder knows to update its idea of this bundle
-	utime("dist/Gajim.app", None)
-	return
-
-
-def distApp():
-	force(lambda:rmtree("dist/Gajim"))
-	force(lambda:rmtree("dist/Gajim.tar.bz2"))
-	mkdir("dist/Gajim")
-	check(system("tar -cf - -C dist Gajim.app | tar -xf - -C dist/Gajim"))
-	copy("README.osx", "dist/Gajim/README")
-	copy("TODO.osx", "dist/Gajim/TODO")
-	check(system("tar -C dist -jcf dist/Gajim-OSX-`date | awk '{printf(\"%s-%s-%s\", $6, $2, $3);}'`.tar.bz2 Gajim"))
-	rmtree("dist/Gajim")
-	return
-
-
-
-###
-### Start
-###
-if ((len(sys.argv) != 2) or ((sys.argv[1] != "build") and
-	(sys.argv[1] != "dist"))):
-	print "usage: python setup_osx.py [build]"
-	print "   or: python setup_osx.py [dist]"
-	sys.exit(1)
-elif sys.argv[1] == "build":
-	sys.argv[1] = "py2app"
-	sys.argv.append('--use-pythonpath')
-	cleanup()
-	stageInstall()
-	buildApp()
-	finishApp()
-elif sys.argv[1] == "dist":
-	distApp()
-
-# vim: se ts=3:
-- 
GitLab