- Upgrade to fresh, post 0.11, snapshot.

- BROKEN on 4.x: doesn't install

PR:		ports/107231
Submitted by:	Denis Shaposhnikov

4 files changed, 212 insertions, 54 deletions

diff --git a/net-im/gajim-devel/Makefile b/net-im/gajim-devel/Makefile
index 5e65f7fe5d7d..b487a31a2c3e 100644
--- a/net-im/gajim-devel/Makefile
+++ b/net-im/gajim-devel/Makefile
@@ -6,16 +6,17 @@
 #
 
 PORTNAME=	gajim
-PORTVERSION=	20061129
+PORTVERSION=	20061227
 CATEGORIES=	net-im
 MASTER_SITES=	http://ports.internal.vlink.ru/distfiles/
 PKGNAMESUFFIX=	-devel
-DISTNAME=	${PORTNAME}-2006-11-29
+DISTNAME=	${PORTNAME}-2006-12-27
 
 MAINTAINER=	dsh@vlink.ru
 COMMENT=	Gajim is a Jabber client based on a plugin system
 
 LIB_DEPENDS=	gtkspell.0:${PORTSDIR}/textproc/gtkspell
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenSSL/SSL.so:${PORTSDIR}/security/py-openssl
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -34,7 +35,7 @@ CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-0.10.1.8
+WRKSRC=		${WRKDIR}/${PORTNAME}-0.11
 
 MAN1=		gajim.1 gajim-remote.1
 
@@ -48,6 +49,9 @@ post-patch:
 			${WRKSRC}/src/$i
 .endfor
 
+pre-build:
+		${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/src
+
 post-install:
 		${MKDIR} ${DATADIR}/data/emoticons
 		(cd ${WRKSRC}/data/emoticons && \
@@ -71,6 +75,10 @@ post-install:
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} < 500000
+BROKEN=	doesn't install
+.endif
+
 .if ${PYTHON_REL} >= 250
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
 .else
diff --git a/net-im/gajim-devel/distinfo b/net-im/gajim-devel/distinfo
index 998758dfd458..0344399d428d 100644
--- a/net-im/gajim-devel/distinfo
+++ b/net-im/gajim-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gajim-2006-11-29.tar.gz) = 29437455a719d8c9426abd1296838925
-SHA256 (gajim-2006-11-29.tar.gz) = 88042911cb0fa9123f7b5192799796b1711b496e96811ef1a773a6c605ef58d7
-SIZE (gajim-2006-11-29.tar.gz) = 3270660
+MD5 (gajim-2006-12-27.tar.gz) = 05ebe40e0fd55b9a95027278be3dbf56
+SHA256 (gajim-2006-12-27.tar.gz) = 1e9f5a78f105f247aace1c8250eec2774abd2b7a726c88e6f3932f02b43caa13
+SIZE (gajim-2006-12-27.tar.gz) = 3523167
diff --git a/net-im/gajim-devel/files/patch-src-Makefile.in b/net-im/gajim-devel/files/patch-src-Makefile.in
new file mode 100644
index 000000000000..9b94ff73f623
--- /dev/null
+++ b/net-im/gajim-devel/files/patch-src-Makefile.in
@@ -0,0 +1,25 @@
+--- src/Makefile.in.orig	Wed Dec 27 03:01:21 2006
++++ src/Makefile.in	Wed Dec 27 12:47:12 2006
+@@ -324,18 +324,18 @@
+ 
+ @BUILD_TRAYICON_TRUE@trayicon_la_CFLAGS = $(PYGTK_CFLAGS)
+ gajimsrcdir = $(pkgdatadir)/src
+-gajimsrc_DATA = $(srcdir)/*.py 
++gajimsrc_DATA = $(srcdir)/*.py $(srcdir)/*.pyc
+ gajimsrc1dir = $(pkgdatadir)/src/common
+ gajimsrc1_DATA = \
+-				$(srcdir)/common/*.py 
++				$(srcdir)/common/*.py $(srcdir)/common/*.pyc
+ 
+ gajimsrc2dir = $(pkgdatadir)/src/common/xmpp
+ gajimsrc2_DATA = \
+-				$(srcdir)/common/xmpp/*.py 
++				$(srcdir)/common/xmpp/*.py $(srcdir)/common/xmpp/*.pyc
+ 
+ gajimsrc3dir = $(pkgdatadir)/src/common/zeroconf
+ gajimsrc3_DATA = \
+-				$(srcdir)/common/zeroconf/*.py 
++				$(srcdir)/common/zeroconf/*.py $(srcdir)/common/zeroconf/*.pyc
+ 
+ DISTCLEANFILES = 
+ EXTRA_DIST = $(gajimsrc_DATA) \
diff --git a/net-im/gajim-devel/pkg-plist b/net-im/gajim-devel/pkg-plist
index 2ce9411d4b7a..f18333e476fe 100644
--- a/net-im/gajim-devel/pkg-plist
+++ b/net-im/gajim-devel/pkg-plist
@@ -5,11 +5,13 @@ lib/gajim/idle.la
 lib/gajim/idle.so
 lib/gajim/trayicon.la
 lib/gajim/trayicon.so
+%%NLS%%share/locale/be/LC_MESSAGES/gajim.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/gajim.mo
 %%NLS%%share/locale/br/LC_MESSAGES/gajim.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/gajim.mo
 %%NLS%%share/locale/de/LC_MESSAGES/gajim.mo
 %%NLS%%share/locale/el/LC_MESSAGES/gajim.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/gajim.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/gajim.mo
 %%NLS%%share/locale/es/LC_MESSAGES/gajim.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/gajim.mo
@@ -60,7 +62,6 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/emoticons/animated/mail.png
 %%DATADIR%%/data/emoticons/animated/moon.png
 %%DATADIR%%/data/emoticons/animated/music.png
-%%DATADIR%%/data/emoticons/animated/no.png
 %%DATADIR%%/data/emoticons/animated/oh.png
 %%DATADIR%%/data/emoticons/animated/party.gif
 %%DATADIR%%/data/emoticons/animated/phone.png
@@ -72,10 +73,11 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/emoticons/animated/star.png
 %%DATADIR%%/data/emoticons/animated/stare.png
 %%DATADIR%%/data/emoticons/animated/think.gif
+%%DATADIR%%/data/emoticons/animated/thumbdown.png
+%%DATADIR%%/data/emoticons/animated/thumbup.png
 %%DATADIR%%/data/emoticons/animated/tongue.png
 %%DATADIR%%/data/emoticons/animated/unhappy.png
 %%DATADIR%%/data/emoticons/animated/wink.gif
-%%DATADIR%%/data/emoticons/animated/yes.png
 %%DATADIR%%/data/emoticons/static/angry.png
 %%DATADIR%%/data/emoticons/static/bat.png
 %%DATADIR%%/data/emoticons/static/beer.png
@@ -102,7 +104,6 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/emoticons/static/mail.png
 %%DATADIR%%/data/emoticons/static/moon.png
 %%DATADIR%%/data/emoticons/static/music.png
-%%DATADIR%%/data/emoticons/static/no.png
 %%DATADIR%%/data/emoticons/static/oh.png
 %%DATADIR%%/data/emoticons/static/phone.png
 %%DATADIR%%/data/emoticons/static/photo.png
@@ -111,10 +112,11 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/emoticons/static/smile.png
 %%DATADIR%%/data/emoticons/static/star.png
 %%DATADIR%%/data/emoticons/static/stare.png
+%%DATADIR%%/data/emoticons/static/thumbdown.png
+%%DATADIR%%/data/emoticons/static/thumbup.png
 %%DATADIR%%/data/emoticons/static/tongue.png
 %%DATADIR%%/data/emoticons/static/unhappy.png
 %%DATADIR%%/data/emoticons/static/wink.png
-%%DATADIR%%/data/emoticons/static/yes.png
 %%DATADIR%%/data/glade/account_context_menu.glade
 %%DATADIR%%/data/glade/account_creation_wizard_window.glade
 %%DATADIR%%/data/glade/account_modification_window.glade
@@ -210,6 +212,8 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/iconsets/dcraven/32x32/error.png
 %%DATADIR%%/data/iconsets/dcraven/32x32/invisible.png
 %%DATADIR%%/data/iconsets/dcraven/32x32/message.png
+%%DATADIR%%/data/iconsets/dcraven/32x32/muc_active.png
+%%DATADIR%%/data/iconsets/dcraven/32x32/muc_inactive.png
 %%DATADIR%%/data/iconsets/dcraven/32x32/not_in_roster.png
 %%DATADIR%%/data/iconsets/dcraven/32x32/offline.png
 %%DATADIR%%/data/iconsets/dcraven/32x32/online.png
@@ -237,6 +241,8 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/iconsets/gnome/32x32/away.png
 %%DATADIR%%/data/iconsets/gnome/32x32/chat.png
 %%DATADIR%%/data/iconsets/gnome/32x32/dnd.png
+%%DATADIR%%/data/iconsets/gnome/32x32/muc_active.png
+%%DATADIR%%/data/iconsets/gnome/32x32/muc_inactive.png
 %%DATADIR%%/data/iconsets/gnome/32x32/not_in_roster.png
 %%DATADIR%%/data/iconsets/gnome/32x32/offline.png
 %%DATADIR%%/data/iconsets/gnome/32x32/online.png
@@ -268,6 +274,8 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/iconsets/goojim/32x32/error.png
 %%DATADIR%%/data/iconsets/goojim/32x32/invisible.png
 %%DATADIR%%/data/iconsets/goojim/32x32/message.png
+%%DATADIR%%/data/iconsets/goojim/32x32/muc_active.png
+%%DATADIR%%/data/iconsets/goojim/32x32/muc_inactive.png
 %%DATADIR%%/data/iconsets/goojim/32x32/not_in_the_roster.png
 %%DATADIR%%/data/iconsets/goojim/32x32/offline.png
 %%DATADIR%%/data/iconsets/goojim/32x32/online.png
@@ -318,6 +326,8 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/iconsets/gota/32x32/error.png
 %%DATADIR%%/data/iconsets/gota/32x32/invisible.png
 %%DATADIR%%/data/iconsets/gota/32x32/message.gif
+%%DATADIR%%/data/iconsets/gota/32x32/muc_active.png
+%%DATADIR%%/data/iconsets/gota/32x32/muc_inactive.png
 %%DATADIR%%/data/iconsets/gota/32x32/not_in_roster.png
 %%DATADIR%%/data/iconsets/gota/32x32/offline.png
 %%DATADIR%%/data/iconsets/gota/32x32/online.png
@@ -347,6 +357,8 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/iconsets/jabberbulb/32x32/dnd.png
 %%DATADIR%%/data/iconsets/jabberbulb/32x32/error.png
 %%DATADIR%%/data/iconsets/jabberbulb/32x32/invisible.png
+%%DATADIR%%/data/iconsets/jabberbulb/32x32/muc_active.png
+%%DATADIR%%/data/iconsets/jabberbulb/32x32/muc_inactive.png
 %%DATADIR%%/data/iconsets/jabberbulb/32x32/not_in_roster.png
 %%DATADIR%%/data/iconsets/jabberbulb/32x32/offline.png
 %%DATADIR%%/data/iconsets/jabberbulb/32x32/online.png
@@ -443,12 +455,14 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/iconsets/transports/gadu-gadu/16x16/away.png
 %%DATADIR%%/data/iconsets/transports/gadu-gadu/16x16/chat.png
 %%DATADIR%%/data/iconsets/transports/gadu-gadu/16x16/dnd.png
+%%DATADIR%%/data/iconsets/transports/gadu-gadu/16x16/invisible.png
 %%DATADIR%%/data/iconsets/transports/gadu-gadu/16x16/offline.png
 %%DATADIR%%/data/iconsets/transports/gadu-gadu/16x16/online.png
 %%DATADIR%%/data/iconsets/transports/gadu-gadu/16x16/xa.png
 %%DATADIR%%/data/iconsets/transports/gadu-gadu/32x32/away.png
 %%DATADIR%%/data/iconsets/transports/gadu-gadu/32x32/chat.png
 %%DATADIR%%/data/iconsets/transports/gadu-gadu/32x32/dnd.png
+%%DATADIR%%/data/iconsets/transports/gadu-gadu/32x32/invisible.png
 %%DATADIR%%/data/iconsets/transports/gadu-gadu/32x32/offline.png
 %%DATADIR%%/data/iconsets/transports/gadu-gadu/32x32/online.png
 %%DATADIR%%/data/iconsets/transports/gadu-gadu/32x32/xa.png
@@ -474,6 +488,12 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/iconsets/transports/irc/16x16/offline.png
 %%DATADIR%%/data/iconsets/transports/irc/16x16/online.png
 %%DATADIR%%/data/iconsets/transports/irc/16x16/xa.png
+%%DATADIR%%/data/iconsets/transports/irc/32x32/away.png
+%%DATADIR%%/data/iconsets/transports/irc/32x32/chat.png
+%%DATADIR%%/data/iconsets/transports/irc/32x32/dnd.png
+%%DATADIR%%/data/iconsets/transports/irc/32x32/offline.png
+%%DATADIR%%/data/iconsets/transports/irc/32x32/online.png
+%%DATADIR%%/data/iconsets/transports/irc/32x32/xa.png
 %%DATADIR%%/data/iconsets/transports/msn/16x16/away.png
 %%DATADIR%%/data/iconsets/transports/msn/16x16/chat.png
 %%DATADIR%%/data/iconsets/transports/msn/16x16/dnd.png
@@ -494,6 +514,12 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/iconsets/transports/sms/16x16/offline.png
 %%DATADIR%%/data/iconsets/transports/sms/16x16/online.png
 %%DATADIR%%/data/iconsets/transports/sms/16x16/xa.png
+%%DATADIR%%/data/iconsets/transports/sms/32x32/away.png
+%%DATADIR%%/data/iconsets/transports/sms/32x32/chat.png
+%%DATADIR%%/data/iconsets/transports/sms/32x32/dnd.png
+%%DATADIR%%/data/iconsets/transports/sms/32x32/offline.png
+%%DATADIR%%/data/iconsets/transports/sms/32x32/online.png
+%%DATADIR%%/data/iconsets/transports/sms/32x32/xa.png
 %%DATADIR%%/data/iconsets/transports/tlen/16x16/away.png
 %%DATADIR%%/data/iconsets/transports/tlen/16x16/chat.png
 %%DATADIR%%/data/iconsets/transports/tlen/16x16/dnd.png
@@ -514,6 +540,12 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/iconsets/transports/weather/16x16/offline.png
 %%DATADIR%%/data/iconsets/transports/weather/16x16/online.png
 %%DATADIR%%/data/iconsets/transports/weather/16x16/xa.png
+%%DATADIR%%/data/iconsets/transports/weather/32x32/away.png
+%%DATADIR%%/data/iconsets/transports/weather/32x32/chat.png
+%%DATADIR%%/data/iconsets/transports/weather/32x32/dnd.png
+%%DATADIR%%/data/iconsets/transports/weather/32x32/offline.png
+%%DATADIR%%/data/iconsets/transports/weather/32x32/online.png
+%%DATADIR%%/data/iconsets/transports/weather/32x32/xa.png
 %%DATADIR%%/data/iconsets/transports/yahoo/16x16/away.png
 %%DATADIR%%/data/iconsets/transports/yahoo/16x16/chat.png
 %%DATADIR%%/data/iconsets/transports/yahoo/16x16/dnd.png
@@ -532,6 +564,7 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/pixmaps/agents/aim.png
 %%DATADIR%%/data/pixmaps/agents/bytestreams.png
 %%DATADIR%%/data/pixmaps/agents/conference.png
+%%DATADIR%%/data/pixmaps/agents/disc.png
 %%DATADIR%%/data/pixmaps/agents/error.png
 %%DATADIR%%/data/pixmaps/agents/gadu-gadu.png
 %%DATADIR%%/data/pixmaps/agents/http-ws.png
@@ -545,6 +578,7 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/pixmaps/agents/rss.png
 %%DATADIR%%/data/pixmaps/agents/sip.png
 %%DATADIR%%/data/pixmaps/agents/sms.png
+%%DATADIR%%/data/pixmaps/agents/tv.png
 %%DATADIR%%/data/pixmaps/agents/weather.png
 %%DATADIR%%/data/pixmaps/agents/yahoo.png
 %%DATADIR%%/data/pixmaps/events/chat_msg_recv.png
@@ -572,96 +606,187 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/sounds/message2.wav
 %%DATADIR%%/data/sounds/sent.wav
 %%DATADIR%%/src/adhoc_commands.py
+%%DATADIR%%/src/adhoc_commands.pyc
 %%DATADIR%%/src/advanced.py
+%%DATADIR%%/src/advanced.pyc
 %%DATADIR%%/src/atom_window.py
+%%DATADIR%%/src/atom_window.pyc
 %%DATADIR%%/src/cell_renderer_image.py
+%%DATADIR%%/src/cell_renderer_image.pyc
 %%DATADIR%%/src/chat_control.py
+%%DATADIR%%/src/chat_control.pyc
 %%DATADIR%%/src/common/GnuPG.py
+%%DATADIR%%/src/common/GnuPG.pyc
 %%DATADIR%%/src/common/GnuPGInterface.py
+%%DATADIR%%/src/common/GnuPGInterface.pyc
 %%DATADIR%%/src/common/__init__.py
+%%DATADIR%%/src/common/__init__.pyc
 %%DATADIR%%/src/common/atom.py
+%%DATADIR%%/src/common/atom.pyc
 %%DATADIR%%/src/common/check_paths.py
+%%DATADIR%%/src/common/check_paths.pyc
 %%DATADIR%%/src/common/commands.py
+%%DATADIR%%/src/common/commands.pyc
 %%DATADIR%%/src/common/config.py
+%%DATADIR%%/src/common/config.pyc
 %%DATADIR%%/src/common/configpaths.py
+%%DATADIR%%/src/common/configpaths.pyc
 %%DATADIR%%/src/common/connection.py
+%%DATADIR%%/src/common/connection.pyc
 %%DATADIR%%/src/common/connection_handlers.py
+%%DATADIR%%/src/common/connection_handlers.pyc
 %%DATADIR%%/src/common/contacts.py
+%%DATADIR%%/src/common/contacts.pyc
 %%DATADIR%%/src/common/dataforms.py
+%%DATADIR%%/src/common/dataforms.pyc
 %%DATADIR%%/src/common/dbus_support.py
+%%DATADIR%%/src/common/dbus_support.pyc
 %%DATADIR%%/src/common/defs.py
+%%DATADIR%%/src/common/defs.pyc
 %%DATADIR%%/src/common/events.py
+%%DATADIR%%/src/common/events.pyc
 %%DATADIR%%/src/common/exceptions.py
+%%DATADIR%%/src/common/exceptions.pyc
 %%DATADIR%%/src/common/fuzzyclock.py
+%%DATADIR%%/src/common/fuzzyclock.pyc
 %%DATADIR%%/src/common/gajim.py
+%%DATADIR%%/src/common/gajim.pyc
 %%DATADIR%%/src/common/helpers.py
+%%DATADIR%%/src/common/helpers.pyc
 %%DATADIR%%/src/common/i18n.py
+%%DATADIR%%/src/common/i18n.pyc
 %%DATADIR%%/src/common/logger.py
+%%DATADIR%%/src/common/logger.pyc
 %%DATADIR%%/src/common/nslookup.py
+%%DATADIR%%/src/common/nslookup.pyc
 %%DATADIR%%/src/common/optparser.py
+%%DATADIR%%/src/common/optparser.pyc
 %%DATADIR%%/src/common/passwords.py
+%%DATADIR%%/src/common/passwords.pyc
 %%DATADIR%%/src/common/proxy65_manager.py
+%%DATADIR%%/src/common/proxy65_manager.pyc
 %%DATADIR%%/src/common/pubsub.py
+%%DATADIR%%/src/common/pubsub.pyc
 %%DATADIR%%/src/common/rst_xhtml_generator.py
+%%DATADIR%%/src/common/rst_xhtml_generator.pyc
 %%DATADIR%%/src/common/sleepy.py
+%%DATADIR%%/src/common/sleepy.pyc
 %%DATADIR%%/src/common/socks5.py
+%%DATADIR%%/src/common/socks5.pyc
 %%DATADIR%%/src/common/xmpp/__init__.py
+%%DATADIR%%/src/common/xmpp/__init__.pyc
 %%DATADIR%%/src/common/xmpp/auth.py
+%%DATADIR%%/src/common/xmpp/auth.pyc
 %%DATADIR%%/src/common/xmpp/auth_nb.py
+%%DATADIR%%/src/common/xmpp/auth_nb.pyc
 %%DATADIR%%/src/common/xmpp/browser.py
+%%DATADIR%%/src/common/xmpp/browser.pyc
 %%DATADIR%%/src/common/xmpp/client.py
+%%DATADIR%%/src/common/xmpp/client.pyc
 %%DATADIR%%/src/common/xmpp/client_nb.py
+%%DATADIR%%/src/common/xmpp/client_nb.pyc
 %%DATADIR%%/src/common/xmpp/commands.py
+%%DATADIR%%/src/common/xmpp/commands.pyc
 %%DATADIR%%/src/common/xmpp/debug.py
+%%DATADIR%%/src/common/xmpp/debug.pyc
 %%DATADIR%%/src/common/xmpp/dispatcher.py
+%%DATADIR%%/src/common/xmpp/dispatcher.pyc
 %%DATADIR%%/src/common/xmpp/dispatcher_nb.py
+%%DATADIR%%/src/common/xmpp/dispatcher_nb.pyc
 %%DATADIR%%/src/common/xmpp/features.py
+%%DATADIR%%/src/common/xmpp/features.pyc
 %%DATADIR%%/src/common/xmpp/features_nb.py
+%%DATADIR%%/src/common/xmpp/features_nb.pyc
 %%DATADIR%%/src/common/xmpp/filetransfer.py
+%%DATADIR%%/src/common/xmpp/filetransfer.pyc
 %%DATADIR%%/src/common/xmpp/idlequeue.py
+%%DATADIR%%/src/common/xmpp/idlequeue.pyc
 %%DATADIR%%/src/common/xmpp/protocol.py
+%%DATADIR%%/src/common/xmpp/protocol.pyc
 %%DATADIR%%/src/common/xmpp/roster.py
+%%DATADIR%%/src/common/xmpp/roster.pyc
 %%DATADIR%%/src/common/xmpp/roster_nb.py
+%%DATADIR%%/src/common/xmpp/roster_nb.pyc
 %%DATADIR%%/src/common/xmpp/session.py
+%%DATADIR%%/src/common/xmpp/session.pyc
 %%DATADIR%%/src/common/xmpp/simplexml.py
+%%DATADIR%%/src/common/xmpp/simplexml.pyc
 %%DATADIR%%/src/common/xmpp/transports.py
+%%DATADIR%%/src/common/xmpp/transports.pyc
 %%DATADIR%%/src/common/xmpp/transports_nb.py
+%%DATADIR%%/src/common/xmpp/transports_nb.pyc
 %%DATADIR%%/src/common/xmpp_stringprep.py
+%%DATADIR%%/src/common/xmpp_stringprep.pyc
 %%DATADIR%%/src/common/zeroconf/__init__.py
+%%DATADIR%%/src/common/zeroconf/__init__.pyc
 %%DATADIR%%/src/common/zeroconf/client_zeroconf.py
+%%DATADIR%%/src/common/zeroconf/client_zeroconf.pyc
 %%DATADIR%%/src/common/zeroconf/connection_handlers_zeroconf.py
+%%DATADIR%%/src/common/zeroconf/connection_handlers_zeroconf.pyc
 %%DATADIR%%/src/common/zeroconf/connection_zeroconf.py
+%%DATADIR%%/src/common/zeroconf/connection_zeroconf.pyc
 %%DATADIR%%/src/common/zeroconf/roster_zeroconf.py
+%%DATADIR%%/src/common/zeroconf/roster_zeroconf.pyc
 %%DATADIR%%/src/common/zeroconf/zeroconf.py
+%%DATADIR%%/src/common/zeroconf/zeroconf.pyc
 %%DATADIR%%/src/config.py
+%%DATADIR%%/src/config.pyc
 %%DATADIR%%/src/conversation_textview.py
+%%DATADIR%%/src/conversation_textview.pyc
 %%DATADIR%%/src/dataforms_widget.py
+%%DATADIR%%/src/dataforms_widget.pyc
 %%DATADIR%%/src/dialogs.py
+%%DATADIR%%/src/dialogs.pyc
 %%DATADIR%%/src/disco.py
+%%DATADIR%%/src/disco.pyc
 %%DATADIR%%/src/filetransfers_window.py
+%%DATADIR%%/src/filetransfers_window.pyc
 %%DATADIR%%/src/gajim-remote.py
+%%DATADIR%%/src/gajim-remote.pyc
 %%DATADIR%%/src/gajim.py
+%%DATADIR%%/src/gajim.pyc
 %%DATADIR%%/src/gajim_themes_window.py
+%%DATADIR%%/src/gajim_themes_window.pyc
 %%DATADIR%%/src/groupchat_control.py
+%%DATADIR%%/src/groupchat_control.pyc
 %%DATADIR%%/src/groups.py
+%%DATADIR%%/src/groups.pyc
 %%DATADIR%%/src/gtkexcepthook.py
+%%DATADIR%%/src/gtkexcepthook.pyc
 %%DATADIR%%/src/gtkgui_helpers.py
+%%DATADIR%%/src/gtkgui_helpers.pyc
 %%DATADIR%%/src/history_manager.py
+%%DATADIR%%/src/history_manager.pyc
 %%DATADIR%%/src/history_window.py
+%%DATADIR%%/src/history_window.pyc
 %%DATADIR%%/src/htmltextview.py
+%%DATADIR%%/src/htmltextview.pyc
 %%DATADIR%%/src/message_control.py
+%%DATADIR%%/src/message_control.pyc
 %%DATADIR%%/src/message_textview.py
+%%DATADIR%%/src/message_textview.pyc
 %%DATADIR%%/src/message_window.py
+%%DATADIR%%/src/message_window.pyc
 %%DATADIR%%/src/music_track_listener.py
+%%DATADIR%%/src/music_track_listener.pyc
 %%DATADIR%%/src/network_manager_listener.py
+%%DATADIR%%/src/network_manager_listener.pyc
 %%DATADIR%%/src/notify.py
+%%DATADIR%%/src/notify.pyc
 %%DATADIR%%/src/profile_window.py
+%%DATADIR%%/src/profile_window.pyc
 %%DATADIR%%/src/remote_control.py
+%%DATADIR%%/src/remote_control.pyc
 %%DATADIR%%/src/roster_window.py
+%%DATADIR%%/src/roster_window.pyc
 %%DATADIR%%/src/statusicon.py
+%%DATADIR%%/src/statusicon.pyc
 %%DATADIR%%/src/systray.py
+%%DATADIR%%/src/systray.pyc
 %%DATADIR%%/src/tooltips.py
+%%DATADIR%%/src/tooltips.pyc
 %%DATADIR%%/src/vcard.py
+%%DATADIR%%/src/vcard.pyc
 %%DOCSDIR%%/AUTHORS
 %%DOCSDIR%%/COPYING
 %%DOCSDIR%%/ChangeLog
@@ -669,61 +794,45 @@ share/pixmaps/gajim_about.png
 %%DOCSDIR%%/README.html
 %%DOCSDIR%%/THANKS
 @dirrm lib/gajim
-@dirrmtry share/pixmaps
 @dirrmtry share/applications
+@dirrmtry share/pixmaps
 @dirrm %%DATADIR%%/src/common/xmpp
 @dirrm %%DATADIR%%/src/common/zeroconf
 @dirrm %%DATADIR%%/src/common
 @dirrm %%DATADIR%%/src
 @dirrm %%DATADIR%%/data/glade
-@dirrm %%DATADIR%%/data/emoticons/animated
-@dirrm %%DATADIR%%/data/emoticons/static
-@dirrm %%DATADIR%%/data/emoticons
 @dirrm %%DATADIR%%/data/pixmaps/agents
 @dirrm %%DATADIR%%/data/pixmaps/events
 @dirrm %%DATADIR%%/data/pixmaps
-@dirrm %%DATADIR%%/data/iconsets/crystal/16x16
-@dirrm %%DATADIR%%/data/iconsets/crystal/48x48
-@dirrm %%DATADIR%%/data/iconsets/crystal
-@dirrm %%DATADIR%%/data/iconsets/dcraven/16x16
-@dirrm %%DATADIR%%/data/iconsets/dcraven/32x32
-@dirrm %%DATADIR%%/data/iconsets/dcraven/48x48
-@dirrm %%DATADIR%%/data/iconsets/dcraven
-@dirrm %%DATADIR%%/data/iconsets/gnome/16x16
-@dirrm %%DATADIR%%/data/iconsets/gnome/32x32
-@dirrm %%DATADIR%%/data/iconsets/gnome/48x48
-@dirrm %%DATADIR%%/data/iconsets/gnome
-@dirrm %%DATADIR%%/data/iconsets/goojim/16x16
-@dirrm %%DATADIR%%/data/iconsets/goojim/32x32
-@dirrm %%DATADIR%%/data/iconsets/goojim/48x48
-@dirrm %%DATADIR%%/data/iconsets/goojim
-@dirrm %%DATADIR%%/data/iconsets/gossip/16x16
-@dirrm %%DATADIR%%/data/iconsets/gossip/48x48
-@dirrm %%DATADIR%%/data/iconsets/gossip
+@dirrm %%DATADIR%%/data/other
+@dirrm %%DATADIR%%/data/sounds
+@dirrm %%DATADIR%%/data/emoticons/static
+@dirrm %%DATADIR%%/data/emoticons/animated
+@dirrm %%DATADIR%%/data/emoticons
 @dirrm %%DATADIR%%/data/iconsets/gota/16x16
 @dirrm %%DATADIR%%/data/iconsets/gota/32x32
 @dirrm %%DATADIR%%/data/iconsets/gota/48x48
 @dirrm %%DATADIR%%/data/iconsets/gota
+@dirrm %%DATADIR%%/data/iconsets/sun/16x16
+@dirrm %%DATADIR%%/data/iconsets/sun/48x48
+@dirrm %%DATADIR%%/data/iconsets/sun
+@dirrm %%DATADIR%%/data/iconsets/stellar/16x16
+@dirrm %%DATADIR%%/data/iconsets/stellar/48x48
+@dirrm %%DATADIR%%/data/iconsets/stellar
+@dirrm %%DATADIR%%/data/iconsets/simplebulb/16x16
+@dirrm %%DATADIR%%/data/iconsets/simplebulb/48x48
+@dirrm %%DATADIR%%/data/iconsets/simplebulb
+@dirrm %%DATADIR%%/data/iconsets/nuvola/16x16
+@dirrm %%DATADIR%%/data/iconsets/nuvola/48x48
+@dirrm %%DATADIR%%/data/iconsets/nuvola
 @dirrm %%DATADIR%%/data/iconsets/jabberbulb/16x16
 @dirrm %%DATADIR%%/data/iconsets/jabberbulb/32x32
 @dirrm %%DATADIR%%/data/iconsets/jabberbulb/48x48
 @dirrm %%DATADIR%%/data/iconsets/jabberbulb
-@dirrm %%DATADIR%%/data/iconsets/nuvola/16x16
-@dirrm %%DATADIR%%/data/iconsets/nuvola/48x48
-@dirrm %%DATADIR%%/data/iconsets/nuvola
-@dirrm %%DATADIR%%/data/iconsets/simplebulb/16x16
-@dirrm %%DATADIR%%/data/iconsets/simplebulb/48x48
-@dirrm %%DATADIR%%/data/iconsets/simplebulb
-@dirrm %%DATADIR%%/data/iconsets/stellar/16x16
-@dirrm %%DATADIR%%/data/iconsets/stellar/48x48
-@dirrm %%DATADIR%%/data/iconsets/stellar
-@dirrm %%DATADIR%%/data/iconsets/sun/16x16
-@dirrm %%DATADIR%%/data/iconsets/sun/48x48
-@dirrm %%DATADIR%%/data/iconsets/sun
-@dirrm %%DATADIR%%/data/iconsets/transports/aim/16x16
-@dirrm %%DATADIR%%/data/iconsets/transports/aim/32x32
-@dirrm %%DATADIR%%/data/iconsets/transports/aim/48x48
-@dirrm %%DATADIR%%/data/iconsets/transports/aim
+@dirrm %%DATADIR%%/data/iconsets/transports/msn/16x16
+@dirrm %%DATADIR%%/data/iconsets/transports/msn/32x32
+@dirrm %%DATADIR%%/data/iconsets/transports/msn/48x48
+@dirrm %%DATADIR%%/data/iconsets/transports/msn
 @dirrm %%DATADIR%%/data/iconsets/transports/gadu-gadu/16x16
 @dirrm %%DATADIR%%/data/iconsets/transports/gadu-gadu/32x32
 @dirrm %%DATADIR%%/data/iconsets/transports/gadu-gadu/48x48
@@ -735,10 +844,10 @@ share/pixmaps/gajim_about.png
 @dirrm %%DATADIR%%/data/iconsets/transports/irc/16x16
 @dirrm %%DATADIR%%/data/iconsets/transports/irc/32x32
 @dirrm %%DATADIR%%/data/iconsets/transports/irc
-@dirrm %%DATADIR%%/data/iconsets/transports/msn/16x16
-@dirrm %%DATADIR%%/data/iconsets/transports/msn/32x32
-@dirrm %%DATADIR%%/data/iconsets/transports/msn/48x48
-@dirrm %%DATADIR%%/data/iconsets/transports/msn
+@dirrm %%DATADIR%%/data/iconsets/transports/aim/16x16
+@dirrm %%DATADIR%%/data/iconsets/transports/aim/32x32
+@dirrm %%DATADIR%%/data/iconsets/transports/aim/48x48
+@dirrm %%DATADIR%%/data/iconsets/transports/aim
 @dirrm %%DATADIR%%/data/iconsets/transports/sms/16x16
 @dirrm %%DATADIR%%/data/iconsets/transports/sms/32x32
 @dirrm %%DATADIR%%/data/iconsets/transports/sms
@@ -754,9 +863,25 @@ share/pixmaps/gajim_about.png
 @dirrm %%DATADIR%%/data/iconsets/transports/yahoo/48x48
 @dirrm %%DATADIR%%/data/iconsets/transports/yahoo
 @dirrm %%DATADIR%%/data/iconsets/transports
+@dirrm %%DATADIR%%/data/iconsets/gossip/16x16
+@dirrm %%DATADIR%%/data/iconsets/gossip/48x48
+@dirrm %%DATADIR%%/data/iconsets/gossip
+@dirrm %%DATADIR%%/data/iconsets/goojim/16x16
+@dirrm %%DATADIR%%/data/iconsets/goojim/32x32
+@dirrm %%DATADIR%%/data/iconsets/goojim/48x48
+@dirrm %%DATADIR%%/data/iconsets/goojim
+@dirrm %%DATADIR%%/data/iconsets/gnome/16x16
+@dirrm %%DATADIR%%/data/iconsets/gnome/32x32
+@dirrm %%DATADIR%%/data/iconsets/gnome/48x48
+@dirrm %%DATADIR%%/data/iconsets/gnome
+@dirrm %%DATADIR%%/data/iconsets/dcraven/16x16
+@dirrm %%DATADIR%%/data/iconsets/dcraven/32x32
+@dirrm %%DATADIR%%/data/iconsets/dcraven/48x48
+@dirrm %%DATADIR%%/data/iconsets/dcraven
+@dirrm %%DATADIR%%/data/iconsets/crystal/16x16
+@dirrm %%DATADIR%%/data/iconsets/crystal/48x48
+@dirrm %%DATADIR%%/data/iconsets/crystal
 @dirrm %%DATADIR%%/data/iconsets
-@dirrm %%DATADIR%%/data/other
-@dirrm %%DATADIR%%/data/sounds
 @dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%